GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 07:01:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Use consistent name XXX_ADDR for binary blob flash address

Browse source 
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2014-12-17 15:50:42 +08:00 • committed by Simon Glass
parent 405d8205d7
commit 8c5224c9f5
6 changed files with 7 additions and 7 deletions
Makefile
arch/x86/cpu
ivybridge
sdram.c
queensbay
Kconfigfsp_support.ctnc_car.S
include/configs
chromebook_link.h

2
Makefile
View file

@ -958,7 +958,7 @@ IFDTOOL_ME_FLAGS += -i ME:$(srctree)/board/$(BOARDDIR)/me.bin
endif endif
ifneq ($(CONFIG_HAVE_MRC),) ifneq ($(CONFIG_HAVE_MRC),)
IFDTOOL_FLAGS += -w $(CONFIG_X86_MRC_START):$(srctree)/board/$(BOARDDIR)/mrc.bin IFDTOOL_FLAGS += -w $(CONFIG_X86_MRC_ADDR):$(srctree)/board/$(BOARDDIR)/mrc.bin
endif endif
ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),) ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)

2
arch/x86/cpu/ivybridge/sdram.c
View file

@ -177,7 +177,7 @@ int sdram_initialise(struct pei_data *pei_data)
debug("PEI data at %p, size %x:\n", pei_data, sizeof(*pei_data)); debug("PEI data at %p, size %x:\n", pei_data, sizeof(*pei_data));
data = (char *)CONFIG_X86_MRC_START; data = (char *)CONFIG_X86_MRC_ADDR;
if (data) { if (data) {
int rv; int rv;
int (*func)(struct pei_data *); int (*func)(struct pei_data *);

4
arch/x86/cpu/queensbay/Kconfig
View file

@ -29,7 +29,7 @@ config FSP_FILE
The filename of the file to use as Firmware Support Package binary The filename of the file to use as Firmware Support Package binary
in the board directory. in the board directory.
config FSP_LOCATION config FSP_ADDR
hex "Firmware Support Package binary location" hex "Firmware Support Package binary location"
depends on HAVE_FSP depends on HAVE_FSP
default 0xfffc0000 default 0xfffc0000
@ -65,7 +65,7 @@ config CMC_FILE
The filename of the file to use as Chipset Micro Code state machine The filename of the file to use as Chipset Micro Code state machine
binary in the board directory. binary in the board directory.
config CMC_LOCATION config CMC_ADDR
hex "Chipset Micro Code state machine binary location" hex "Chipset Micro Code state machine binary location"
depends on HAVE_CMC depends on HAVE_CMC
default 0xfffb0000 default 0xfffb0000

2
arch/x86/cpu/queensbay/fsp_support.c
View file

@ -64,7 +64,7 @@ u32 __attribute__((optimize("O0"))) find_fsp_header(void)
volatile register u8 *fsp asm("eax"); volatile register u8 *fsp asm("eax");
/* Initalize the FSP base */ /* Initalize the FSP base */
fsp = (u8 *)CONFIG_FSP_LOCATION; fsp = (u8 *)CONFIG_FSP_ADDR;
/* Check the FV signature, _FVH */ /* Check the FV signature, _FVH */
if (((struct fv_header_t *)fsp)->sign == 0x4856465F) { if (((struct fv_header_t *)fsp)->sign == 0x4856465F) {

2
arch/x86/cpu/queensbay/tnc_car.S
View file

@ -29,7 +29,7 @@ find_fsp_header_ret:
mov %eax, %ebp mov %eax, %ebp
/* sanity test */ /* sanity test */
cmp $CONFIG_FSP_LOCATION, %eax cmp $CONFIG_FSP_ADDR, %eax
jb die jb die
/* calculate TempRamInitEntry address */ /* calculate TempRamInitEntry address */

2
include/configs/chromebook_link.h
View file

@ -25,7 +25,7 @@
#define CONFIG_X86_RESET_VECTOR #define CONFIG_X86_RESET_VECTOR
#define CONFIG_NR_DRAM_BANKS 8 #define CONFIG_NR_DRAM_BANKS 8
#define CONFIG_X86_MRC_START 0xfffa0000 #define CONFIG_X86_MRC_ADDR 0xfffa0000
#define CONFIG_CACHE_MRC_SIZE_KB 512 #define CONFIG_CACHE_MRC_SIZE_KB 512
#define CONFIG_COREBOOT_SERIAL #define CONFIG_COREBOOT_SERIAL