x86: Use consistent name XXX_ADDR for binary blob flash address

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/Makefile b/Makefile
index bda8222af438178d4f9e5d12cf6179dd3731b68a..d962576c34f1ef2ce5cd61f2096cf8c6d283145a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -958,7 +958,7 @@ IFDTOOL_ME_FLAGS += -i ME:$(srctree)/board/$(BOARDDIR)/me.bin
 endif
 
 ifneq ($(CONFIG_HAVE_MRC),)
 endif
 
 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
 
 ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)
 endif
 
 ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)

diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index df2b9901fc0cc8a64944b544699e55b7d4c8bf0f..b95e781bbfb79a66c81fdb6dc7e917649fb1cd08 100644 (file)
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -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) {
                int rv;
                int (*func)(struct pei_data *);
        if (data) {
                int rv;
                int (*func)(struct pei_data *);

diff --git a/arch/x86/cpu/queensbay/Kconfig b/arch/x86/cpu/queensbay/Kconfig
index 56fe85ccad074bbc61611191f298f1dd50d3cb0c..f6b52010c37a9d57de181b57c18638636415abae 100644 (file)
--- a/arch/x86/cpu/queensbay/Kconfig
+++ b/arch/x86/cpu/queensbay/Kconfig
@@ -29,7 +29,7 @@ config FSP_FILE
          The filename of the file to use as Firmware Support Package binary
          in the board directory.
 
          The filename of the file to use as Firmware Support Package binary
          in the board directory.
 

-config FSP_LOCATION
+config FSP_ADDR

        hex "Firmware Support Package binary location"
        depends on HAVE_FSP
        default 0xfffc0000
        hex "Firmware Support Package binary location"
        depends on HAVE_FSP
        default 0xfffc0000


@@ -65,7 +65,7 @@ config CMC_FILE
          The filename of the file to use as Chipset Micro Code state machine
          binary in the board directory.
 
          The filename of the file to use as Chipset Micro Code state machine
          binary in the board directory.
 

-config CMC_LOCATION
+config CMC_ADDR

        hex "Chipset Micro Code state machine binary location"
        depends on HAVE_CMC
        default 0xfffb0000
        hex "Chipset Micro Code state machine binary location"
        depends on HAVE_CMC
        default 0xfffb0000

diff --git a/arch/x86/cpu/queensbay/fsp_support.c b/arch/x86/cpu/queensbay/fsp_support.c
index df3bbd07c9ead4f0e7fe1437228bd31e6802c618..f830eeb33da367ef1c9e466871c45c8a3dd851a0 100644 (file)
--- a/arch/x86/cpu/queensbay/fsp_support.c
+++ b/arch/x86/cpu/queensbay/fsp_support.c
@@ -64,7 +64,7 @@ u32 __attribute__((optimize("O0"))) find_fsp_header(void)
        volatile register u8 *fsp asm("eax");
 
        /* Initalize the FSP base */
        volatile register u8 *fsp asm("eax");
 
        /* Initalize the FSP base */

-       fsp = (u8 *)CONFIG_FSP_LOCATION;
+       fsp = (u8 *)CONFIG_FSP_ADDR;

 
        /* Check the FV signature, _FVH */
        if (((struct fv_header_t *)fsp)->sign == 0x4856465F) {
 
        /* Check the FV signature, _FVH */
        if (((struct fv_header_t *)fsp)->sign == 0x4856465F) {

diff --git a/arch/x86/cpu/queensbay/tnc_car.S b/arch/x86/cpu/queensbay/tnc_car.S
index 2e9139eb8c2fc69ff201a9f6ac2819ca86d1cb16..5e09568b85be46bbf5d3b534397e19012b9f4cf2 100644 (file)
--- a/arch/x86/cpu/queensbay/tnc_car.S
+++ b/arch/x86/cpu/queensbay/tnc_car.S
@@ -29,7 +29,7 @@ find_fsp_header_ret:
        mov     %eax, %ebp
 
        /* sanity test */
        mov     %eax, %ebp
 
        /* sanity test */

-       cmp     $CONFIG_FSP_LOCATION, %eax
+       cmp     $CONFIG_FSP_ADDR, %eax

        jb      die
 
        /* calculate TempRamInitEntry address */
        jb      die
 
        /* calculate TempRamInitEntry address */

diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index 645b31c2e28d618a22460e29b3c6515731646ad9..c9d84e4f06294a043fa295393f20ff449a8123ee 100644 (file)
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_X86_RESET_VECTOR
 #define CONFIG_NR_DRAM_BANKS                   8
 
 #define CONFIG_X86_RESET_VECTOR
 #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_COREBOOT_SERIAL
 #define CONFIG_CACHE_MRC_SIZE_KB               512
 
 #define CONFIG_COREBOOT_SERIAL