On Sun, Nov 20, 2022 at 1:50 AM Tom Rini trini@konsulko.com wrote:

At this point all users of this driver enable DM_ETH, so remove the legacy code paths.

Signed-off-by: Tom Rini trini@konsulko.com

drivers/net/ftmac100.c | 91 +----------------------------------------- 1 file changed, 2 insertions(+), 89 deletions(-)

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index c30ace96bb13..f710c271c64b 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -17,10 +17,10 @@ #include <linux/io.h>

#include "ftmac100.h" -#ifdef CONFIG_DM_ETH #include <dm.h>

DECLARE_GLOBAL_DATA_PTR; -#endif

#define ETH_ZLEN 60

struct ftmac100_data { @@ -231,92 +231,6 @@ static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length) return 0; }

-#ifndef CONFIG_DM_ETH -/*

• • disable transmitter, receiver
• */

-static void ftmac100_halt(struct eth_device *dev) -{

•   struct ftmac100_data *priv = dev->priv;
  

•   return _ftmac100_halt(priv);
  

-}

-static int ftmac100_init(struct eth_device *dev, struct bd_info *bd) -{

•   struct ftmac100_data *priv = dev->priv;
  

•   return _ftmac100_init(priv , dev->enetaddr);
  

-}

-static int _ftmac100_recv(struct ftmac100_data *priv) -{

•   struct ftmac100_rxdes *curr_des;
  

•   unsigned short len;
  

•   curr_des = &priv->rxdes[priv->rx_index];
  

•   len = __ftmac100_recv(priv);
  

•   if (len) {
  

•           /* pass the packet up to the protocol layers. */
  

•           net_process_received_packet((void *)curr_des->rxdes2, len);
  

•           _ftmac100_free_pkt(priv);
  

•   }
  

•   return len ? 1 : 0;
  

-}

-/*

• • Get a data block via Ethernet
• */

-static int ftmac100_recv(struct eth_device *dev) -{

•   struct ftmac100_data *priv = dev->priv;
  

•   return _ftmac100_recv(priv);
  

-}

-/*

• • Send a data block via Ethernet
• */

-static int ftmac100_send(struct eth_device *dev, void *packet, int length) -{

•   struct ftmac100_data *priv = dev->priv;
  

•   return _ftmac100_send(priv , packet , length);
  

-}

-int ftmac100_initialize (struct bd_info *bd) -{

•   struct eth_device *dev;
  

•   struct ftmac100_data *priv;
  

•   dev = malloc (sizeof *dev);
  

•   if (!dev) {
  

•           printf ("%s(): failed to allocate dev\n", __func__);
  

•           goto out;
  

•   }
  

•   /* Transmit and receive descriptors should align to 16 bytes */
  

•   priv = memalign (16, sizeof (struct ftmac100_data));
  

•   if (!priv) {
  

•           printf ("%s(): failed to allocate priv\n", __func__);
  

•           goto free_dev;
  

•   }
  

•   memset (dev, 0, sizeof (*dev));
  

•   memset (priv, 0, sizeof (*priv));
  

•   strcpy(dev->name, "FTMAC100");
  

•   dev->iobase     = CONFIG_FTMAC100_BASE;
  

•   dev->init       = ftmac100_init;
  

•   dev->halt       = ftmac100_halt;
  

•   dev->send       = ftmac100_send;
  

•   dev->recv       = ftmac100_recv;
  

•   dev->priv       = priv;
  

•   priv->iobase    = dev->iobase;
  

•   eth_register (dev);
  

•   return 1;
  

-free_dev:

•   free (dev);
  

-out:

•   return 0;
  

-} -#endif

-#ifdef CONFIG_DM_ETH static int ftmac100_start(struct udevice *dev) { struct eth_pdata *plat = dev_get_plat(dev); @@ -445,4 +359,3 @@ U_BOOT_DRIVER(ftmac100) = { .plat_auto = sizeof(struct eth_pdata), .flags = DM_FLAG_ALLOC_PRIV_DMA, };

-#endif

2.25.1

Reviewed-by: Ramon Fried rfried.dev@gmail.com

On Mon, Nov 21, 2022 at 03:51:10PM -0700, Simon Glass wrote:

On Sat, 19 Nov 2022 at 16:53, Tom Rini trini@konsulko.com wrote:

...

We move the existing CONFIG_POST_* functionality over to CFG_POST and then introduce CONFIG_POST to Kconfig.

Signed-off-by: Tom Rini trini@konsulko.com

arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- configs/P2041RDB_NAND_defconfig | 1 + configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/kmcent2_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/pg_wcom_expu1_defconfig | 1 + configs/pg_wcom_expu1_update_defconfig | 1 + configs/pg_wcom_seli8_defconfig | 1 + configs/pg_wcom_seli8_update_defconfig | 1 + doc/README.POST | 6 +- doc/README.fsl-ddr | 2 +- drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial.c | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 4 +- include/configs/kmcent2.h | 2 +- include/configs/kmcoge5ne.h | 4 +- include/post.h | 4 +- include/serial.h | 4 +- post/cpu/mpc83xx/ecc.c | 2 +- post/drivers/flash.c | 2 +- post/drivers/i2c.c | 4 +- post/drivers/memory.c | 4 +- post/drivers/rtc.c | 4 +- post/lib_powerpc/andi.c | 2 +- post/lib_powerpc/asm.S | 2 +- post/lib_powerpc/b.c | 2 +- post/lib_powerpc/cmp.c | 2 +- post/lib_powerpc/cmpi.c | 2 +- post/lib_powerpc/complex.c | 2 +- post/lib_powerpc/cpu.c | 4 +- post/lib_powerpc/cr.c | 2 +- post/lib_powerpc/fpu/20001122-1.c | 4 +- post/lib_powerpc/fpu/20010114-2.c | 4 +- post/lib_powerpc/fpu/20010226-1.c | 4 +- post/lib_powerpc/fpu/980619-1.c | 4 +- post/lib_powerpc/fpu/acc1.c | 4 +- post/lib_powerpc/fpu/compare-fp-1.c | 4 +- post/lib_powerpc/fpu/fpu.c | 4 +- post/lib_powerpc/fpu/mul-subnormal-single-1.c | 4 +- post/lib_powerpc/load.c | 2 +- post/lib_powerpc/multi.c | 2 +- post/lib_powerpc/rlwimi.c | 2 +- post/lib_powerpc/rlwinm.c | 2 +- post/lib_powerpc/rlwnm.c | 2 +- post/lib_powerpc/srawi.c | 2 +- post/lib_powerpc/store.c | 2 +- post/lib_powerpc/string.c | 2 +- post/lib_powerpc/three.c | 2 +- post/lib_powerpc/threei.c | 2 +- post/lib_powerpc/threex.c | 2 +- post/lib_powerpc/two.c | 2 +- post/lib_powerpc/twox.c | 2 +- post/post.c | 4 +- post/tests.c | 68 +++++++++---------- test/Kconfig | 5 ++ 58 files changed, 114 insertions(+), 99 deletions(-)

Reviewed-by: Simon Glass sjg@chromium.org

but please see below

...

diff --git a/test/Kconfig b/test/Kconfig index a6b463e4d06c..9f4641ae6bc5 100644 --- a/test/Kconfig +++ b/test/Kconfig @@ -1,3 +1,8 @@ +config POST

•   bool "Power On Self Test support"
  

•   help
  

•     See doc/README.POST for more details
  

Shouldn't this be in post/Kconfig ?

It's non-trivial enough content that it really should be migrated to doc/post/ and then expanded upon a bit further.

We use test/ for unit / functional tests.

Yes, but post pre-dates all of that, keep in mind. It's also still in active use (enabled on some semi-recent layerscape platforms for example). This is an area that could use some attention and renovation, yes, but the whole point of this and the huge follow-up are to get the migrate to Kconfig part done already.

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- arch/arm/cpu/armv7/virt-v7.c | 4 ++-- include/configs/arndale.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 39aeeb423f08..b6d144f065d2 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry) ENDPROC(_do_nonsec_entry)

.macro get_cbar_addr addr -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS +#ifdef CFG_ARM_GIC_BASE_ADDRESS + ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS #else mrc p15, 4, \addr, c15, c0, 0 @ read CBAR bfc \addr, #0, #15 @ clear reserved bits diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 5ffeca13d913..c82b215b6f9c 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)

static unsigned long get_gicd_base_address(void) { -#ifdef CONFIG_ARM_GIC_BASE_ADDRESS - return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; +#ifdef CFG_ARM_GIC_BASE_ADDRESS + return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET; #else unsigned periphbase;

diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 7a244769e30a..8acc525b11c9 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -19,6 +19,6 @@ #define CONFIG_SMP_PEN_ADDR 0x02020000

/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ -#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 +#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000

#endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 39e1071236bd..0d2cbddeed40 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,4 +1,4 @@ -CONFIG_ARM_GIC_BASE_ADDRESS +CFG_ARM_GIC_BASE_ADDRESS CONFIG_BOARDDIR CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC

Signed-off-by: Tom Rini trini@konsulko.com --- board/samsung/common/exynos5-dt.c | 4 ++-- board/samsung/odroid/odroid.c | 4 ++-- include/configs/odroid.h | 8 ++++---- include/configs/odroid_xu3.h | 8 ++++---- include/configs/s5p_goni.h | 4 ++-- include/configs/trats.h | 4 ++-- include/configs/trats2.h | 4 ++-- scripts/config_whitelist.txt | 8 ++++---- 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 0d77a57f8082..cde77d79a0f6 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -179,9 +179,9 @@ char *get_dfu_alt_boot(char *interface, char *devstr) return NULL;

if (IS_SD(mmc)) - alt_boot = CONFIG_DFU_ALT_BOOT_SD; + alt_boot = CFG_DFU_ALT_BOOT_SD; else - alt_boot = CONFIG_DFU_ALT_BOOT_EMMC; + alt_boot = CFG_DFU_ALT_BOOT_EMMC;

return alt_boot; } diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index 35e4cee74f44..39a60e4ad295 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -94,8 +94,8 @@ char *get_dfu_alt_boot(char *interface, char *devstr) if (mmc_init(mmc)) return NULL;

- alt_boot = IS_SD(mmc) ? CONFIG_DFU_ALT_BOOT_SD : - CONFIG_DFU_ALT_BOOT_EMMC; + alt_boot = IS_SD(mmc) ? CFG_DFU_ALT_BOOT_SD : + CFG_DFU_ALT_BOOT_EMMC;

return alt_boot; } diff --git a/include/configs/odroid.h b/include/configs/odroid.h index f252b349437c..e2331e45cdfe 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -27,7 +27,7 @@ #define PARTS_BOOT "boot" #define PARTS_ROOT "platform"

-#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \ @@ -39,13 +39,13 @@

#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)

-#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x138 mmcpart 1\0"

-#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \ @@ -132,7 +132,7 @@ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ "mmcrootpart=2\0" \ - "dfu_alt_system="CONFIG_DFU_ALT \ + "dfu_alt_system="CFG_DFU_ALT \ "dfu_alt_info=Please reset the board\0" \ "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \ "consoleoff=set console console=ram; save; reset\0" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 5bbe7aadcb25..7a81585494a9 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -28,7 +28,7 @@ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

-#define CONFIG_DFU_ALT_SYSTEM \ +#define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ "zImage fat 0 1;" \ "Image.itb fat 0 1;" \ @@ -42,14 +42,14 @@ "boot part 0 1;" \ "root part 0 2\0"

-#define CONFIG_DFU_ALT_BOOT_EMMC \ +#define CFG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ "bl1 raw 0x0 0x1e mmcpart 1;" \ "bl2 raw 0x1e 0x1d mmcpart 1;" \ "tzsw raw 0x83e 0x200 mmcpart 1;" \ "params.bin raw 0x1880 0x20\0"

-#define CONFIG_DFU_ALT_BOOT_SD \ +#define CFG_DFU_ALT_BOOT_SD \ "u-boot raw 0x3f 0x800;" \ "bl1 raw 0x1 0x1e;" \ "bl2 raw 0x1f 0x1d;" \ @@ -83,7 +83,7 @@ "mmcrootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootpart=2\0" \ - "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \ + "dfu_alt_system="CFG_DFU_ALT_SYSTEM \ "dfu_alt_info=Autoset by THOR/DFU command run.\0"

#endif /* __CONFIG_H */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index fdade1ee66fa..b7a91af008c7 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -42,7 +42,7 @@ #define PARTS_CSC "csc" #define PARTS_UMS "ums"

-#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "exynos3-goni.dtb ext4 0 2;" \ @@ -109,7 +109,7 @@ "ubiblock=8\0" \ "ubi=enabled\0" \ "opts=always_resume=1\0" \ - "dfu_alt_info=" CONFIG_DFU_ALT "\0" + "dfu_alt_info=" CFG_DFU_ALT "\0"

/* Goni has 3 banks of DRAM, but swap the bank */ #define PHYS_SDRAM_1 CFG_SYS_SDRAM_BASE /* OneDRAM Bank #0 */ diff --git a/include/configs/trats.h b/include/configs/trats.h index ec18842bbe8c..3eac66539dfe 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -39,7 +39,7 @@ "name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

-#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x400;" \ "/uImage ext4 0 2;" \ "/modem.bin ext4 0 2;" \ @@ -98,7 +98,7 @@ "mmcrootpart=5\0" \ "opts=always_resume=1\0" \ "partitions=" PARTS_DEFAULT \ - "dfu_alt_info=" CONFIG_DFU_ALT \ + "dfu_alt_info=" CFG_DFU_ALT \ "spladdr=0x40000100\0" \ "splsize=0x200\0" \ "splfile=falcon.bin\0" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 0aa331e39359..125d3e776a3f 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -40,7 +40,7 @@ "name="PARTS_DATA",size=3000MiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

-#define CONFIG_DFU_ALT \ +#define CFG_DFU_ALT \ "u-boot raw 0x80 0x800;" \ "/uImage ext4 0 2;" \ "/modem.bin ext4 0 2;" \ @@ -86,7 +86,7 @@ "mmcrootpart=5\0" \ "opts=always_resume=1\0" \ "partitions=" PARTS_DEFAULT \ - "dfu_alt_info=" CONFIG_DFU_ALT \ + "dfu_alt_info=" CFG_DFU_ALT \ "uartpath=ap\0" \ "usbpath=ap\0" \ "consoleon=set console console=ttySAC2,115200n8; save; reset\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 14863642e4d3..880e963e1d0f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,9 +1,9 @@ CFG_ARM_GIC_BASE_ADDRESS CFG_BOARDDIR -CONFIG_DFU_ALT -CONFIG_DFU_ALT_BOOT_EMMC -CONFIG_DFU_ALT_BOOT_SD -CONFIG_DFU_ALT_SYSTEM +CFG_DFU_ALT +CFG_DFU_ALT_BOOT_EMMC +CFG_DFU_ALT_BOOT_SD +CFG_DFU_ALT_SYSTEM CONFIG_DFU_ENV_SETTINGS CONFIG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED

Signed-off-by: Tom Rini trini@konsulko.com --- board/timll/devkit8000/devkit8000.c | 4 ++-- include/configs/M5253DEMO.h | 6 +++--- include/configs/at91sam9261ek.h | 6 +++--- include/configs/ci20.h | 6 +++--- include/configs/devkit8000.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 0808ca1a54c0..39103de02ed4 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -79,7 +79,7 @@ int board_init(void) static void gpmc_dm9000_config(void) { enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M); }

/* @@ -102,7 +102,7 @@ int misc_init_r(void) #ifdef CONFIG_DRIVER_DM9000 /* Configure GPMC registers for DM9000 */ enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6], - CONFIG_DM9000_BASE, GPMC_SIZE_16M); + CFG_DM9000_BASE, GPMC_SIZE_16M);

/* Use OMAP DIE_ID as MAC address */ if (!eth_env_get_enetaddr("ethaddr", enetaddr)) { diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 7e37c6d11997..223a843fc695 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -20,9 +20,9 @@ env/embedded.o(.text*);

#ifdef CONFIG_DRIVER_DM9000 -# define CONFIG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) -# define DM9000_IO CONFIG_DM9000_BASE -# define DM9000_DATA (CONFIG_DM9000_BASE + 4) +# define CFG_DM9000_BASE (CFG_SYS_CS1_BASE | 0x300) +# define DM9000_IO CFG_DM9000_BASE +# define DM9000_DATA (CFG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG # define CONFIG_DM9000_BYTE_SWAPPED

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 56247e390bf6..d58c0f4bbe24 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -35,9 +35,9 @@ #endif

/* Ethernet */ -#define CONFIG_DM9000_BASE 0x30000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 4) +#define CFG_DM9000_BASE 0x30000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT #define CONFIG_DM9000_NO_SROM

diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 3329c24fa68c..bc8b699b84f8 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -18,9 +18,9 @@ #define CFG_SYS_NS16550_CLK 48000000

/* Ethernet: davicom DM9000 */ -#define CONFIG_DM9000_BASE 0xb6000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 2) +#define CFG_DM9000_BASE 0xb6000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 2)

/* Miscellaneous configuration options */

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 46410595c2bc..824e0e448eea 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -18,9 +18,9 @@

/* Hardware drivers */ /* DM9000 */ -#define CONFIG_DM9000_BASE 0x2c000000 -#define DM9000_IO CONFIG_DM9000_BASE -#define DM9000_DATA (CONFIG_DM9000_BASE + 0x400) +#define CFG_DM9000_BASE 0x2c000000 +#define DM9000_IO CFG_DM9000_BASE +#define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 #define CONFIG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 414f0078e4d7..7c6fc0a07bf7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5,7 +5,7 @@ CFG_DFU_ALT_BOOT_EMMC CFG_DFU_ALT_BOOT_SD CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS -CONFIG_DM9000_BASE +CFG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/net/dm9000x.c | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/devkit8000.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 6bf316263d59..514b8db2ce1e 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -550,7 +550,7 @@ static int dm9000_recv_common(struct dm9000_priv *db, uchar *rdptr) /* * Read a word data from SROM */ -#if !defined(CONFIG_DM9000_NO_SROM) +#if !defined(CFG_DM9000_NO_SROM) static void dm9000_read_srom_word(struct dm9000_priv *db, int offset, u8 *to) { dm9000_iow(db, DM9000_EPAR, offset); diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index d58c0f4bbe24..a9bbbd39484a 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -39,7 +39,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 4) #define CONFIG_DM9000_USE_16BIT -#define CONFIG_DM9000_NO_SROM +#define CFG_DM9000_NO_SROM

/* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 824e0e448eea..1694bf1cd3e1 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -22,7 +22,7 @@ #define DM9000_IO CFG_DM9000_BASE #define DM9000_DATA (CFG_DM9000_BASE + 0x400) #define CONFIG_DM9000_USE_16BIT 1 -#define CONFIG_DM9000_NO_SROM 1 +#define CFG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG

/* TWL4030 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 005b893b317c..85adbafa58fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -7,7 +7,7 @@ CFG_DFU_ALT_SYSTEM CFG_DFU_ENV_SETTINGS CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED -CONFIG_DM9000_NO_SROM +CFG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/socfpga_soc64_common.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index cad756aeaf20..0eeb2efee2f5 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -132,7 +132,7 @@ static int designware_wdt_probe(struct udevice *dev) goto err; } #else - priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; + priv->clk_khz = CFG_DW_WDT_CLOCK_KHZ; #endif

if (CONFIG_IS_ENABLED(DM_RESET)) { diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index bbbdea6664ca..807bff43e00a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -64,7 +64,7 @@ /* * L4 Watchdog */ -#define CONFIG_DW_WDT_CLOCK_KHZ 25000 +#define CFG_DW_WDT_CLOCK_KHZ 25000

/* * NAND Support diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 47089f312d2c..df3927297bbe 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -90,10 +90,10 @@ #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__ unsigned int cm_get_l4_sys_free_clk_hz(void); -#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) +#define CFG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) #endif #else -#define CONFIG_DW_WDT_CLOCK_KHZ 100000 +#define CFG_DW_WDT_CLOCK_KHZ 100000 #endif

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43234d822457..97ad18677f1d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -9,7 +9,7 @@ CFG_DM9000_BASE CFG_DM9000_BYTE_SWAPPED CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT -CONFIG_DW_WDT_CLOCK_KHZ +CFG_DW_WDT_CLOCK_KHZ CONFIG_ENV_FLAGS_LIST_STATIC CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS

Signed-off-by: Tom Rini trini@konsulko.com --- env/Makefile | 2 +- include/env_internal.h | 12 ++++++------ scripts/config_whitelist.txt | 2 +- tools/Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/env/Makefile b/env/Makefile index c4ad65432865..78e82173507f 100644 --- a/env/Makefile +++ b/env/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o ifndef CONFIG_SPL_BUILD obj-y += callback.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o -extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o +extra-$(CFG_ENV_IS_EMBEDDED) += embedded.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o diff --git a/include/env_internal.h b/include/env_internal.h index f30fd6159d87..690e6da81078 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -41,8 +41,8 @@ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) # define ENV_IS_EMBEDDED # endif -# ifdef CONFIG_ENV_IS_EMBEDDED -# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" +# ifdef CFG_ENV_IS_EMBEDDED +# error "do not define CFG_ENV_IS_EMBEDDED in your board config" # error "it is calculated automatically for you" # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ @@ -61,15 +61,15 @@ extern unsigned long nand_env_oob_offset; * For the flash types where embedded env is supported, but it cannot be * calculated automatically (i.e. NAND), take the board opt-in. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) # define ENV_IS_EMBEDDED #endif

/* The build system likes to know if the env is embedded */ #ifdef DO_DEPS_ONLY # ifdef ENV_IS_EMBEDDED -# ifndef CONFIG_ENV_IS_EMBEDDED -# define CONFIG_ENV_IS_EMBEDDED +# ifndef CFG_ENV_IS_EMBEDDED +# define CFG_ENV_IS_EMBEDDED # endif # endif #endif @@ -88,7 +88,7 @@ extern unsigned long nand_env_oob_offset; * If the environment is in RAM, allocate extra space for it in the malloc * region. */ -#if defined(CONFIG_ENV_IS_EMBEDDED) +#if defined(CFG_ENV_IS_EMBEDDED) #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #elif (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE < CONFIG_SYS_MONITOR_BASE) || \ (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) || \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d9496e6edba..040b0c89049a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -11,7 +11,7 @@ CFG_DM9000_NO_SROM CFG_DM9000_USE_16BIT CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC -CONFIG_ENV_IS_EMBEDDED +CFG_ENV_IS_EMBEDDED CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS CONFIG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 diff --git a/tools/Makefile b/tools/Makefile index 26be0a7ba2ea..b76876307a74 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,7 +36,7 @@ endif subdir-$(HOST_TOOLS_ALL) += gdb

# Merge all the different vars for envcrc into one -ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y +ENVCRC-$(CFG_ENV_IS_EMBEDDED) = y ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index eafa6ae9a9a0..c6a01270a54d 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -37,7 +37,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index ac48372b6c0b..f51771f9ca46 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -34,7 +34,7 @@ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5a001716fb01..20efa468ac3d 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -201,7 +201,7 @@ "kernel_b part 0 8;" \ "rootfs partubi 0 10"

-#define CONFIG_ENV_SETTINGS_NAND_V1 \ +#define CFG_ENV_SETTINGS_NAND_V1 \ "nand_active_ubi_vol=rootfs_a\0" \ "nand_active_ubi_vol_A=rootfs_a\0" \ "nand_active_ubi_vol_B=rootfs_b\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb880dc317fc..25bfb7ee89e7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS -CONFIG_ENV_SETTINGS_NAND_V1 +CFG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index c6a01270a54d..48f49906b84e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -36,7 +36,7 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index f51771f9ca46..b07d0c50604d 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -33,7 +33,7 @@ "nand_img_size=0x500000\0" \ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b1cd614316d4..c54b02c5919a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -234,7 +234,7 @@ "${nand_img_size}; bootm ${kloadaddr}\0" \ COMMON_ENV_NAND_CMDS

-#define CONFIG_ENV_SETTINGS_V1 \ +#define CFG_ENV_SETTINGS_V1 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e55368c5453c..26821890137d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 -CONFIG_ENV_SETTINGS_V1 +CFG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE

Signed-off-by: Tom Rini trini@konsulko.com --- board/samsung/smdkc100/smdkc100.c | 6 +++--- board/samsung/smdkv310/smdkv310.c | 6 +++--- include/configs/exynos5-common.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smdkv310.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index b944e44c1ac4..4f46911b0b4d 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -25,16 +25,16 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf;

/* gpio configuration GPK0CON */ - gpio_cfg_pin(S5PC100_GPIO_K00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(S5PC100_GPIO_K00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));

/* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SMC_BC_TACS(0x0) | SMC_BC_TCOS(0x4) | SMC_BC_TACC(0xe) | SMC_BC_TCOH(0x1) | SMC_BC_TAH(0x4) | SMC_BC_TACP(0x6) | SMC_BC_PMC(0x0);

/* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); }

int board_init(void) diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index bb61ba1f81c6..47483a26a622 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -24,17 +24,17 @@ static void smc9115_pre_init(void) u32 smc_bw_conf, smc_bc_conf;

/* gpio configuration GPK0CON */ - gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2)); + gpio_cfg_pin(EXYNOS4_GPIO_Y00 + CFG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));

/* Ethernet needs bus width of 16 bits */ - smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); + smc_bw_conf = SROMC_DATA16_WIDTH(CFG_ENV_SROM_BANK); smc_bc_conf = SROMC_BC_TACS(0x0F) | SROMC_BC_TCOS(0x0F) | SROMC_BC_TACC(0x0F) | SROMC_BC_TCOH(0x0F) | SROMC_BC_TAH(0x0F) | SROMC_BC_TACP(0x0F) | SROMC_BC_PMC(0x0F);

/* Select and configure the SROMC bank */ - s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); + s5p_config_sromc(CFG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); }

int board_init(void) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index dd322c2b3a79..0490c2dad53e 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -50,7 +50,7 @@

/* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/

/* Enable Time Command */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ffa1a1fcb0ef..ccb7ec38d033 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -94,7 +94,7 @@ * Ethernet Contoller driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ +#define CFG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ #endif /* CONFIG_CMD_NET */

#endif /* __CONFIG_H */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index af0c8200fc23..1f137dba90f7 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -42,7 +42,7 @@

/* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET -#define CONFIG_ENV_SROM_BANK 1 +#define CFG_ENV_SROM_BANK 1 #endif /*CONFIG_CMD_NET*/

#endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 831f8a99ea5c..5de121b41ca0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -17,7 +17,7 @@ CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 -CONFIG_ENV_SROM_BANK +CFG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE CONFIG_ETHBASE

Signed-off-by: Tom Rini trini@konsulko.com --- board/esd/meesc/meesc.c | 2 +- include/configs/meesc.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 21f4ba98b531..9e3621042241 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -163,7 +163,7 @@ int checkboard(void) u_char hw_type; /* hardware type */

/* read the "Type" register of the ET1100 controller */ - hw_type = readb(CONFIG_ET1100_BASE); + hw_type = readb(CFG_ET1100_BASE);

switch (hw_type) { case 0x11: diff --git a/include/configs/meesc.h b/include/configs/meesc.h index d190e4b50392..38da55c70bfe 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -60,6 +60,6 @@ #endif

/* hw-controller addresses */ -#define CONFIG_ET1100_BASE 0x70000000 +#define CFG_ET1100_BASE 0x70000000

#endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 27923ec86bf5..81353fa94e7c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -19,7 +19,7 @@ CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 CFG_ENV_SROM_BANK CFG_ENV_TOTAL_SIZE -CONFIG_ET1100_BASE +CFG_ET1100_BASE CONFIG_ETHBASE CONFIG_EXTRA_ENV_SETTINGS CONFIG_FB_ADDR

Signed-off-by: Tom Rini trini@konsulko.com --- README | 4 ++-- doc/README.fsl-ddr | 4 ++-- doc/README.link-local | 2 +- doc/arch/x86.rst | 4 ++-- doc/develop/devicetree/control.rst | 2 +- doc/develop/distro.rst | 2 +- doc/usage/environment.rst | 2 +- env/Kconfig | 4 ++-- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/alt.h | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_igep003x.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 2 +- include/configs/am65x_evm.h | 2 +- include/configs/amcore.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/apple.h | 2 +- include/configs/arbel.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/ax25-ae350.h | 2 +- include/configs/axs10x.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bcm_ns3.h | 2 +- include/configs/bcmstb.h | 2 +- include/configs/beacon-rzg2m.h | 4 ++-- include/configs/bitmain_antminer_s9.h | 2 +- include/configs/bk4r1.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/brppt2.h | 2 +- include/configs/brsmarc1.h | 2 +- include/configs/brxre1.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/cl-som-imx7.h | 4 ++-- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/conga-qeval20-qa3-e3845.h | 4 ++-- include/configs/controlcenterdc.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/dfi-bt700.h | 4 ++-- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/draco.h | 2 +- include/configs/dragonboard410c.h | 2 +- include/configs/dragonboard820c.h | 2 +- include/configs/dragonboard845c.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/ds414.h | 2 +- include/configs/durian.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/emsdp.h | 2 +- include/configs/etamin.h | 2 +- include/configs/evb_ast2500.h | 2 +- include/configs/evb_ast2600.h | 2 +- include/configs/evb_rv1108.h | 4 ++-- include/configs/exynos5-common.h | 2 +- include/configs/exynos7420-common.h | 2 +- include/configs/exynos78x0-common.h | 2 +- include/configs/gazerbeam.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/gose.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/helios4.h | 2 +- include/configs/highbank.h | 2 +- include/configs/hikey.h | 2 +- include/configs/hikey960.h | 2 +- include/configs/hsdk-4xd.h | 2 +- include/configs/hsdk.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/imx6-engicam.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 4 ++-- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm-mx8menlo.h | 4 ++-- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mn_beacon.h | 2 +- include/configs/imx8mn_bsh_smm_s2.h | 2 +- include/configs/imx8mn_bsh_smm_s2pro.h | 2 +- include/configs/imx8mn_evk.h | 2 +- include/configs/imx8mn_var_som.h | 2 +- include/configs/imx8mn_venice.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mp_venice.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qm_rom7720.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/imxrt1050-evk.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/j721s2_evm.h | 2 +- include/configs/km/km-mpc83xx.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/lager.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/librem5.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/ls1012a2g5rdb.h | 4 ++-- include/configs/ls1012a_common.h | 2 +- include/configs/ls1012afrdm.h | 4 ++-- include/configs/ls1012afrwy.h | 4 ++-- include/configs/ls1012aqds.h | 4 ++-- include/configs/ls1012ardb.h | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 4 ++-- include/configs/ls1021atsn.h | 2 +- include/configs/ls1021atwr.h | 4 ++-- include/configs/ls1028aqds.h | 4 ++-- include/configs/ls1028ardb.h | 4 ++-- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls1088aqds.h | 20 ++++++++++---------- include/configs/ls1088ardb.h | 6 +++--- include/configs/ls2080a_common.h | 2 +- include/configs/ls2080aqds.h | 10 +++++----- include/configs/ls2080ardb.h | 6 +++--- include/configs/lsxl.h | 2 +- include/configs/lx2160aqds.h | 2 +- include/configs/lx2160ardb.h | 2 +- include/configs/lx2162aqds.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/meson64.h | 4 ++-- include/configs/meson64_android.h | 2 +- include/configs/microblaze-generic.h | 4 ++-- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt8183.h | 2 +- include/configs/mt8512.h | 2 +- include/configs/mt8516.h | 2 +- include/configs/mt8518.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/mvebu_armada-37xx.h | 2 +- include/configs/mvebu_armada-8k.h | 2 +- include/configs/mx23_olinuxino.h | 2 +- include/configs/mx23evk.h | 2 +- include/configs/mx28evk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53ppd.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mx7ulp_evk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/octeontx2_common.h | 2 +- include/configs/octeontx_common.h | 4 ++-- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 4 ++-- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/openpiton-riscv64.h | 2 +- include/configs/openrd.h | 2 +- include/configs/origen.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pdu001.h | 2 +- include/configs/phycore_am335x_r2.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/phycore_imx8mp.h | 2 +- include/configs/pic32mzdask.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/poleg.h | 2 +- include/configs/pomelo.h | 2 +- include/configs/poplar.h | 2 +- include/configs/porter.h | 2 +- include/configs/presidio_asic.h | 2 +- include/configs/px30_common.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/qcs404-evb.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/rut.h | 2 +- include/configs/rv1108_common.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/sdm845.h | 2 +- include/configs/sheevaplug.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/silk.h | 2 +- include/configs/sipeed-maix.h | 4 ++-- include/configs/slimbootloader.h | 6 +++--- include/configs/smartweb.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smegw01.h | 2 +- include/configs/snapper9g45.h | 2 +- include/configs/sniper.h | 2 +- include/configs/socfpga_arria5_secu1.h | 2 +- include/configs/socfpga_chameleonv3.h | 2 +- include/configs/socfpga_common.h | 4 ++-- include/configs/socfpga_dbm_soc1.h | 2 +- include/configs/socfpga_mcvevk.h | 2 +- include/configs/socfpga_n5x_socdk.h | 4 ++-- include/configs/socfpga_soc64_common.h | 2 +- include/configs/socfpga_vining_fpga.h | 2 +- include/configs/socrates.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/stemmy.h | 2 +- include/configs/stih410-b2260.h | 2 +- include/configs/stm32f429-discovery.h | 2 +- include/configs/stm32f429-evaluation.h | 2 +- include/configs/stm32f469-discovery.h | 2 +- include/configs/stm32f746-disco.h | 2 +- include/configs/stm32h743-disco.h | 2 +- include/configs/stm32h743-eval.h | 2 +- include/configs/stm32h750-art-pi.h | 2 +- include/configs/stm32mp13_common.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/stm32mp15_dh_dhsom.h | 2 +- include/configs/stm32mp15_st_common.h | 6 +++--- include/configs/stmark2.h | 2 +- include/configs/stout.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/syzygy_hub.h | 2 +- include/configs/taurus.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tegra-common-post.h | 2 +- include/configs/ten64.h | 4 ++-- include/configs/theadorable-x86-common.h | 4 ++-- include/configs/theadorable.h | 2 +- include/configs/thuban.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- include/configs/topic_miami.h | 4 ++-- include/configs/total_compute.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/configs/turris_mox.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/usb_a9263.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vcoreiii.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- include/configs/vexpress_aemv8.h | 2 +- include/configs/vexpress_common.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vinco.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp7.h | 2 +- include/configs/x530.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xea.h | 2 +- include/configs/xenguest_arm64.h | 6 +++--- include/configs/xilinx_versal.h | 4 ++-- include/configs/xilinx_versal_mini.h | 4 ++-- include/configs/xilinx_versal_net.h | 4 ++-- include/configs/xilinx_versal_net_mini.h | 4 ++-- include/configs/xilinx_zynqmp.h | 8 ++++---- include/configs/xilinx_zynqmp_mini.h | 4 ++-- include/configs/xilinx_zynqmp_r5.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zynq-common.h | 4 ++-- include/configs/zynq_cse.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 383 files changed, 446 insertions(+), 446 deletions(-)

diff --git a/README b/README index 71767e32d11b..52545b78a19b 100644 --- a/README +++ b/README @@ -1190,7 +1190,7 @@ The following options need to be configured: symbols.

- Default Environment: - CONFIG_EXTRA_ENV_SETTINGS + CFG_EXTRA_ENV_SETTINGS

Define this to contain any number of null terminated strings (variable = value pairs) that will be part of @@ -1199,7 +1199,7 @@ The following options need to be configured: For example, place something like this in your board's config file:

- #define CONFIG_EXTRA_ENV_SETTINGS \ + #define CFG_EXTRA_ENV_SETTINGS \ "myvar1=value1\0" \ "myvar2=value2\0"

diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr index 10e63f3be1d3..f44bb2aa25d4 100644 --- a/doc/README.fsl-ddr +++ b/doc/README.fsl-ddr @@ -56,8 +56,8 @@ Table of 2-way interleaving modes supported in cpu/8xxx/ddr/ The ways to configure the ddr interleaving mode ============================================== 1. In board header file(e.g.MPC8572DS.h), add default interleaving setting - under "CONFIG_EXTRA_ENV_SETTINGS", like: - #define CONFIG_EXTRA_ENV_SETTINGS \ + under "CFG_EXTRA_ENV_SETTINGS", like: + #define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=bank" \ ......

diff --git a/doc/README.link-local b/doc/README.link-local index 148b4987f27c..ec2ef940e4c8 100644 --- a/doc/README.link-local +++ b/doc/README.link-local @@ -51,7 +51,7 @@ by env variables. It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP, and CONFIG_BOOTP_MAY_FAIL. If both fail or are disabled, static settings are used.

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ipconfigcmd=if test \"$dhcpenabled\" -ne 0;" \ "then " \ "dhcpfail=0;dhcp || dhcpfail=1;" \ diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst index 634387ac095c..725a1ae58639 100644 --- a/doc/arch/x86.rst +++ b/doc/arch/x86.rst @@ -355,8 +355,8 @@ environment variables if you add this to minnowmax.h: "ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \ "run boot"

- #undef CONFIG_EXTRA_ENV_SETTINGS - #define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}" + #undef CFG_EXTRA_ENV_SETTINGS + #define CFG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"

and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to::

diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index c71570d64b47..0b3b32be1bb6 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands.

To use this, put something like this in your board header file::

- #define CONFIG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0" + #define CFG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0"

Build:

diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst index bc72aa951ef7..8016acad098a 100644 --- a/doc/develop/distro.rst +++ b/doc/develop/distro.rst @@ -214,7 +214,7 @@ Required Environment Variables

The U-Boot "syslinux" and "pxe boot" commands require a number of environment variables be set. Default values for these variables are often hard-coded into -CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that +CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that the user doesn't have to configure them.

fdt_addr: diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 83f210d2d058..2c44e5da6aa0 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -89,7 +89,7 @@ Old-style C environment

Traditionally, the default environment is created in `include/env_default.h`, and can be augmented by various `CONFIG` defines. See that file for details. In -particular you can define `CONFIG_EXTRA_ENV_SETTINGS` in your board file +particular you can define `CFG_EXTRA_ENV_SETTINGS` in your board file to add environment variables.

Board maintainers are encouraged to migrate to the text-based environment as it diff --git a/env/Kconfig b/env/Kconfig index 4e506ae262b5..5a7e2f299b06 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -19,7 +19,7 @@ config ENV_SOURCE_FILE If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if the file board/<vendor>/<board>/<SYS_BOARD>.env exists. Otherwise the environment is assumed to come from the ad-hoc - CONFIG_EXTRA_ENV_SETTINGS #define + CFG_EXTRA_ENV_SETTINGS #define

config SAVEENV def_bool y if CMD_SAVEENV @@ -655,7 +655,7 @@ config USE_DEFAULT_ENV_FILE help Normally, the default environment is automatically generated based on the settings of various CONFIG_* options, as well - as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option, + as the CFG_EXTRA_ENV_SETTINGS. By selecting this option, you can instead define the entire default environment in an external file.

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index b360238b332a..ef3837e137c7 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -25,7 +25,7 @@ #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5208EVBe" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index ed45eccb62c9..a31d44177362 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -34,7 +34,7 @@ #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5235EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 4be4d0f84512..a1cb1a8a7022 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -28,7 +28,7 @@

# define CONFIG_OVERWRITE_ETHADDR_ONCE

-# define CONFIG_EXTRA_ENV_SETTINGS \ +# define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0" \ "loadaddr=10000\0" \ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index a9339e505257..501785ac82e0 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -37,7 +37,7 @@ #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5272C3" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index ff9f85358963..951209fbd750 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -42,7 +42,7 @@ # define CONFIG_OVERWRITE_ETHADDR_ONCE #endif /* FEC_ENET */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "uboot=u-boot.bin\0" \ diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index bde9e770e52a..3912aae750d4 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -37,7 +37,7 @@ #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5282EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=10000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 42b74aeb9b5d..ad27766cf0f4 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -38,7 +38,7 @@ #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M53017" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 72f0c63a1e21..f8aabe4944a4 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -30,7 +30,7 @@ #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5329EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=40010000\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 4e8b54e01f4e..228fcde98dc3 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -32,7 +32,7 @@ #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5373EVB" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 232cf9e99845..6e7b6e81208f 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -9,7 +9,7 @@

/* High Level Configuration Options */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "sdram_type=SDRAM\0" \ "flash_type=AM29LV160DB\0" \ "loadaddr=0x400000\0" \ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 95a90199a429..2a71e0ad4dce 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -231,7 +231,7 @@ #define CONFIG_UBOOTPATH "u-boot.bin" #define CONFIG_FDTFILE "mpc8379_rdb.dtb"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=" CONFIG_NETDEV "\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \ "tftpflash=tftp $loadaddr $uboot;" \ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 780ee5ae865a..515e88cf8206 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -335,7 +335,7 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ecc=off\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index b1d6b15811dd..bc24be79366c 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -415,7 +415,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_UBOOTPATH u-boot.bin/* U-Boot image on TFTP server */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 8b901ca47a0c..834400f1d601 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -313,7 +313,7 @@

#define __USB_PHY_TYPE utmi

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 623d4cf5562d..f666683bcc4b 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -439,7 +439,7 @@ "fdtfile=t1023rdb/t1023rdb.dtb\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index b6938056bbe1..53bd8e85a627 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -431,7 +431,7 @@ #define FDTFILE "t1042rdb/t1042d4rdb.dtb" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a93e05dd4d2d..5244c9d076f0 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -426,7 +426,7 @@

#define __USB_PHY_TYPE utmi

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index cf65a0da1883..022d483da763 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -392,7 +392,7 @@

#define __USB_PHY_TYPE utmi

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b51762264ade..6cf8b75c86c2 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -382,7 +382,7 @@ #define CTRL_INTLV_PREFERED cacheline #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \ diff --git a/include/configs/alt.h b/include/configs/alt.h index fe303fda78a0..6d530f6d24bc 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -33,7 +33,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "usb_pgood_delay=2000\0"

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 755f7fae3e4f..1f473b5a1500 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -78,7 +78,7 @@ #ifndef CONFIG_SPL_BUILD #include <environment/ti/dfu.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=undefined\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \ diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index 7c5e7ce475ef..1de78e5a55dd 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -45,7 +45,7 @@ "main_pcba_aux_3=0\0" \ "main_pcba_aux_4=0\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AM335XX_BOARD_FDTFILE \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV \ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index abd868c14538..e2beaf271859 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -20,7 +20,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "bootdir=/boot\0" \ "bootfile=zImage\0" \ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 452887d6995c..c66650c8e8d1 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -23,7 +23,7 @@ #define CONFIG_HSMMC2_8BIT

#ifndef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "kloadaddr=0x84000000\0" \ "fdtaddr=0x85000000\0" \ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 342a068c855f..f3d3d18c0551 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -30,7 +30,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AM335XX_BOARD_FDTFILE \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c57a0ddc21dd..b75c64838831 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -38,7 +38,7 @@ #endif /* CONFIG_MTD_RAW_NAND */

/* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS2,115200n8\0" \ "fdtfile=am3517-evm.dtb\0" \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 7659c1cc0619..3a6ffd9de0bb 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -66,7 +66,7 @@ #ifndef CONFIG_SPL_BUILD #include <environment/ti/dfu.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=undefined\0" \ "finduuid=part uuid mmc 0:2 uuid\0" \ diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index 57f3f37908df..809d89119c42 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -55,7 +55,7 @@ "partitions=" PARTS_DEFAULT

/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ EXTRA_ENV_AM625_BOARD_SETTINGS \ diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 25c71f00a20f..26a7f2521ecc 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -95,7 +95,7 @@ DFU_ALT_INFO_OSPI

/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ EXTRA_ENV_AM642_BOARD_SETTINGS \ diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 0307426e4aba..33dd6cfdfa45 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -88,7 +88,7 @@ #endif

/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/amcore.h b/include/configs/amcore.h index ee0be972d243..78060d432a86 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -12,7 +12,7 @@

#define CFG_SYS_UART_PORT 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade_uboot=loady; " \ "protect off 0xffc00000 0xffc1ffff; " \ "erase 0xffc00000 0xffc1ffff; " \ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index cf23837863be..15bedc0afc29 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -34,7 +34,7 @@ #define BOOTENV_RUN_NET_USB_START ""

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index a3c86545f077..4899dfb4dee1 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -70,7 +70,7 @@ "ramdisk_addr_r=0x18400000\0" \ "scriptaddr=0x18280000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ diff --git a/include/configs/apple.h b/include/configs/apple.h index b06660add4fa..fe7d11bcdb38 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -27,7 +27,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ BOOTENV

diff --git a/include/configs/arbel.h b/include/configs/arbel.h index 60758b0ca02a..8e27fb52a1c3 100644 --- a/include/configs/arbel.h +++ b/include/configs/arbel.h @@ -12,7 +12,7 @@ #define CFG_SYS_INIT_RAM_SIZE 0x8000

/* Default environemnt variables */ -#define CONFIG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ +#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index e80166b3c467..b09e06ad4d85 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -96,7 +96,7 @@ "done\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "disable_giga=yes\0" \ "usb_pgood_delay=2000\0" \ "nor_bootdelay=-2\0" \ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 62aa99342a0e..8f4419f402f7 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -96,7 +96,7 @@ * u-boot: 'set' command */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loaderversion=11\0" \ "card_id="__stringify(ASTRO_ID)"\0" \ "alterafile=0\0" \ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index afdb74785f8a..4101440ff5d5 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -36,7 +36,7 @@

/* Address and size of Primary Environment Sector */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "monitor_base=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=" \ "protect off ${monitor_base} +${filesize};" \ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 0f9e2cfb582d..c59d4bb38ca8 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -28,7 +28,7 @@ #define CFG_SYS_NAND_READY_PIN GPIO_PIN_PD(5) #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\ "bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0" diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 03e04e6e6805..b743066ea7c3 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -85,7 +85,7 @@ func(RAM, ram, na) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00080000\0" \ "pxefile_addr_r=0x01f00000\0" \ "scriptaddr=0x01f00000\0" \ diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 04dc50b1cb22..a82dfc902948 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -39,7 +39,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 6f6552e6dc34..e7946389eff3 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -49,7 +49,7 @@ #define NANDARGS "" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "boot_fdt=try\0" \ "bootpart=0:2\0" \ diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index b5469880fe2f..70dd2802686f 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -795,7 +795,7 @@ QSPI_FLASH \ FLASH_IMAGES

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_ENV_SETTINGS

#endif /* __BCM_NS3_H */ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 57360b60ca9c..d1de3561af63 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -131,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address; /* * Enable in-place RFS with this initrd_high setting. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h index 2713b158438e..65c01835cc6e 100644 --- a/include/configs/beacon-rzg2m.h +++ b/include/configs/beacon-rzg2m.h @@ -8,9 +8,9 @@

#include "rcar-gen3-common.h"

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "usb_pgood_delay=2000\0" \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h index 556bfa08ebba..3662668c6a6b 100644 --- a/include/configs/bitmain_antminer_s9.h +++ b/include/configs/bitmain_antminer_s9.h @@ -9,7 +9,7 @@ #define CFG_SYS_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_SIZE 0x40000000

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "pxefile_addr_r=0x2000000\0" \ "scriptaddr=0x3000000\0" \ "kernel_addr_r=0x2000000\0" \ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 0842a4a8f543..5df8d03c7065 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -57,7 +57,7 @@ /* boot command, including the target-defined one if any */

/* Extra env settings (including the target-defined ones if any) */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BK4_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 2c5236aa58bb..236d720a55a8 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -67,7 +67,7 @@ MMC_TGTS \

#define LOAD_OFFSET(x) 0x8##x

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "verify=no\0" \ "scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \ diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index d35c7c4a591e..7e4e8ee262bf 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -26,7 +26,7 @@

/* Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "cfgaddr=0x106F0000\0" \ "scraddr=0x10700000\0" \ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index f9908352b0dc..ffb4cd3027a1 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -24,7 +24,7 @@ #define V_SCLK (V_OSCK)

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "cfgscr=mw ${dtbaddr} 0;" \ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 410b3e641c5c..9ca6d6f863d1 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -20,7 +20,7 @@ #define V_SCLK (V_OSCK)

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootaddr=0x80001100\0" \ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 474ad69d996c..a8273a7fcd8d 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -67,7 +67,7 @@ "emmc_dev=0\0"

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ AHAB_ENV \ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 6f3396bad4c8..263981860e86 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -55,7 +55,7 @@ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 1e5154af0a15..850eb892db79 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -25,7 +25,7 @@ "nand read ${loadaddr} NAND.kernel; " \ "bootz ${loadaddr} - ${fdt_addr}\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "fdt_addr=0x87800000\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 5c9004cbd93a..2d56d37f06f8 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -24,9 +24,9 @@ #define CFG_SYS_I2C_PCA953X_ADDR 0x20 #define CFG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \ "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \ diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 9c9e9506dc64..062d3d870269 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -110,7 +110,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "console=ttyS0,115200\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 9df8baa8a969..c66cf721870c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -30,7 +30,7 @@

/* Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr_r=0x18000000\0" \ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index fcc17fc6b7ce..06de4dbeb6d5 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -43,7 +43,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x81200000\0" \ "bootm_size=0x8000000\0" \ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index c0c3b4e0359a..a748d4f3169f 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -83,7 +83,7 @@ #endif #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ UBI_BOOTCMD \ diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 6002d8d5c9f0..e4bb71d47d62 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -60,7 +60,7 @@ "${fdt_addr};\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 60a3862a4d12..0486db6b51ed 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -64,7 +64,7 @@ "ramdisk_addr_r=0x18400000\0" \ "scriptaddr=0x18280000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "boot_file=zImage\0" \ "boot_script_dhcp=boot.scr\0" \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 32a79b025545..99ed8183ef21 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -123,7 +123,7 @@ #endif #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ MODULE_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index fa778ec9e2b7..122b599a6f21 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -55,7 +55,7 @@

#define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ UBI_BOOTCMD \ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 823d37fc38ca..31cfd2b12923 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -19,8 +19,8 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-22\0" \ "boot=zboot 03000000 0 04000000 ${filesize}\0" \ "upd_uboot=tftp 100000 conga/u-boot.rom;" \ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 5da2778b67be..8b31e14df31a 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -24,7 +24,7 @@ #define CONFIG_HOSTNAME "ccdc" #define CONFIG_ROOTPATH "/opt/nfsroot"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth1\0" \ "consoledev=ttyS1\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h index 25bcc2a6841c..6535730731a6 100644 --- a/include/configs/crs3xx-98dx3236.h +++ b/include/configs/crs3xx-98dx3236.h @@ -13,7 +13,7 @@ /* Environment in SPI NOR flash */

/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index a818a4b39f83..cfc8330e35ae 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -145,7 +145,7 @@

#include <environment/ti/mmc.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 4b31bbf4e11a..323703ac5c90 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -68,7 +68,7 @@ "mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index b9d03d253d99..c4ae397e3e68 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -17,7 +17,7 @@ /* NAND */

/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index bba2b607aa86..6dbf582d733b 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -18,7 +18,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h index 84ea1baa9979..0ee914e91d08 100644 --- a/include/configs/db-xc3-24g4xg.h +++ b/include/configs/db-xc3-24g4xg.h @@ -11,7 +11,7 @@ /* NAND */

/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 66aa6d5c3c45..ab10101f20a9 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -67,7 +67,7 @@ * Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ethaddr=00:01:90:00:C0:81\0" \ "dtbaddr=0x81000000\0" \ "nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0" \ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index c8b176542d95..7993aa8af176 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -33,7 +33,7 @@ DEFAULT_LINUX_BOOT_ENV

/* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "console=ttyO2,115200n8\0" \ "mmcdev=0\0" \ diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 52f2d50118a4..1510f8df4378 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -23,8 +23,8 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel-ver=4.4.0-24\0" \ "boot=zboot 03000000 0 04000000 ${filesize}\0" \ "upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index f9b3d19480ed..56bb856a6dc2 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -45,7 +45,7 @@ #endif #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/display5.h b/include/configs/display5.h index 7636d2869a9f..f95c1602e676 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -167,7 +167,7 @@ "sf write ${loadaddr} 0x0 ${filesize};" \ "fi\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PARTS_DEFAULT \ "gpio_recovery=93\0" \ "check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 015bc78648f3..2a70db5e9382 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -35,7 +35,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 33ae7d654b0b..07cec38b50d0 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -22,7 +22,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "initrd=/boot/uInitrd\0" \ diff --git a/include/configs/draco.h b/include/configs/draco.h index ab3cf10d7793..b56ba9132af2 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -28,7 +28,7 @@ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=draco\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index daf7ecd7975b..73aec348458a 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -28,6 +28,6 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV

#endif diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 31cd8536de4b..499708371113 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -26,7 +26,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x95000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/dragonboard845c.h b/include/configs/dragonboard845c.h index bd88c42a3ba5..c1e590fae2a5 100644 --- a/include/configs/dragonboard845c.h +++ b/include/configs/dragonboard845c.h @@ -13,7 +13,7 @@

#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x5000000\0" \ "bootm_low=0x80000000\0" \ "bootcmd=bootm $prevbl_initrd_start_addr\0" diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index fbd83d629c02..733020d3e261 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -17,7 +17,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "x_bootcmd_ethernet=ping 192.168.2.1\0" \ "x_bootcmd_usb=usb start\0" \ "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 8553ea0b95f2..ede21a4e2c57 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -26,7 +26,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "x_bootcmd_ethernet=ping 192.168.1.2\0" \ "x_bootcmd_usb=usb start\0" \ "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 76d1713fdc68..e69883ba73bc 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -43,7 +43,7 @@

/* Default Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "initrd_high=0xffffffff\0" \ "ramdisk_addr_r=0x8000000\0" \ "usb0Mode=host\0usb1Mode=host\0usb2Mode=device\0" \ diff --git a/include/configs/durian.h b/include/configs/durian.h index 001596c00a45..9f11e18d34ad 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -15,7 +15,7 @@

/* BOOT */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "load_kernel=ext4load scsi 0:1 0x90100000 uImage-2004\0" \ "load_fdt=ext4load scsi 0:1 0x95000000 ft2004-pci-64.dtb\0"\ "boot_fdt=bootm 0x90100000 -:- 0x95000000\0" \ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 89e071c0df66..a5e2dc063a74 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -23,7 +23,7 @@

#define CONFIG_MXC_UART_BASE UART2_BASE

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "board=EL6Q\0" \ "cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \ "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 22e0fa5aabfd..4a929937b416 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -76,7 +76,7 @@ CONSOLE_STDIN_SETTINGS \ CONSOLE_STDOUT_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdtfile=" CONFIG_FDTFILE "\0" \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index c2b921e7cb8b..83aaa09cdbb0 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -15,7 +15,7 @@ * Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade_image=u-boot.bin\0" \ "upgrade=emsdp rom unlock && " \ "fatload mmc 0 ${loadaddr} ${upgrade_image} && " \ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 9011940abe4b..32b45b1e5b8d 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -138,7 +138,7 @@ #define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=etamin\0" \ "ubi_off=4096\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index bec1660cf485..f304929263e9 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -14,7 +14,7 @@ #define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE

/* Misc */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ""

#endif /* __CONFIG_H */ diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index c9c988b93740..e1cce58fa933 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -14,7 +14,7 @@ #define STR_HELPER(s) #s #define STR(s) STR_HELPER(s)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \ "cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \ diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h index 13e3cb2ffeb1..e7d866551a5f 100644 --- a/include/configs/evb_rv1108.h +++ b/include/configs/evb_rv1108.h @@ -11,8 +11,8 @@ /* * Default environment settings */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "ipaddr=172.16.12.50\0" \ "serverip=172.16.12.69\0" \ diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 0490c2dad53e..860fd1601a66 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -94,7 +94,7 @@ #define EXYNOS_FDTFILE_SETTING #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index cff910c1bd5b..c8408eb39200 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -67,7 +67,7 @@ #define EXYNOS_FDTFILE_SETTING #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h index 8672b9e95270..92c84cd8ce05 100644 --- a/include/configs/exynos78x0-common.h +++ b/include/configs/exynos78x0-common.h @@ -74,7 +74,7 @@ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS

#endif /* __CONFIG_EXYNOS78x0_COMMON_H */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 36dcee87c5fb..7ab504f35531 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -59,7 +59,7 @@ #define CONFIG_HOSTNAME "gazerbeam" #define CONFIG_ROOTPATH "/opt/nfsroot"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS1\0" \ "u-boot=u-boot.bin\0" \ diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 1458b187de28..9dc1d7394afd 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -36,7 +36,7 @@ #define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

/* Command definition */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=/boot/fitImage\0" \ "fdt_addr_r=0x18000000\0" \ "splash_addr_r=0x20000000\0" \ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index f62b8f175e1f..32960fb93256 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -41,7 +41,7 @@

#endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ NETWORKBOOT \ "image=/boot/fitImage\0" \ "dev=mmc\0" \ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 66eed9e14f81..bc517286b113 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -31,7 +31,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" diff --git a/include/configs/gose.h b/include/configs/gose.h index d1fe375a2c1f..45f0ec6f6a0e 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -29,7 +29,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

#endif /* __GOSE_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 4954c5ca0800..c4f53e6e4004 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -23,7 +23,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ "kernel=/boot/zImage\0" \ diff --git a/include/configs/helios4.h b/include/configs/helios4.h index fc32487e1c7b..7d81d1cf1e4c 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -110,7 +110,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 4aef0b4abd12..76e6054b0cc1 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -16,7 +16,7 @@

#define CFG_SYS_SDRAM_BASE 0x00000000

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x20000000\0" \ "initrd_high=0x20000000\0"

diff --git a/include/configs/hikey.h b/include/configs/hikey.h index d4280decc9f0..36bf22b1870e 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -42,7 +42,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_name=Image\0" \ "kernel_addr_r=0x00080000\0" \ "fdtfile=hi6220-hikey.dtb\0" \ diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index fad1f980481e..40d5e653c3f1 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -28,7 +28,7 @@ func(MMC, mmc, 0) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "fdtfile=hi3660-hikey960.dtb\0" \ "fdt_addr_r=0x10000000\0" \ diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index 59ea8960071a..f59da4177316 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -37,7 +37,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index fbfcded47123..2177fafcdc06 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -36,7 +36,7 @@ /* * Environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ "iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 05192218d225..242f92e6fd72 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -18,7 +18,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/zImage\0" \ "fdt=/boot/ib62x0.dtb\0" \ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index f2e3608d3a3f..f719ecb5fe0b 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -11,7 +11,7 @@

#include "mv-common.h"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/uImage\0" \ "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 36b6b95b84de..4208ba95915e 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -24,7 +24,7 @@ #endif

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 4e23f1a2dc5d..0df61916b7d2 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -21,7 +21,7 @@ /* Ethernet Configs */ #define CONFIG_FEC_MXC_PHYADDR 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "bootm_size=0x10000000\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 402f83c18eae..b6006c021d5c 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -20,7 +20,7 @@ /* Environment in MMC */ #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x14000000\0" \ "fdt_addr_r=0x13000000\0" \ "kernel_addr_r=0x10008000\0" \ diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 392f97050a65..e28185f24dd3 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -72,7 +72,7 @@ #endif

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootconf=conf-imx6q-bosch-acc.dtb\0"\ "mmcfit_name=fitImage\0" \ "mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \ diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h index 2d9d3c34b0db..c95038eaa537 100644 --- a/include/configs/imx6ulz_smm_m2.h +++ b/include/configs/imx6ulz_smm_m2.h @@ -54,7 +54,7 @@ #devtypel #instance " "

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ NANDARGS \ BOOTENV diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 76771fd66ce9..438e79df3cc1 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -12,7 +12,7 @@

#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

/* * Use: @@ -22,7 +22,7 @@ */ #define MY_CONFIG_BOOT_MODE "boot-mode=sd\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MY_CONFIG_BOOT_MODE \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c228cf7f37ba..00ce7fb62a93 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -63,7 +63,7 @@ BOOT_TARGET_DHCP(func)

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h index 938c5406b821..a86bd76a3c72 100644 --- a/include/configs/imx8mm-mx8menlo.h +++ b/include/configs/imx8mm-mx8menlo.h @@ -9,8 +9,8 @@ #include <configs/verdin-imx8mm.h>

/* Custom initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "devtype=mmc\0" \ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 03325e6c3a7a..ee524f0e63f2 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -20,7 +20,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 80321cf2d8d3..44d74bb1a788 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -34,7 +34,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "altbootcmd=setenv devpart 2 && run bootcmd ; reset\0" \ "bootlimit=3\0" \ "devtype=mmc\0" \ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 8a694c88a53a..d28f3f1972b9 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -37,7 +37,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 41ab9307793f..e718daa07c3e 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -30,7 +30,7 @@ "ramdisk_addr_r=0x46400000\0" \ "scriptaddr=0x46000000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 28ce834769c3..c490e3829f9a 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -25,7 +25,7 @@ func(USB, usb, 1) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x42\0" \ BOOTENV

diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 85fd5e2371f9..bb3dfe3fa0d2 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -13,7 +13,7 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "ramdiskimage=rootfs.cpio.uboot\0" \ diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h index a768ff355109..e97b8e871d22 100644 --- a/include/configs/imx8mn_bsh_smm_s2.h +++ b/include/configs/imx8mn_bsh_smm_s2.h @@ -35,7 +35,7 @@ #devtypel #instance " "

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ NANDARGS \ BOOTENV diff --git a/include/configs/imx8mn_bsh_smm_s2pro.h b/include/configs/imx8mn_bsh_smm_s2pro.h index 035e5c7bd90f..8619fdde7fdb 100644 --- a/include/configs/imx8mn_bsh_smm_s2pro.h +++ b/include/configs/imx8mn_bsh_smm_s2pro.h @@ -22,7 +22,7 @@ "emmc_ack=1\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ EMMCARGS \ BOOTENV diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 024b86c7f1d0..b759b834b808 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -32,7 +32,7 @@ "scriptaddr=0x40000000\0" \ "pxefile_addr_r=0x40100000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ "console=ttymxc1,115200\0" \ diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h index 4633843d1bbb..205337948cfc 100644 --- a/include/configs/imx8mn_var_som.h +++ b/include/configs/imx8mn_var_som.h @@ -37,7 +37,7 @@ "pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV

diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index a585cbf87e44..80c2df9f30ff 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -19,7 +19,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x40\0" \ BOOTENV

diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h index 5443022b04c7..b8fdedefa21f 100644 --- a/include/configs/imx8mp_dhcom_pdk2.h +++ b/include/configs/imx8mp_dhcom_pdk2.h @@ -28,7 +28,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "altbootcmd=run bootcmd ; reset\0" \ "bootlimit=3\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 738677ff37cd..63ea25d9788b 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -34,7 +34,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h index d67bad8971dd..8fac898403f1 100644 --- a/include/configs/imx8mp_icore_mx8mp.h +++ b/include/configs/imx8mp_icore_mx8mp.h @@ -36,7 +36,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 58f7dc6518c1..ed4da0e69b5b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -71,7 +71,7 @@ BOOT_TARGET_DHCP(func)

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index e79aa5707537..4b32d5a77ef6 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -19,7 +19,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "splblk=0x40\0" \ BOOTENV

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 4df98e3f3735..f6f356d27ba2 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -30,7 +30,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=0x40880000\0" \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 688c0bf70080..c40448715f8a 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -35,7 +35,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 3b4cd6562235..8fed3e31964c 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -29,7 +29,7 @@ "initrd_high=0xffffffff\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index f1f907f3e5a4..7772e71013ef 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -23,7 +23,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 2e2e5ed43cde..5692e3d00007 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -47,7 +47,7 @@ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index d75b8bf0c18f..669da591fa2b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -23,7 +23,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index d313bdc2a448..30dd5af03b00 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -34,7 +34,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h index 895c50f60253..5cd6492dd503 100644 --- a/include/configs/imx93_evk.h +++ b/include/configs/imx93_evk.h @@ -28,7 +28,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=0x83500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index 84228676c7fd..7688464841eb 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -19,7 +19,7 @@ DMAMEM_SZ_ALL)

#ifdef CONFIG_VIDEO -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 0f6150fc9c7e..7d087413362c 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -40,7 +40,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ BOOTENV \ EXTRA_ENV_IOT2050_BOARD_SETTINGS diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index e66f994a375f..a7210b5cf3ae 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -170,7 +170,7 @@ #include <config_distro_bootcmd.h>

/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index ab204c62b7d6..54dfea6952e9 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -127,7 +127,7 @@ DFU_ALT_INFO_OSPI

/* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 840a4d5401f5..227c45f0634a 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -82,7 +82,7 @@ #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ "newenv=" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 05cdcbfba193..a67301b9ecd6 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -222,7 +222,7 @@ "can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \ "asrc,spdif,lpuart1,ftm1\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ CONFIG_KM_DEF_ENV \ CONFIG_HW_ENV_SETTINGS \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 17eb9a7c2ea0..639f2075e69f 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -441,7 +441,7 @@ int get_scl(void); #define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 736865ad80af..61ff80d2c983 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -29,7 +29,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

/* SPL support */ diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 6fcacdb0c664..81ca83fdbfab 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -46,6 +46,6 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif

-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV

#endif /* __KONTRON_MX6UL_CONFIG_H */ diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 80a32304606a..2e21aacd1893 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -50,6 +50,6 @@ #define CONFIG_MALLOC_F_ADDR 0x930000 #endif

-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV

#endif /* __KONTRON_MX8MM_CONFIG_H */ diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 17c63d834107..d909bbbbcfda 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -50,7 +50,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc2,115200\0" \ "boot_fdt=try\0" \ diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 9c3174d0e02c..218e9d9b3013 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -65,7 +65,7 @@ func(PXE, pxe, 0) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "env_addr=0x203e0004\0" \ "envload=env import -d -b ${env_addr}\0" \ "install_rcw=source 20200000\0" \ diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index c551585a2062..da8a67b4ab63 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -16,7 +16,7 @@

/* Command definition */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ "fdt_addr=0x75000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 136e228682a6..99321b320f5f 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -22,7 +22,7 @@ #define CONFIG_MXC_USB_FLAGS 0 #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 828f91096344..db45585ba313 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -51,7 +51,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/lager.h b/include/configs/lager.h index f3feaa539fcc..777d5b94d1cd 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -30,7 +30,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

/* SPL support */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index abe470fe890b..b9ec7f379354 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -49,7 +49,7 @@ */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SETUP_INITRD_TAG -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootenvfile=uEnv.txt\0" \ "fdtfile=da850-lego-ev3.dtb\0" \ "memsize=64M\0" \ diff --git a/include/configs/librem5.h b/include/configs/librem5.h index 11b3fa6c857d..1818a57e49c5 100644 --- a/include/configs/librem5.h +++ b/include/configs/librem5.h @@ -64,7 +64,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x80000000\0" \ "pxefile_addr_r=0x80100000\0" \ "kernel_addr_r=0x80800000\0" \ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 721da818633a..938ab5ade9a7 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index f0a9e9ab3155..d1e0ed5817e9 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -11,8 +11,8 @@ /* DDR */ #define CFG_SYS_SDRAM_SIZE 0x40000000

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 9e4f949016ef..a5f680db2d37 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -34,7 +34,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index c19ed2f43ecf..4243a21f1f18 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -16,8 +16,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0)

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "fdt_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 1b417c72e704..872296749c0a 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -25,8 +25,8 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na)

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 495bb3911b3a..35e8ff057986 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -55,8 +55,8 @@ #define I2C_VOL_MONITOR_BUS_V_OVF 0x1 #define I2C_VOL_MONITOR_BUS_V_SHIFT 3

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "kernel_addr=0x01000000\0" \ "kernelheader_addr=0x600000\0" \ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index d74936d1281d..1e843f896c7e 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -36,8 +36,8 @@ #define __PHY_ETH2_MASK 0xFB #define __PHY_ETH1_MASK 0xFD

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr=0x01000000\0" \ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 024a71852753..0a08619384b6 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -94,7 +94,7 @@

#define HWCONFIG_BUFFER_SIZE 256

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0"

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5a91cc3efec0..3bfb014adf11 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -279,12 +279,12 @@ #define HWCONFIG_BUFFER_SIZE 256

#ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 5612c60ae904..d4855819bd7f 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -75,7 +75,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ "kernel_addr=0x61000000\0" \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3c4c207edd06..8a36620bf3ab 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -166,7 +166,7 @@ #include <config_distro_bootcmd.h>

#ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ @@ -222,7 +222,7 @@ "cp.b $kernel_addr $load_addr " \ "$kernel_size && bootm $load_addr#$board\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 228fb122f5f3..769ece901c19 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -61,8 +61,8 @@ /* SATA */

#ifndef SPL_NO_ENV -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "board=ls1028aqds\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 5c134612576c..8c53636beac3 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -56,8 +56,8 @@

/* Initial environment variables */ #ifndef SPL_NO_ENV -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "board=ls1028ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index a3fa92d1ff47..e259cf810c0a 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -120,7 +120,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 4ed5481c3e74..e566ad4eed33 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -98,7 +98,7 @@ #endif #ifndef SPL_NO_MISC /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 57429d4bbe32..e229ba2eea64 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -118,7 +118,7 @@ unsigned long long get_qixis_addr(void);

#ifndef SPL_NO_ENV /* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index a35045d640ff..a34a71f649f6 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -297,8 +297,8 @@

/* Initial environment variables */ #ifdef CONFIG_NXP_ESBC -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -329,8 +329,8 @@ #define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580A00000 0x580E00000\0"

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -391,8 +391,8 @@ "$kernel_size && bootm $kernel_load#$BOARD\0" #else #if defined(CONFIG_QSPI_BOOT) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -409,8 +409,8 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #elif defined(CONFIG_SD_BOOT) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ @@ -427,8 +427,8 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #else /* NOR BOOT */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 7bc4fc6a6652..bd543a37e879 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -238,9 +238,9 @@ #endif #endif /* CONFIG_TFABOOT */

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ @@ -308,7 +308,7 @@ " && esbc_validate ${kernelheader_addr_r};" \ "bootm $load_addr#$BOARD\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index e82456fd8148..631392cb8dd2 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -110,7 +110,7 @@ unsigned long long get_qixis_addr(void); #define HWCONFIG_BUFFER_SIZE 128

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 924d4057d936..12b5af1b4f2f 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -230,9 +230,9 @@ #define CFG_SYS_I2C_RTC_ADDR 0x68

/* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_NXP_ESBC -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ @@ -257,7 +257,7 @@ #define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580a00000" \ " 0x580e00000 \0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "loadaddr_sd=0x90100000\0" \ @@ -313,7 +313,7 @@ "$kernel_addr_sd $kernel_size_sd && " \ "bootm $load_addr#$BOARD\0" #elif defined(CONFIG_SD_BOOT) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x800\0" \ @@ -329,7 +329,7 @@ "fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index c50b6030680c..1259df8f3a9a 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -279,9 +279,9 @@ #endif

/* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ @@ -343,7 +343,7 @@ "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ "bootm $load_addr#$board\0" #else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index c82eb8b04bf8..47d7ec57b80a 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -22,7 +22,7 @@ /* * Default environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootsource=legacy\0" \ "hdpart=0:1\0" \ "kernel_addr_r=0x00800000\0" \ diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 9f891064bd5d..3a316e73308f 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -14,7 +14,7 @@ /* MAC/PHY configuration */

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2160aqds_boot.scr\0" \ "boot_script_hdr=hdr_lx2160aqds_bs.out\0" \ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index 58c0ff36571e..8cc4e0db03f0 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -18,7 +18,7 @@ #define I2C_EMC2305_PWM 0x80

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2160ardb_boot.scr\0" \ "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h index 157688ef7d7a..54d7cea4c599 100644 --- a/include/configs/lx2162aqds.h +++ b/include/configs/lx2162aqds.h @@ -14,7 +14,7 @@ #define CFG_SYS_RTC_BUS_NUM 0

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "boot_scripts=lx2162aqds_boot.scr\0" \ "boot_script_hdr=hdr_lx2162aqds_bs.out\0" \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 66591390d903..9c37212463e1 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -86,7 +86,7 @@ */ #define CONFIG_HOSTNAME "m53menlo"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttymxc0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 7c401a2cfd6c..7ea682049261 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -34,7 +34,7 @@ /* Ethernet Configuration */ #define CONFIG_FEC_MXC_PHYADDR 1

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/meson64.h b/include/configs/meson64.h index f06fe73485fb..e2800df87869 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -76,8 +76,8 @@

#include <config_distro_bootcmd.h>

-#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "stdin=" STDIN_CFG "\0" \ "stdout=" STDOUT_CFG "\0" \ "stderr=" STDOUT_CFG "\0" \ diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index 1266851196d2..c0e977abb01f 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -279,7 +279,7 @@ "fi;" \ "fi;"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ANDROID_ENV_SETTINGS \ "partitions=" PARTS_DEFAULT "\0" \ "mmcdev=2\0" \ diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index edd2466caa98..ede4ffd53f4e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -78,8 +78,8 @@

#include <config_distro_bootcmd.h>

-#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "unlock=yes\0"\ "nor0=flash-0\0"\ "mtdparts=mtdparts=flash-0:"\ diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index 3def93d61e8a..0350f7a62da7 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -21,7 +21,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "kernel_addr_r=0x84000000\0" \ "fdt_addr_r=0x88000000\0" \ diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index cfe926c0a141..ef2111cd20ab 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -30,7 +30,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 39a7ba76633b..031c1aea0c00 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -44,7 +44,7 @@ #include <config_distro_bootcmd.h>

/* Extra environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV

diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index 3da7619d78d7..1f973829bba4 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -21,7 +21,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x40000000\0" \ BOOTENV

diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 3a35527da10d..c0fc8688ca67 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -26,7 +26,7 @@ #define ENV_BOOT_CMD \ "mtk_boot=run boot_rd_img;bootm;\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6c000000\0" \ ENV_DEVICE_SETTINGS \ ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index 0f7981a56611..73776e3705b7 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -21,7 +21,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x40000000\0" \ BOOTENV

diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 8a8bc85ca70e..d6bd1a103866 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -33,7 +33,7 @@ "serial#=1234567890ABCDEF\0" \ "board=mt8518\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6c000000\0" \ ENV_DEVICE_SETTINGS \ ENV_BOOT_READ_IMAGE \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 5c9620371e3c..c8c0fc671ab0 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -27,7 +27,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "kernel_addr_r=0x202000000\0" \ "fdt_addr_r=0x201000000\0" \ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 9bfc48c52d90..76e148f55ebf 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -89,7 +89,7 @@ ""

/* fdt_addr and kernel_addr are needed for existing distribution boot scripts */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ "pxefile_addr_r=0x6e00000\0" \ "fdt_addr=0x6f00000\0" \ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index beac3ae6496d..239a09763ae1 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -41,7 +41,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x6d00000\0" \ "pxefile_addr_r=0x6e00000\0" \ "fdt_addr_r=0x6f00000\0" \ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index aa3d7a1a3fc8..e769ba2e8377 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -19,7 +19,7 @@ /* Ethernet */

/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "update_sd_firmware_filename=u-boot.sd\0" \ "update_sd_firmware=" /* Update the SD firmware partition */ \ "if mmc rescan ; then " \ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index f597cdb30563..5ceba8b15fa4 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -16,7 +16,7 @@ #define CFG_SYS_SDRAM_BASE PHYS_SDRAM_1

/* Extra Environments */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "update_sd_firmware_filename=u-boot.sd\0" \ "update_sd_firmware=" /* Update the SD firmware partition */ \ "if mmc rescan ; then " \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index c740d8533274..f9f65f6968e1 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -18,7 +18,7 @@ /* UBI and NAND partitioning */

/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ubifs_file=filesystem.ubifs\0" \ "update_nand_full_filename=u-boot.nand\0" \ "update_nand_firmware_filename=u-boot.sb\0" \ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index ddd37b3936ff..8ab1ee79a79c 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -39,7 +39,7 @@

/* Framebuffer and LCD */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_file=imx51-babbage.dtb\0" \ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index cd806cb698e9..baffe65c3697 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -37,7 +37,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x75000000\0" \ "pxefile_addr_r=0x73000000\0" \ "scriptaddr=0x74000000\0" \ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index d0107fcc8cb1..0ac93d6e0432 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -27,7 +27,7 @@

/* Command definition */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_addr=0x71000000\0" \ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 9464d6e44aea..94d2191af91d 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -35,7 +35,7 @@ "nfs=run choose_ip setargs bootargs_nfs; ${getcmd} ${loadaddr} " \ "${nfsserver}:${image}; bootm ${loadaddr}\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PPD_CONFIG_NFS \ "image=/boot/fitImage\0" \ "dev=mmc\0" \ diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index f7f209c20b59..d4af96b51ea4 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -21,7 +21,7 @@

#define CONFIG_MXC_UART_BASE UART1_BASE

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "som_rev=undefined\0" \ "has_emmc=undefined\0" \ "fdtfile=undefined\0" \ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 6294fd1e2c42..e1cdedf27680 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -35,7 +35,7 @@ #define EMMC_ENV "" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdtfile=undefined\0" \ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 358d9f47c0f3..4fbd06783a6d 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -15,7 +15,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 8731f6a3e4ad..cf4871cbae39 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -12,7 +12,7 @@

#define CONFIG_MXC_UART_BASE UART1_BASE

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "epdc_waveform=epdc_splash.bin\0" \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 0dd40563c29b..9d8737c19425 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -12,7 +12,7 @@

#define CONFIG_MXC_UART_BASE UART1_BASE

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 6f5dffe4fbb8..8372f979dc86 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -34,7 +34,7 @@ #define UPDATE_M4_ENV "" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index cb1019bd56a7..90c788468710 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -30,7 +30,7 @@

#endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 0e986093f35a..4a27fd22902b 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -24,7 +24,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc0\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 377e4d9c4b27..183e67857ca1 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -50,7 +50,7 @@ "bootimg part 0 1;"\ "rootfs part 0 2\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 85922fa436cb..5ee5129801d2 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM 0x60000000 #define CFG_SYS_SDRAM_BASE PHYS_SDRAM

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttyLP0\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 99e01896c71b..5f4cd9306231 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM_SIZE SZ_1G #define CFG_SYS_SDRAM_BASE PHYS_SDRAM

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttyLP0\0" \ diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index a32fcd57f8fc..43261824d3cf 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -33,7 +33,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 1b7eb3433483..9676ccc982f5 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -35,7 +35,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=console=ttyS0,115200\0" \ "autostart=no\0"

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 5020b3bb71db..e1689679e5f6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -66,7 +66,7 @@ #include <config_distro_bootcmd.h> #include <linux/stringify.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 04bff3ca4f67..96c23b5b5af7 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -58,7 +58,7 @@ #define CFG_SYS_ONENAND_BASE ONENAND_MAP

/* Environment information */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \ "stdin=usbtty,serial,keyboard\0" \ "stdout=usbtty,serial,vidconsole\0" \ diff --git a/include/configs/novena.h b/include/configs/novena.h index 4e46dfc526ce..19b40070be92 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -64,7 +64,7 @@ #endif

/* Extra U-Boot environment. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "consdev=ttymxc1\0" \ diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 09c4ddb6646b..07580f409492 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -40,7 +40,7 @@

#define CONFIG_FEC_ENET_DEV 1

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "image=zImage\0" \ "fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \ diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 62f07011809c..76c4aed6fd91 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -36,7 +36,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "kernel=/boot/zImage\0" \ "fdt=/boot/nsa310s.dtb\0" \ diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h index ea1edab9fc12..0e1083a2130c 100644 --- a/include/configs/o4-imx6ull-nano.h +++ b/include/configs/o4-imx6ull-nano.h @@ -15,7 +15,7 @@ # define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif /* CONFIG_CMD_USB */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "mmcdev=0\0" \ "mmcpart=2\0" \ "mmcargs=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcpart} console=ttymxc0,${baudrate} panic=30\0" \ diff --git a/include/configs/octeontx2_common.h b/include/configs/octeontx2_common.h index 03d1a8e7b5fc..c4db38562d83 100644 --- a/include/configs/octeontx2_common.h +++ b/include/configs/octeontx2_common.h @@ -15,7 +15,7 @@ /** Stack starting address */

/** Extra environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=20080000\0" \ "ethrotate=yes\0"

diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index 58275ccffa01..0be26ef3287f 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -17,7 +17,7 @@

#include <config_distro_bootcmd.h> /* Extra environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x20080000\0" \ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x03000000\0" \ @@ -27,7 +27,7 @@ #else

/** Extra environment settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=20080000\0" \ "autoload=0\0"

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index e2331e45cdfe..3ac13a65d63f 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -71,7 +71,7 @@ * 1. BOOT: 100MiB 2MiB * 2. ROOT: - */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \ "boot.scr\0" \ "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 7a81585494a9..a1542f3f8025 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -68,8 +68,8 @@ */

/* Define new extra env settings, including DFU settings */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS \ EXYNOS_FDTFILE_SETTING \ MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f4e23bbb0f30..efeb7bf10078 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -73,7 +73,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 8bb8521f1c1c..adb25a62970c 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -69,7 +69,7 @@

#include <environment/ti/mmc.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index a6b5e55b5415..93d36353ffb0 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -59,7 +59,7 @@ "if test ${fdtfile} = ''; then " \ "echo WARNING: Could not determine device tree to use; fi; \0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_FINDFDT \ ENV_DEVICE_SETTINGS \ MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 389553775100..957f1c369e6d 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -30,7 +30,7 @@

/* Environment information */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mmcdev=0\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 788a1113868b..02b88da28efa 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -138,7 +138,7 @@

#include <environment/ti/mmc.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \ diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index 5b097e9fef29..5adfc6719585 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -20,7 +20,7 @@ * Board boot configuration */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x86000000\0" \ "kernel_addr_r=0x80200000\0" \ "image=boot/Image\0" \ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 006f06e6af5c..ec3a0e0676d7 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -27,7 +27,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console=ttyS0,115200 " \ +#define CFG_EXTRA_ENV_SETTINGS "x_bootargs=console=ttyS0,115200 " \ CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ "x_bootcmd_usb=usb start\0" \ diff --git a/include/configs/origen.h b/include/configs/origen.h index 6633d541a31b..d4ba599d72a4 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -23,7 +23,7 @@ /* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x40007000\0" \ "rdaddr=0x48000000\0" \ "kerneladdr=0x40007000\0" \ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 9738e9fa9cb7..88182fde972b 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -424,7 +424,7 @@

#include "p1_p2_bootsrc.h"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \ "loadaddr=1000000\0" \ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 2a1660bf188d..146f87e9ce33 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -45,7 +45,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ "fdt_addr_r=0x82000000\0" \ "fdt_high=0xffffffff\0" \ diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index 4421e740d9ea..0890c115700c 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -65,7 +65,7 @@ "mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \

/* Default environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "console=ttymxc0,115200n8\0" \ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 5c2ff5d02ee7..34994016c54c 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -29,7 +29,7 @@ /* boot command, including the target-defined one if any */

/* Extra env settings (including the target-defined ones if any) */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ PCM052_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 3674e4cddaed..2991076c50a1 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -39,7 +39,7 @@ "nandloadfit=ubi part rootfs;ubi readvol ${loadaddr} fit\0" \ "nandboot=run nandloadfit;run nandargs;bootm ${loadaddr}\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x30000000\0" \ "optargs=rw rootwait\0" \ ENV_MMC \ diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 71807837673f..80b14b002a92 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -32,7 +32,7 @@ #define CONSOLE_DEV "ttyO5" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "fdtfile=am335x-pdu001.dtb\0" \ "bootfile=zImage\0" \ diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index f922491637d9..4e6dc79f41b2 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -62,7 +62,7 @@ #include <environment/ti/dfu.h> #include <environment/ti/mmc.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_MMC_TI_ARGS \ DEFAULT_LINUX_BOOT_ENV \ "bootfile=zImage\0" \ diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 7f73117ac1c8..9160c78c0464 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -20,7 +20,7 @@ /* For RAW image gives a error info not panic */ #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc2,115200\0" \ "fdt_addr=0x48000000\0" \ diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 11a833bb1276..16505529afc7 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -19,7 +19,7 @@

#endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x48000000\0" \ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 3cc2a693ceee..60c747327588 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -69,7 +69,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ CONFIG_LEGACY_BOOTCMD_ENV \ BOOTENV diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 719b70144051..66258a3ab73b 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -38,7 +38,7 @@ "bootmenu_3=Boot using PICO-Nymph baseboard=" \ "setenv baseboard nymph; saveenv; run base_boot\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ BOOTMENU_ENV \ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 5dfd737cf7a4..a4b97451cfdc 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -47,7 +47,7 @@ "bootmenu_2=Boot using PICO-Pi baseboard=" \ "setenv fdtfile imx6ul-pico-pi.dtb\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "splashpos=m,m\0" \ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 581921510426..7fc6211ff732 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -51,7 +51,7 @@ BOOTENV #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index f9301a5524b9..ac25991703f2 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -25,7 +25,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index a233fb8ed746..f4a34f261a6e 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -144,7 +144,7 @@ /* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 9fd897958a4f..4994d7367fe8 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -168,7 +168,7 @@ /* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 085732214e50..af750e86ee98 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -18,7 +18,7 @@ * Default environment variables */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs_console=console=ttyS0,115200\0" \ "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \ "ext2load usb 0:1 0x01100000 /uInitrd\0" diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index b5ce2dd13d08..016da6d04b0b 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -61,7 +61,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 518d7a3639c5..7998ef7347fb 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -17,7 +17,7 @@ #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_IPADDR 192.168.0.2 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ +#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ "stdout=serial\0" \ "stderr=serial\0" \ diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h index 1c11685f49e4..8e74dc488875 100644 --- a/include/configs/pomelo.h +++ b/include/configs/pomelo.h @@ -21,7 +21,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ BOOTENV \ "scriptaddr=0x90100000\0" \ diff --git a/include/configs/poplar.h b/include/configs/poplar.h index c58105597e47..6e8adf91877c 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -31,7 +31,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loader_mmc_blknum=0x0\0" \ "loader_mmc_nblks=0x780\0" \ "env_mmc_blknum=0xf80\0" \ diff --git a/include/configs/porter.h b/include/configs/porter.h index 88fa65e0ffc1..969e175883bb 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -34,7 +34,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

/* SPL support */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 2b25c31b1d8d..df07df6a5a72 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -54,7 +54,7 @@ #define GLOBAL_IO_DRIVE_CONTROL_OFFSET 0x4c

/* max command args */ -#define CONFIG_EXTRA_ENV_SETTINGS "silent=y\0" +#define CFG_EXTRA_ENV_SETTINGS "silent=y\0"

/* nand driver parameters */ #ifdef CONFIG_TARGET_PRESIDIO_ASIC diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 99376155b491..003686930a4b 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -27,7 +27,7 @@ "ramdisk_addr_r=0x0a200000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 48f49906b84e..10eaeb49de62 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -28,7 +28,7 @@ /* Use common default */

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=pxm2\0" \ "ubi_off=2048\0"\ "nand_img_size=0x500000\0" \ diff --git a/include/configs/qcs404-evb.h b/include/configs/qcs404-evb.h index c41bb341d82e..8ea59aa21ca6 100644 --- a/include/configs/qcs404-evb.h +++ b/include/configs/qcs404-evb.h @@ -13,7 +13,7 @@

#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x5000000\0" \ "bootm_low=0x80000000\0" \ "bootcmd=bootm $prevbl_initrd_start_addr\0" diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index a67af73fd56f..45bd94ee5c76 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -76,7 +76,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_addr=0x40000000\0" \ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 72f35cc05420..11c795787887 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -36,7 +36,7 @@ #define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \ "qemu "

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 59d56d666242..777df4c11259 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -38,7 +38,7 @@ #define EEPROM_ADDR_CHIP 0x120

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=rastaban\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index e9cbd2538240..54844fe69662 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -33,7 +33,7 @@

/* ENV setting */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

#endif /* __RCAR_GEN3_COMMON_H */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index a4cae697181d..ea6073f29446 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -25,7 +25,7 @@

/* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index 99c86edeaa40..c4758e148ba7 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -24,7 +24,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6fffffff\0" \ "initrd_high=0x6fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 302546630ac6..5b0ec3700040 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -27,7 +27,7 @@ "ramdisk_addr_r=0x64000000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 334fb3affa5e..58f491c2f320 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -31,7 +31,7 @@

/* Linux fails to load the fdt if it's loaded above 256M on a Rock board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x6fffffff\0" \ "initrd_high=0x6fffffff\0" \ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 58ad62afe165..b95268df87c2 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -27,7 +27,7 @@

/* Linux fails to load the fdt if it's loaded above 512M on a evb-rk3036 board, * so limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0x7fffffff\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 6b55c57dd770..d3b8a5150f6b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -30,7 +30,7 @@

/* Linux fails to load the fdt if it's loaded above 256M on a Rock 2 board, so * limit the fdt reallocation to that */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x0fffffff\0" \ "initrd_high=0x0fffffff\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 4b510b139910..bc03e113fef0 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -22,7 +22,7 @@ "ramdisk_addr_r=0x04000000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 132b7d0fe9bc..85d2186f23e0 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -22,7 +22,7 @@ "ramdisk_addr_r=0x06000000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 92cdc1a51fbd..17636250510b 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -25,7 +25,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 78f624d31ca2..43066933d02f 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -44,7 +44,7 @@

#include <config_distro_bootcmd.h> #include <environment/distro/sf.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index d43dc2580e46..750f16d03999 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -21,7 +21,7 @@ "ramdisk_addr_r=0x0a200000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index e3549275138b..c3f8e7bf85cd 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -157,7 +157,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \ diff --git a/include/configs/rut.h b/include/configs/rut.h index b07d0c50604d..99799f8494e0 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -27,7 +27,7 @@ /* Use common default */

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=rut\0" \ "ubi_off=2048\0"\ "nand_img_size=0x500000\0" \ diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 84a5ae6965dd..6e17b23b624c 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -26,7 +26,7 @@ "ramdisk_addr_r=0x64000000\0"

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index e071d4da5e86..02c469049adb 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -142,7 +142,7 @@ #define EXTRA_ENV_BOOT_LOGO EXTRA_ENV_DTB_RESERVE #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "rootdev=" __stringify(CONFIG_ROOT_DEV) "\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index b7a91af008c7..f898d2d9ee52 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -61,7 +61,7 @@

#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ "onenand write 0x32008000 0x0 0x100000\0" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 80d3fc9258cc..bf2d04a169b3 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -29,7 +29,7 @@ ",100M(swap)"\ ",-(UMS)\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x100000;" \ "onenand write 0x42008000 0x0 0x100000\0" \ diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h index f7cdd5a19568..9a4fe530a20b 100644 --- a/include/configs/sdm845.h +++ b/include/configs/sdm845.h @@ -13,7 +13,7 @@

#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x4000000\0" \ "bootm_low=0x80000000\0" \ "stdout=vidconsole\0" \ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 19701ccce22e..a228dac2ee92 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -15,7 +15,7 @@ /* * Environment variables configurations */ -#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ +#define CFG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \ "x_bootcmd_usb=usb start\0" \ diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 5ad2124bddab..59e40710de48 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -39,7 +39,7 @@ "name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \ "name=system,size=-,bootable,type=${type_guid_gpt_system};"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index f4b1a16019ec..3cf300a2e459 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -36,7 +36,7 @@ "name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \ "name=system,size=-,bootable,type=${type_guid_gpt_system};"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x84000000\0" \ "kernel_comp_addr_r=0x88000000\0" \ "kernel_comp_size=0x4000000\0" \ diff --git a/include/configs/silk.h b/include/configs/silk.h index 58613effaf47..025d56671122 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -34,7 +34,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

/* SPL support */ diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 974531ea0d82..760a0a5b9135 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -11,8 +11,8 @@ #define CFG_SYS_SDRAM_BASE 0x80000000 #define CFG_SYS_SDRAM_SIZE SZ_8M

-#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80060000\0" \ "fdt_addr_r=0x80400000\0" \ "scriptaddr=0x80020000\0" \ diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index ff0ed180e92e..748a423b0833 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -14,10 +14,10 @@ "stderr=serial\0"

/* - * Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h + * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index b988b96e58d8..762f61470b15 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -73,7 +73,7 @@ * Predefined environment variables. * Usefull to define some easy to use boot commands. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ \ "basicargs=console=ttyS0,115200\0" \ \ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ccb7ec38d033..c148757915a2 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -28,7 +28,7 @@ " mem=128M " \ " " CONFIG_MTDPARTS_DEFAULT

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x40000;" \ "onenand write 0x32008000 0x0 0x40000\0" \ diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 14f9cf560286..11031744bef8 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -17,7 +17,7 @@ /* MMC Config*/ #define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "image=zImage\0" \ "console=ttymxc0\0" \ "fdtfile=imx7d-smegw01.dtb\0" \ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index b7aa49ce435e..df8ed451a43a 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -41,7 +41,7 @@

/* Environment settings */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "ethaddr=00:00:00:00:00:00\0" \ "serial=0\0" \ "stdout=serial_atmel\0" \ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index afca7e18e9be..eaee8dd37396 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -62,7 +62,7 @@ * Environment */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x82000000\0" \ "loadaddr=0x82000000\0" \ "fdt_addr_r=0x88000000\0" \ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 29b4b22b3988..f12163ccc990 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -52,7 +52,7 @@ "develop=" \ "tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CONFIG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_NEW_ENV \ diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h index aa13878177ef..2ce7011529a4 100644 --- a/include/configs/socfpga_chameleonv3.h +++ b/include/configs/socfpga_chameleonv3.h @@ -19,7 +19,7 @@ */ #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "autoload=no\0" \ "bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \ "distro_bootcmd=bridge enable; run bootcmd_mmc\0" \ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 807bff43e00a..3603bb9f4a0b 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -148,8 +148,8 @@

#include <config_distro_bootcmd.h>

-#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "bootm_size=0xa000000\0" \ "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index 8f1c2de998ea..565a661258fd 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -13,7 +13,7 @@ /* Environment is in MMC */

/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index e76438e228d5..ac70d91e2081 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -13,7 +13,7 @@ /* Environment is in MMC */

/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ "bootscript=boot.scr\0" \ diff --git a/include/configs/socfpga_n5x_socdk.h b/include/configs/socfpga_n5x_socdk.h index c295e91e3d3e..fe5286e12cd1 100644 --- a/include/configs/socfpga_n5x_socdk.h +++ b/include/configs/socfpga_n5x_socdk.h @@ -9,8 +9,8 @@

#include <configs/socfpga_soc64_common.h>

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootfile=" CONFIG_BOOTFILE "\0" \ "fdt_addr=1100000\0" \ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index df3927297bbe..66ecb168a0a0 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -36,7 +36,7 @@ /* * Environment variable */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bootfile=" CONFIG_BOOTFILE "\0" \ "fdt_addr=8000000\0" \ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 70d9f3607a67..cd48650dd554 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -28,7 +28,7 @@ * Linux system after 5 seconds */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "consdev=ttyS0\0" \ "baudrate=115200\0" \ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 95393d3ab25e..fb2b76eb829a 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -139,7 +139,7 @@ #define CFG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index de0f48b79a15..e13280563513 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 1 #endif /* CONFIG_FSL_USDHC */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "console=ttymxc0\0" \ "initrd_addr=0x86800000\0" \ diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index a5987c5e17a1..e58ddd752cd3 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -38,7 +38,7 @@ #define BOOTCMD_ENV \ "fastbootcmd=echo '*** FASTBOOT MODE ***'; fastboot usb 0\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOT_ENV \ CONSOLE_ENV \ FASTBOOT_ENV \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 9294d57ca84e..b3fce5031687 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -29,7 +29,7 @@ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x40000000\0" \ "fdtfile=stih410-b2260.dtb\0" \ "fdt_addr_r=0x47000000\0" \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index afd7d50428bf..de5019a364a0 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -15,7 +15,7 @@

#define CFG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \ "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ "bootm 0x08044000 - 0x08042000\0" diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index c8aad47966fe..a4f3e43dc5a1 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00008000\0" \ "fdtfile=stm32429i-eval.dtb\0" \ "fdt_addr_r=0x00408000\0" \ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 573a6b179561..62a7e9af0c56 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x00008000\0" \ "fdtfile=stm32f469-disco.dtb\0" \ "fdt_addr_r=0x00408000\0" \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 14e883a35892..34856d300403 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -24,7 +24,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xC0008000\0" \ "fdtfile="CONFIG_DEFAULT_DEVICE_TREE".dtb\0" \ "fdt_addr_r=0xC0408000\0" \ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 67e6a3a19d21..d36cd6fdd44a 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xD0008000\0" \ "fdtfile=stm32h743i-disco.dtb\0" \ "fdt_addr_r=0xD0408000\0" \ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 4786eb001bc1..8f242bf0ff6e 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xD0008000\0" \ "fdtfile=stm32h743i-eval.dtb\0" \ "fdt_addr_r=0xD0408000\0" \ diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index e667fe6f6ac2..d27b6a3d1de2 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -21,7 +21,7 @@ func(MMC, mmc, 0)

#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0xC0008000\0" \ "fdtfile=stm32h750i-art-pi.dtb\0" \ "fdt_addr_r=0xC0408000\0" \ diff --git a/include/configs/stm32mp13_common.h b/include/configs/stm32mp13_common.h index c259a616133b..7c59c69e0bdc 100644 --- a/include/configs/stm32mp13_common.h +++ b/include/configs/stm32mp13_common.h @@ -81,7 +81,7 @@ "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \ "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ STM32MP_BOOTCMD \ BOOTENV \ diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index c9cfadd9ce0b..ec8c8fba91f1 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -138,7 +138,7 @@ "fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \ "ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ STM32MP_BOOTCMD \ STM32MP_PARTS_DEFAULT \ diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 910d7ef107b5..919216906249 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -12,7 +12,7 @@ #define PHY_ANEG_TIMEOUT 20000

#ifdef CONFIG_SPL_BUILD -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "dfu_alt_info_ram=u-boot.itb ram " \ __stringify(CONFIG_SPL_LOAD_FIT_ADDRESS) \ " 0x800000\0" diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h index 38b5aa7319cf..d0cd4130cec2 100644 --- a/include/configs/stm32mp15_st_common.h +++ b/include/configs/stm32mp15_st_common.h @@ -18,7 +18,7 @@ 230400, 460800, 921600, \ 1000000, 2000000 }

-#ifdef CONFIG_EXTRA_ENV_SETTINGS +#ifdef CFG_EXTRA_ENV_SETTINGS /* * default bootcmd for stm32mp1 STMicroelectronics boards: * for serial/usb: execute the stm32prog command @@ -42,8 +42,8 @@ "run distro_bootcmd;" \ "fi;\0"

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ STM32MP_MEM_LAYOUT \ ST_STM32MP1_BOOTCMD \ STM32MP_PARTS_DEFAULT \ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index faff8d6ed6d1..be0193105b4b 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -15,7 +15,7 @@ #define LDS_BOARD_TEXT \ board/sysam/stmark2/sbf_dram_init.o (.text*)

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kern_size=0x700000\0" \ "loadaddr=0x40001000\0" \ "-(rootfs)\0" \ diff --git a/include/configs/stout.h b/include/configs/stout.h index f49e88cb17cb..5058e0a204d7 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -38,7 +38,7 @@

/* Board Clock */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"

/* SPL support */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1677aafad03b..f3c8f7002342 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -324,7 +324,7 @@ #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_EXTRA_SETTINGS \ diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 699268900109..271080303fb6 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -92,7 +92,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r=0x9fe00000\0" \ "kernel_addr_r=0x90000000\0" \ "ramdisk_addr_r=0xa0000000\0" \ diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h index 7af7b08eb485..e8a207f54167 100644 --- a/include/configs/syzygy_hub.h +++ b/include/configs/syzygy_hub.h @@ -10,7 +10,7 @@ #ifndef __CONFIG_SYZYGY_HUB_H #define __CONFIG_SYZYGY_HUB_H

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \ "bitstream_image=download.bit\0" \ "loadbit_addr=0x1000000\0" \ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 30f842558207..855218a8901e 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -72,7 +72,7 @@ /* bootstrap in spi flash , u-boot + env + linux in nandflash */

#if defined(CONFIG_BOARD_AXM) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ "${gatewayip}:${netmask}:${hostname}:${netdev}::off\0" \ "addtest=setenv bootargs ${bootargs} loglevel=4 test\0" \ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index fcc967494220..61f252cb638c 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -33,7 +33,7 @@ #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #endif /* CONFIG_CMD_USB */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \ "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 69acabf19fdd..31c82822a2af 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -65,7 +65,7 @@ #define INITRD_HIGH "ffffffff" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "fdt_high=" FDT_HIGH "\0" \ diff --git a/include/configs/ten64.h b/include/configs/ten64.h index 57724719a9d6..e86c16313293 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -34,9 +34,9 @@ func(PXE, pxe, 0) #include <config_distro_bootcmd.h>

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ten64\0" \ "fdt_addr_r=0x90000000\0" \ "fdt_high=0xa0000000\0" \ diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index af0a095dfc8c..f34063249e48 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -20,9 +20,9 @@

/* Environment settings */

-#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "tftpdir=" DEF_ENV_TFTPDIR "\0" \ "eth_init=" DEF_ENV_ETH_INIT "\0" \ "ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0" \ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 76b496303f3e..9722b0db72aa 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -35,7 +35,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */

/* Keep device tree and initrd in lower memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/thuban.h b/include/configs/thuban.h index c8b27263e85e..1753fa410d18 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -31,7 +31,7 @@ #define EEPROM_ADDR_CHIP 0x120

/* Default env settings */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hostname=thuban\0" \ "ubi_off=2048\0"\ "nand_img_size=0x400000\0" \ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 7becf1eb7cb4..8ba40546b2c0 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -35,7 +35,7 @@ /* Initial environment variables */ #define UBOOT_IMG_HEAD_SIZE 0x40 /* C80000 - 0x40 */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr=08007ffc0\0" \ "fdt_addr=0x94C00000\0" \ "fdt_high=0x9fffffff\0" diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 03849adb5abe..28dba4aa95b6 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -20,7 +20,7 @@

/* commands to include */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x80F80000\0" \ "rdaddr=0x81000000\0" \ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 7b04292d2188..2d9d2fd66e9a 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -12,7 +12,7 @@ #include <configs/ti_armv7_omap.h> #include <asm/arch/omap.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV

/* Clock Defines */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ea45bba409cb..479ab46e4edd 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -106,7 +106,7 @@ "rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; " \ "rproc start ${dev_pmmc}\0" \

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ ENV_KS2_BOARD_SETTINGS \ DFUARGS \ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 64ec59d78eb6..49f4263e16ba 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -58,7 +58,7 @@ #include <config_distro_bootcmd.h> #include <environment/ti/mmc.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 37ab2e446724..e9723ed5b3dd 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -247,7 +247,7 @@

#include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 83abaeddf125..3795e6152fa9 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -44,8 +44,8 @@ # define EXTRA_ENV_USB #endif

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_image=uImage\0" \ "kernel_addr=0x2080000\0" \ "ramdisk_image=uramdisk.image.gz\0" \ diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 0f28690612ab..e007be8e4564 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -28,7 +28,7 @@ #define PHYS_SDRAM_2 0x8080000000 #define PHYS_SDRAM_2_SIZE 0x180000000

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ "load_addr=0xa0000000\0" \ "kernel_addr_r=0x80080000\0" \ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 7a1ad9544a30..14d7730f67bf 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -197,7 +197,7 @@ /* set to a resonable value, changeable by user */ #define TQMA6_CMA_SIZE 160M

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "board=tqma6\0" \ "uimage=uImage\0" \ "zimage=zImage\0" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3eac66539dfe..2067327918a2 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -54,7 +54,7 @@ "params.bin raw 0x38 0x8;" \ "/Image.itb ext4 0 2\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootk=" \ "run loaduimage;" \ "if run loaddtb; then " \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 125d3e776a3f..21372243bbc8 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -55,7 +55,7 @@ "params.bin raw 0x38 0x8;" \ "/Image.itb ext4 0 2\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootk=" \ "run loaduimage;" \ "if run loaddtb; then " \ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index fdb420ed874e..3443c80d06ef 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -35,7 +35,7 @@ "lzmadec 0x5000000 0x5800000 && " \ "bootm 0x5800000"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr=0x4c00000\0" \ "scriptaddr=0x4d00000\0" \ "pxefile_addr_r=0x4e00000\0" \ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 52de4cdc7893..47b220ff9ee7 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -80,7 +80,7 @@ "fi; " \ "bootz 0x1000000"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ diff --git a/include/configs/udoo.h b/include/configs/udoo.h index fac8c1eeb4e2..f0092eff1494 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -15,7 +15,7 @@ /* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc1,115200\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index d4c92233acaa..5d7d734daa2d 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -19,7 +19,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE

/* Linux only */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 8cd81f1cdddc..2fe056cfef4a 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -92,7 +92,7 @@ "run boot_common\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_addr_r_offset=0x05100000\0" \ "kernel_addr_r_offset=" KERNEL_ADDR_R_OFFSET "\0" \ "ramdisk_addr_r_offset=0x06000000\0" \ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 657dbadd3396..b90e047955b9 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -43,6 +43,6 @@ #endif

/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \

#endif diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a2bc3cd23a5b..f273533be429 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -41,7 +41,7 @@ "pxefile_addr_r=0x70800000\0" \ "ramdisk_addr_r=0x73000000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \ "fdtfile=imx53-usbarmory.dtb\0" \ diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index b03159805c15..2e150276e7a4 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -25,7 +25,7 @@ #error Unknown DDR size - please add! #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "loadaddr=0x81000000\0" \ "spi_image_off=0x00100000\0" \ "console=ttyS0,115200\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 18ac6b2b0895..7f3fa795afdc 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -34,7 +34,7 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 88839a6e561a..3ce2714e196e 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -46,7 +46,7 @@ #endif

/* Initial environment variables */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 30c1f5025b05..87b8c5d57ee7 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -244,7 +244,7 @@ #include <config_distro_bootcmd.h>

/* Default load addresses and names for the different payloads. */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \ "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \ "pxefile_addr_r=" __stringify(VEXPRESS_PXEFILE_ADDR) "\0" \ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index e8b6acf8b8fe..705a941e3603 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -145,7 +145,7 @@ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h>

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x60100000\0" \ "fdt_addr_r=0x60000000\0" \ "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 14e6b2bac91c..0e0b3a7b594d 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -44,7 +44,7 @@ "rdaddr=0x84080000\0" \ "ramdisk_addr_r=0x84080000\0"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 9f72bdde8167..74ee61f09238 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -48,7 +48,7 @@

/* Update the bootcommand according to our mapping for the VInCo platform */

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "kernel_start=0x20000\0" \ "kernel_size=0x800000\0" \ "mmcblksize=0x200\0" \ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 6923009d4598..1e765439fabe 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -20,7 +20,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 3cdf4a1ffc67..709bb046d018 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -26,7 +26,7 @@ #define BOOT_SCR_STRING "source ${bootscriptaddr}\0" #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "bootscr_fitimage_name=bootscr\0" \ diff --git a/include/configs/x530.h b/include/configs/x530.h index dee87cb77325..f20a85cfa19a 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -49,7 +49,7 @@ #include <asm/arch/config.h>

/* Keep device tree and initrd in low memory so the kernel can access them */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ "initrd_high=0x10000000\0"

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 3e17b53dde2d..7705d31a313a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -60,7 +60,7 @@ #define SPLASH_SETTINGS #endif

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ CONFIG_STD_DEVICES_SETTINGS \ SPLASH_SETTINGS \ diff --git a/include/configs/xea.h b/include/configs/xea.h index b432ab2dc8ef..50b96f31e163 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -28,7 +28,7 @@ /* Extra Environment */ #define CONFIG_HOSTNAME "xea"

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootmode=update\0" \ "bootpri=mmc_mmc\0" \ "bootsec=sf_swu\0" \ diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index 612436aeb48f..bc268d25dc3a 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -9,12 +9,12 @@ #include <linux/types.h> #endif

-#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS

#undef CFG_SYS_SDRAM_BASE

-#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "loadimage=ext4load pvblock 0 0x90000000 /boot/Image;\0" \ "pvblockboot=run loadimage;" \ "booti 0x90000000 - 0x88000000;\0" diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index ee3130ed3277..836a6506b1ad 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -127,8 +127,8 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h index e1f95de3c34f..23655a475221 100644 --- a/include/configs/xilinx_versal_mini.h +++ b/include/configs/xilinx_versal_mini.h @@ -10,11 +10,11 @@ #ifndef __CONFIG_VERSAL_MINI_H #define __CONFIG_VERSAL_MINI_H

-#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS

#include <configs/xilinx_versal.h>

/* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

#endif /* __CONFIG_VERSAL_MINI_H */ diff --git a/include/configs/xilinx_versal_net.h b/include/configs/xilinx_versal_net.h index 7d77189693e2..b8d2685246f3 100644 --- a/include/configs/xilinx_versal_net.h +++ b/include/configs/xilinx_versal_net.h @@ -124,8 +124,8 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV \ DFU_ALT_INFO diff --git a/include/configs/xilinx_versal_net_mini.h b/include/configs/xilinx_versal_net_mini.h index 1939832a848e..50bacc39ac58 100644 --- a/include/configs/xilinx_versal_net_mini.h +++ b/include/configs/xilinx_versal_net_mini.h @@ -11,11 +11,11 @@ #ifndef __CONFIG_VERSAL_NET_MINI_H #define __CONFIG_VERSAL_NET_MINI_H

-#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS

#include <configs/xilinx_versal_net.h>

/* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

#endif /* __CONFIG_VERSAL_NET_MINI_H */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index efe241df97eb..f07e7d3f0ac3 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -174,16 +174,16 @@ #include <config_distro_bootcmd.h>

/* Initial environment variables */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif

/* SPL can't handle all huge variables - define just DFU */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) -#undef CONFIG_EXTRA_ENV_SETTINGS -# define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +# define CFG_EXTRA_ENV_SETTINGS \ "dfu_alt_info_ram=uboot.bin ram 0x8000000 0x1000000;" \ "atf-uboot.ub ram 0x10000000 0x1000000;" \ "Image ram 0x80000 0x3f80000;" \ diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 1c0ab25c6440..9af05456640b 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -10,11 +10,11 @@ #ifndef __CONFIG_ZYNQMP_MINI_H #define __CONFIG_ZYNQMP_MINI_H

-#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS

#include <configs/xilinx_zynqmp.h>

/* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

#endif /* __CONFIG_ZYNQMP_MINI_H */ diff --git a/include/configs/xilinx_zynqmp_r5.h b/include/configs/xilinx_zynqmp_r5.h index 3a7b7e03d6af..918aa3d7402a 100644 --- a/include/configs/xilinx_zynqmp_r5.h +++ b/include/configs/xilinx_zynqmp_r5.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_ZYNQMP_R5_H #define __CONFIG_ZYNQMP_R5_H

-#define CONFIG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS

/* Serial drivers */ /* The following table includes the supported baudrates */ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index 3e604894ad48..a480bb720b58 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -37,7 +37,7 @@ #define CONFIG_UBOOT_SECTOR_START 0x2 #define CONFIG_UBOOT_SECTOR_COUNT 0x3fe

-#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "console=ttymxc6\0" \ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index b8c142fed37b..7f739d9ada0e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -174,8 +174,8 @@ #endif /* CONFIG_SPL_BUILD */

/* Default environment */ -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x20000\0" \ "script_size_f=0x40000\0" \ "fdt_addr_r=0x1f00000\0" \ diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index ac6e8c4ff867..a9bb5bb90ad1 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -12,7 +12,7 @@ #include <configs/zynq-common.h>

/* Undef unneeded configs */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS

#undef CFG_SYS_INIT_RAM_ADDR #undef CFG_SYS_INIT_RAM_SIZE diff --git a/include/env_default.h b/include/env_default.h index 4e461c815a79..1621815f257a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -118,8 +118,8 @@ const char default_environment[] = { /* This is created in the Makefile */ CONFIG_EXTRA_ENV_TEXT #endif -#ifdef CONFIG_EXTRA_ENV_SETTINGS - CONFIG_EXTRA_ENV_SETTINGS +#ifdef CFG_EXTRA_ENV_SETTINGS + CFG_EXTRA_ENV_SETTINGS #endif "\0" #else /* CONFIG_USE_DEFAULT_ENV_FILE */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 99b3796584d0..62bb86b56fd6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -21,7 +21,7 @@ CFG_ENV_SROM_BANK CFG_ENV_TOTAL_SIZE CFG_ET1100_BASE CFG_ETHBASE -CONFIG_EXTRA_ENV_SETTINGS +CFG_EXTRA_ENV_SETTINGS CONFIG_FB_ADDR CONFIG_FDTADDR CONFIG_FDTFILE

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/colibri_vf.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 122b599a6f21..ef49969598c9 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -20,7 +20,7 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

-#define CONFIG_FDTADDR 0x84000000 +#define CFG_FDTADDR 0x84000000

#define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 66728d47db38..e436bf55d94d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -23,7 +23,7 @@ CFG_ET1100_BASE CFG_ETHBASE CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR -CONFIG_FDTADDR +CFG_FDTADDR CONFIG_FDTFILE CONFIG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED

Signed-off-by: Tom Rini trini@konsulko.com --- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/seeed/npi_imx6ull/npi_imx6ull.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/mx6ul_14x14_evk.h | 6 +++--- include/configs/mx6ullevk.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 1eec048a66fa..570b5014dbb1 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -281,7 +281,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif

#ifdef CONFIG_USB_EHCI_MX6 diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 86c11c7bd3a5..e24738064757 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -110,7 +110,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif

return 0; diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c index eb9ee555c854..c610d2c30696 100644 --- a/board/seeed/npi_imx6ull/npi_imx6ull.c +++ b/board/seeed/npi_imx6ull/npi_imx6ull.c @@ -100,7 +100,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif

return 0; diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c index 7326daa1798d..98d8d1c31205 100644 --- a/board/variscite/dart_6ul/dart_6ul.c +++ b/board/variscite/dart_6ul/dart_6ul.c @@ -147,7 +147,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC - setup_fec(CONFIG_FEC_ENET_DEV); + setup_fec(CFG_FEC_ENET_DEV); #endif

#ifdef CONFIG_NAND_MXS diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index a8273a7fcd8d..63afa6e18969 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -19,7 +19,7 @@ #endif /* CONFIG_SPL_BUILD */

/* ENET1 connects to base board and MUX with ESAI */ -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 #define CONFIG_FEC_MXC_PHYADDR 0x0

/* EEPROM */ diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index 323703ac5c90..c2ed9c7c56af 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -18,7 +18,7 @@ #endif

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0 #endif

/* Environment settings */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 938ab5ade9a7..7200c69bd9e6 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -100,7 +100,7 @@ #endif

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0

#define CONFIG_FEC_MXC_PHYADDR 0x0 #endif diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 90c788468710..efc599f37a6d 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -121,11 +121,11 @@ #endif

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1

-#if (CONFIG_FEC_ENET_DEV == 0) +#if (CFG_FEC_ENET_DEV == 0) #define CONFIG_FEC_MXC_PHYADDR 0x2 -#elif (CONFIG_FEC_ENET_DEV == 1) +#elif (CFG_FEC_ENET_DEV == 1) #define CONFIG_FEC_MXC_PHYADDR 0x1 #endif #endif diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 4a27fd22902b..58d1a744ae99 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -109,7 +109,7 @@ /* environment organization */

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 #endif

#endif diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 07580f409492..8f052c5ae38f 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -38,7 +38,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1 #endif

-#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1

#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \ diff --git a/include/configs/xpress.h b/include/configs/xpress.h index a480bb720b58..d095e63182ee 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -31,7 +31,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0

-#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0 #define CONFIG_FEC_MXC_PHYADDR 0x0

#define CONFIG_UBOOT_SECTOR_START 0x2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6a20473cd6ea..0a60216b8050 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -25,7 +25,7 @@ CFG_EXTRA_ENV_SETTINGS CFG_FB_ADDR CFG_FDTADDR CFG_FDTFILE -CONFIG_FEC_ENET_DEV +CFG_FEC_ENET_DEV CONFIG_FEC_FIXED_SPEED CONFIG_FEC_MXC_PHYADDR CONFIG_FLASH_BR_PRELIM

Signed-off-by: Tom Rini trini@konsulko.com --- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- doc/README.fec_mxc | 2 +- drivers/net/fec_mxc.c | 4 ++-- include/configs/aristainetos2.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/nitrogen6x.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index 9733a33ee2c2..1b08a2c5abf2 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis) gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1); /* MAC initialization */ return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI, - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); + CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE); }

/* diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 7340a3440231..9205d5ef6ddb 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis) setup_fec();

ret = fecmxc_initialize_multi(bis, 1, - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE); + CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE); if (ret) printf("FEC%d MXC: %s:failed\n", 1, __func__);

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc index d27276b8783e..7aadea222f85 100644 --- a/doc/README.fec_mxc +++ b/doc/README.fec_mxc @@ -18,7 +18,7 @@ CONFIG_PHYLIB CONFIG_FEC_MXC_NO_ANEG Relevant only if PHYLIB not used. Skips auto-negotiation restart.

-CONFIG_FEC_MXC_PHYADDR +CFG_FEC_MXC_PHYADDR Optional, selects the exact phy address that should be connected and function fecmxc_initialize will try to initialize it.

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 659625a29d39..8c231ec80066 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1090,8 +1090,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) int addr;

addr = device_get_phy_addr(priv, dev); -#ifdef CONFIG_FEC_MXC_PHYADDR - addr = CONFIG_FEC_MXC_PHYADDR; +#ifdef CFG_FEC_MXC_PHYADDR + addr = CFG_FEC_MXC_PHYADDR; #endif

phydev = phy_connect(priv->bus, addr, dev, priv->interface); diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index b09e06ad4d85..9b11934546c1 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -28,7 +28,7 @@ /* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

-#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

#ifdef CONFIG_IMX_HAB #define HAB_EXTRA_SETTINGS \ diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 63afa6e18969..19c7fca03b29 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -20,7 +20,7 @@

/* ENET1 connects to base board and MUX with ESAI */ #define CFG_FEC_ENET_DEV 1 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0

/* EEPROM */ #define EEPROM_I2C_BUS 0 /* I2C0 */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 263981860e86..caa1498acead 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -118,6 +118,6 @@ #define PHYS_SDRAM_2_SIZE 0x100000000 /* 4 GB */

/* Networking */ -#define CONFIG_FEC_MXC_PHYADDR -1 +#define CFG_FEC_MXC_PHYADDR -1

#endif /* __CGTQMX8_H */ diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 2d56d37f06f8..cde7d3c891ab 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -13,7 +13,7 @@ #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

/* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

/* ENET1 */ #define IMX_FEC_BASE ENET_IPS_BASE_ADDR diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index c66cf721870c..47b76c9371e8 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -132,7 +132,7 @@ /* APBH DMA is required for NAND support */

/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 0df61916b7d2..121b34ae96db 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -19,7 +19,7 @@

/* Ethernet Configs */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index b6006c021d5c..162b0b8a69bb 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -40,7 +40,7 @@ /* MMC */

/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1

/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 00ce7fb62a93..7785bdc7cbe6 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -136,7 +136,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d28f3f1972b9..c364e06dc450 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -61,6 +61,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */

-#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

#endif diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 63ea25d9788b..cba59dbfd938 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -21,7 +21,7 @@ #endif

#if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1

#define PHY_ANEG_TIMEOUT 20000

diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h index 8fac898403f1..03dbeefb7a86 100644 --- a/include/configs/imx8mp_icore_mx8mp.h +++ b/include/configs/imx8mp_icore_mx8mp.h @@ -21,7 +21,7 @@ #endif

#if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1

#define DWC_NET_PHYADDR 1

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index ed4da0e69b5b..38ae5f137022 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 4 +#define CFG_FEC_MXC_PHYADDR 4

#define PHY_ANEG_TIMEOUT 20000

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index c40448715f8a..d9ce5d5d0f1a 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -24,7 +24,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #endif

#define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 8fed3e31964c..eb7059f0648c 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -21,7 +21,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0 #endif

#define CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 30dd5af03b00..b7397f6038fd 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -21,7 +21,7 @@ #if defined(CONFIG_FEC_MXC) #define PHY_ANEG_TIMEOUT 20000

-#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #endif

#ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index d909bbbbcfda..4dd51c7f1d7f 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -25,7 +25,7 @@

/* ENET1 Config */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

#define PHY_ANEG_TIMEOUT 20000

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 7200c69bd9e6..0b8781d7bf34 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -102,7 +102,7 @@ #ifdef CONFIG_CMD_NET #define CFG_FEC_ENET_DEV 0

-#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #endif

#endif diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 9c37212463e1..4123964256bd 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -55,7 +55,7 @@ * Ethernet on SOC (FEC) */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0 #endif

#define CFG_SYS_RTC_BUS_NUM 1 /* I2C2 */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 7ea682049261..4be47e78d676 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -32,7 +32,7 @@ #define CFG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) }

/* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1

#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \ diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h index ef2111cd20ab..1cd0b3cf7374 100644 --- a/include/configs/msc_sm2s_imx8mp.h +++ b/include/configs/msc_sm2s_imx8mp.h @@ -17,7 +17,7 @@ #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)

#if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #define PHY_ANEG_TIMEOUT 20000 #endif

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 9d8737c19425..3399cdd16fa8 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -93,7 +93,7 @@ /* Network */

#define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0

#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 8372f979dc86..c99d99abc179 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -115,7 +115,7 @@

/* Network */

-#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1

#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index efc599f37a6d..5e3695ecc971 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -124,9 +124,9 @@ #define CFG_FEC_ENET_DEV 1

#if (CFG_FEC_ENET_DEV == 0) -#define CONFIG_FEC_MXC_PHYADDR 0x2 +#define CFG_FEC_MXC_PHYADDR 0x2 #elif (CFG_FEC_ENET_DEV == 1) -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif #endif

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index e1689679e5f6..811688ae82af 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2

#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 6 +#define CFG_FEC_MXC_PHYADDR 6

/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 8f052c5ae38f..664d4f11c867 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -35,7 +35,7 @@ #define CONFIG_MXC_USB_FLAGS 0

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif

#define CFG_FEC_ENET_DEV 1 diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index 66258a3ab73b..e1f7b7003194 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -98,6 +98,6 @@ /* Environment organization */

/* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1

#endif /* __CONFIG_H * */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index a4b97451cfdc..6148a343117d 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -15,7 +15,7 @@

/* Network support */

-#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1

#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index ac25991703f2..1d8709180c83 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -21,7 +21,7 @@ /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1 #endif

/* Initial environment variables */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index e13280563513..3418d4e2b559 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -66,7 +66,7 @@ #endif

#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1 #endif

#endif diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 899c218727f3..a5f14dc42679 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -9,7 +9,7 @@ #ifndef __CONFIG_TQMA6_MBA6_H #define __CONFIG_TQMA6_MBA6_H

-#define CONFIG_FEC_MXC_PHYADDR 0x03 +#define CFG_FEC_MXC_PHYADDR 0x03

#define CONFIG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 4d8839b6e60d..34c9b6a2f97c 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -7,7 +7,7 @@ #define __CONFIG_TQMA6_WRU4_H

/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0x01 +#define CFG_FEC_MXC_PHYADDR 0x01

/* UART */ #define CONFIG_MXC_UART_BASE UART4_BASE diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 0e0b3a7b594d..d10b88f15754 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -21,7 +21,7 @@

#define CFG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0

/* I2C Configs */

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 1a71b300fc55..c84353ebea66 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -34,7 +34,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

/* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0

#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 diff --git a/include/configs/xpress.h b/include/configs/xpress.h index d095e63182ee..ce6ca175363b 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -32,7 +32,7 @@ #define CONFIG_MXC_USB_FLAGS 0

#define CFG_FEC_ENET_DEV 0 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0

#define CONFIG_UBOOT_SECTOR_START 0x2 #define CONFIG_UBOOT_SECTOR_COUNT 0x3fe diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1917a8d090b2..901914ac043c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -27,7 +27,7 @@ CFG_FDTADDR CFG_FDTFILE CFG_FEC_ENET_DEV CFG_FEC_FIXED_SPEED -CONFIG_FEC_MXC_PHYADDR +CFG_FEC_MXC_PHYADDR CONFIG_FLASH_BR_PRELIM CONFIG_FLASH_OR_PRELIM CONFIG_FLASH_SECTOR_SIZE

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/p1_p2_rdb_pc.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 54687d3ada4e..de7c0d61c05f 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -196,7 +196,7 @@ #define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ | BR_PS_16 | BR_V)

-#define CONFIG_FLASH_OR_PRELIM 0xfc000ff7 +#define CFG_FLASH_OR_PRELIM 0xfc000ff7

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0767c66a79ff..ae4cb04023ad 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -29,7 +29,7 @@ CFG_FEC_ENET_DEV CFG_FEC_FIXED_SPEED CFG_FEC_MXC_PHYADDR CFG_FLASH_BR_PRELIM -CONFIG_FLASH_OR_PRELIM +CFG_FLASH_OR_PRELIM CONFIG_FLASH_SECTOR_SIZE CONFIG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N

Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- drivers/mtd/cfi_flash.c | 14 +++++++------- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/blanche.h | 2 +- include/configs/draak.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/configs/ebisu.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/salvator-x.h | 2 +- include/configs/ulcb.h | 2 +- include/configs/zynq-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 27 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/README b/README index 52545b78a19b..ea5f4cc10659 100644 --- a/README +++ b/README @@ -1481,7 +1481,7 @@ Configuration Settings: s29ws-n MirrorBit flash has non-standard addresses for buffered write commands.

-- CONFIG_FLASH_SHOW_PROGRESS +- CFG_FLASH_SHOW_PROGRESS If defined (must be an integer), print out countdown digits and dots. Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40 column displays. diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c1cdd2cbc3e2..75765d76ea29 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1292,7 +1292,7 @@ void flash_print_info(flash_info_t *info) * effect updates to digit and dots. Repeated code is nasty too, so * we define it once here. */ -#ifdef CONFIG_FLASH_SHOW_PROGRESS +#ifdef CFG_FLASH_SHOW_PROGRESS #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \ if (flash_verbose) { \ dots -= dots_sub; \ @@ -1325,17 +1325,17 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE int buffered_size; #endif -#ifdef CONFIG_FLASH_SHOW_PROGRESS - int digit = CONFIG_FLASH_SHOW_PROGRESS; +#ifdef CFG_FLASH_SHOW_PROGRESS + int digit = CFG_FLASH_SHOW_PROGRESS; int scale = 0; int dots = 0;

/* - * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes. + * Suppress if there are fewer than CFG_FLASH_SHOW_PROGRESS writes. */ - if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) { - scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) / - CONFIG_FLASH_SHOW_PROGRESS); + if (cnt >= CFG_FLASH_SHOW_PROGRESS) { + scale = (int)((cnt + CFG_FLASH_SHOW_PROGRESS - 1) / + CFG_FLASH_SHOW_PROGRESS); } #endif

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index bc24be79366c..67ee74ba6232 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -161,7 +161,7 @@ extern unsigned long get_sdram_size(void); #define CFG_SYS_NOR_FTIM3 0x0

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

/* CFI for NOR Flash */

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 834400f1d601..b05601489d85 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -101,7 +101,7 @@ #define PIXIS_LBMAP_SHIFT 4 #define PIXIS_LBMAP_ALTBANK 0x40

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

/* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index f666683bcc4b..09087a70895d 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -158,7 +158,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS}

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 53bd8e85a627..e6a9dccd752b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -126,7 +126,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS}

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 5244c9d076f0..0d245940dc0e 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -119,7 +119,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 022d483da763..28c59b4e66f8 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -114,7 +114,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS }

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6cf8b75c86c2..640c12d91ab5 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -184,7 +184,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0x0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS \ + 0x8000000, CFG_SYS_FLASH_BASE_PHYS} diff --git a/include/configs/blanche.h b/include/configs/blanche.h index cb28ae28dd3e..dc74ed3e79d6 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -25,7 +25,7 @@ #if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BASE 0x00000000 #define CFG_SYS_FLASH_SIZE 0x04000000 /* 64 MB */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) } diff --git a/include/configs/draak.h b/include/configs/draak.h index 8140bc469c52..03972d44789b 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -13,7 +13,7 @@

/* Environment in eMMC, at the end of 2nd "boot sector" */

-#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 21eab9b3a479..5ef51c94dab8 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -84,7 +84,7 @@ /*----------------------------------------------------------------------- * FLASH organization */ -#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45

#define CFG_SYS_FLASH_BASE CFG_SYS_CS0_BASE #define CFG_SYS_INT_FLASH_BASE 0xF0000000 diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index d1882a9646be..ced71856b434 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -15,7 +15,7 @@

/* Environment in eMMC, at the end of 2nd "boot sector" */

-#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index a67301b9ecd6..64fb706a1ce6 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -61,7 +61,7 @@ FTIM2_NOR_TWP(0xb)) #define CFG_SYS_NOR_FTIM3 0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE_PHYS }

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 3bfb014adf11..69f9bacad97c 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -60,7 +60,7 @@ FTIM2_NOR_TWP(0x1c)) #define CFG_SYS_NOR_FTIM3 0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_WRITE_SWAPPED_DATA

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS, \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8a36620bf3ab..da1e409e5c77 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -92,7 +92,7 @@ FTIM2_NOR_TWPH(0x0e)) #define CFG_SYS_NOR_FTIM3 0

-#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE_PHYS }

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e259cf810c0a..c79e113db4e4 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -92,7 +92,7 @@ #define CFG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000

#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #endif #endif #endif diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 553ae841caba..e67ded55da6b 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -43,7 +43,7 @@ #define CFG_SYS_FLASH_BASE_PHYS_EARLY 0x00000000

#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #endif #endif

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index a34a71f649f6..0582a4568dc7 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -62,7 +62,7 @@ #define CFG_SYS_IFC_CCR 0x01000000

#ifndef SYS_NO_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index bd543a37e879..ee796facc06c 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -47,7 +47,7 @@ #define CFG_SYS_IFC_CCR 0x01000000

#ifndef SYS_NO_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE } #endif diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 12b5af1b4f2f..d029d841d51e 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -64,7 +64,7 @@ #define CFG_SYS_IFC_CCR 0x01000000

#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 1259df8f3a9a..73477978be46 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -61,7 +61,7 @@ #define CFG_SYS_IFC_CCR 0x01000000

#ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE,\ CFG_SYS_FLASH_BASE + 0x40000000} diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index de7c0d61c05f..93909eda55dd 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -199,7 +199,7 @@ #define CFG_FLASH_OR_PRELIM 0xfc000ff7

#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS} -#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ +#define CFG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */

/* Nand Flash */ #ifdef CONFIG_NAND_FSL_ELBC diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 2e422cd241e9..cb48538e62b4 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -13,7 +13,7 @@

/* Environment in eMMC, at the end of 2nd "boot sector" */

-#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA

diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index ab199bc726a6..aadcb30d0432 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -13,7 +13,7 @@

/* Environment in eMMC, at the end of 2nd "boot sector" */

-#define CONFIG_FLASH_SHOW_PROGRESS 45 +#define CFG_FLASH_SHOW_PROGRESS 45 #define CFG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CFG_SYS_WRITE_SWAPPED_DATA

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 7f739d9ada0e..1edd49a784d4 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -36,7 +36,7 @@

/* NOR */ #ifdef CONFIG_MTD_NOR_FLASH -# define CONFIG_FLASH_SHOW_PROGRESS 10 +# define CFG_FLASH_SHOW_PROGRESS 10 #endif

#ifdef CONFIG_USB_EHCI_ZYNQ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 89f47538d4c7..c510c45d8795 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -31,7 +31,7 @@ CFG_FEC_MXC_PHYADDR CFG_FLASH_BR_PRELIM CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE -CONFIG_FLASH_SHOW_PROGRESS +CFG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV

Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- common/flash.c | 2 +- include/configs/mccmon6.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README index 0c8932425cad..02ae72e009ef 100644 --- a/README +++ b/README @@ -1486,7 +1486,7 @@ Configuration Settings: digits and dots. Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40 column displays.

-- CONFIG_FLASH_VERIFY +- CFG_FLASH_VERIFY If defined, the content of the flash (destination) is compared against the source after the write operation. An error message will be printed when the contents are not identical. diff --git a/common/flash.c b/common/flash.c index 848f44e59dfd..5ca715efad2b 100644 --- a/common/flash.c +++ b/common/flash.c @@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt) src += len; }

-#if defined(CONFIG_FLASH_VERIFY) +#if defined(CFG_FLASH_VERIFY) if (memcmp(src_orig, addr_orig, cnt_orig)) { printf("\nVerify failed!\n"); return ERR_PROG_ERROR; diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 4be47e78d676..9b2777339a10 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -25,7 +25,7 @@

/* NOR 16-bit mode */ #define CFG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR -#define CONFIG_FLASH_VERIFY +#define CFG_FLASH_VERIFY

/* NOR Flash MTD */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 16467a0bb8c9..8f68c6e736f6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N -CONFIG_FLASH_VERIFY +CFG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/P2041RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index b05601489d85..f2179db6b9b4 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -88,7 +88,7 @@ #define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE #endif

-#define CONFIG_FSL_CPLD +#define CFG_FSL_CPLD #define CPLD_BASE 0xffdf0000 /* CPLD registers */ #ifdef CONFIG_PHYS_64BIT #define CPLD_BASE_PHYS 0xfffdf0000ull diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 09e520c3f9d8..43d331938d51 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -35,7 +35,7 @@ CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV -CONFIG_FSL_CPLD +CFG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT

Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- doc/README.fsl-dpaa | 4 ++-- drivers/net/fm/eth.c | 2 +- drivers/net/fm/init.c | 2 +- include/fm_eth.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 29b08d56ee52..410ae34e9504 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -189,7 +189,7 @@ #define CFG_SYS_NUM_FMAN 1 #define CFG_SYS_NUM_FM1_DTSEC 4 #define CFG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#define CFG_FSL_FM_10GEC_REGULAR_NOTATION #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FM1_CLK 0 #define CONFIG_QBMAN_CLK_DIV 1 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 283fdf3b458a..05b83952f231 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1303,7 +1303,7 @@ typedef struct ccsr_gur { #define FSL_CORENET_DEVDISR2_DTSEC1_6 0x04000000 #define FSL_CORENET_DEVDISR2_DTSEC1_9 0x00800000 #define FSL_CORENET_DEVDISR2_DTSEC1_10 0x00400000 -#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FSL_CORENET_DEVDISR2_10GEC1_1 0x80000000 #define FSL_CORENET_DEVDISR2_10GEC1_2 0x40000000 #else diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa index 3ef5eeb32e11..91c14ad12227 100644 --- a/doc/README.fsl-dpaa +++ b/doc/README.fsl-dpaa @@ -1,10 +1,10 @@ This file documents Freescale DPAA-specific options.

FMan (Frame Manager) - - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION + - CFG_FSL_FM_10GEC_REGULAR_NOTATION on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2 on SoCs T1024, etc, the notation between 10GEC and MAC as below: 10GEC1->MAC1, 10GEC2->MAC2 - so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on + so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on which 10GEC enumeration is consistent with MAC enumeration. diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index c8381cc7133c..c84d1c0a713e 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg) num = fm_eth->num;

#ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION if (fm_eth->type == FM_ETH_10G_E) { /* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240. * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080. diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 618c1bccbe3f..23a25056f822 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) }

#ifdef CONFIG_SYS_FMAN_V3 -#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION /* * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same * dual-role MAC, when FM1_10GEC1 is enabled and FM1_DTSEC9 diff --git a/include/fm_eth.h b/include/fm_eth.h index aeb640925ee2..4f130a8d04a5 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -88,7 +88,7 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ }

-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 278fc032799a..14823f42e61e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -37,7 +37,7 @@ CFG_FLASH_VERIFY CFG_FM_PLAT_CLK_DIV CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX -CONFIG_FSL_FM_10GEC_REGULAR_NOTATION +CFG_FSL_FM_10GEC_REGULAR_NOTATION CONFIG_FSL_ISBC_KEY_EXT CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index 9bb7e39f2cc2..eace4dd7e433 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -42,7 +42,7 @@ int pmic_init(unsigned char bus) p->hw.spi.cs = CONFIG_FSL_PMIC_CS; p->hw.spi.clk = CONFIG_FSL_PMIC_CLK; p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; - p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN; + p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; p->hw.spi.prepare_tx = pmic_spi_prepare_tx; #elif defined(CONFIG_POWER_I2C) diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 8ab1ee79a79c..d4cca8d516a6 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -25,7 +25,7 @@ #define CONFIG_FSL_PMIC_CS 0 #define CONFIG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) -#define CONFIG_FSL_PMIC_BITLEN 32 +#define CFG_FSL_PMIC_BITLEN 32

/* * MMC Configs diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0a0be8f05f00..b5f3eb1236a1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -39,7 +39,7 @@ CFG_FSL_CPLD CFG_FSL_ESDHC_PIN_MUX CFG_FSL_FM_10GEC_REGULAR_NOTATION CFG_FSL_ISBC_KEY_EXT -CONFIG_FSL_PMIC_BITLEN +CFG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index eace4dd7e433..a576d1570b11 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -40,7 +40,7 @@ int pmic_init(unsigned char bus) #if defined(CONFIG_POWER_SPI) p->interface = PMIC_SPI; p->hw.spi.cs = CONFIG_FSL_PMIC_CS; - p->hw.spi.clk = CONFIG_FSL_PMIC_CLK; + p->hw.spi.clk = CFG_FSL_PMIC_CLK; p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 1aaa76240deb..ee0782ebfebf 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -23,7 +23,7 @@ /* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0 #define CONFIG_FSL_PMIC_CS 0 -#define CONFIG_FSL_PMIC_CLK 2500000 +#define CFG_FSL_PMIC_CLK 2500000 #define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CFG_FSL_PMIC_BITLEN 32

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3b9ec9d59f61..d006554e3d2b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -41,7 +41,7 @@ CFG_FSL_FM_10GEC_REGULAR_NOTATION CFG_FSL_ISBC_KEY_EXT CFG_FSL_PMIC_BITLEN CFG_FSL_PMIC_BUS -CONFIG_FSL_PMIC_CLK +CFG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS CONFIG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index 9ead212f380e..9dc930fb305a 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -41,7 +41,7 @@ int pmic_init(unsigned char bus) p->interface = PMIC_SPI; p->hw.spi.cs = CFG_FSL_PMIC_CS; p->hw.spi.clk = CFG_FSL_PMIC_CLK; - p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; + p->hw.spi.mode = CFG_FSL_PMIC_MODE; p->hw.spi.bitlen = CFG_FSL_PMIC_BITLEN; p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; p->hw.spi.prepare_tx = pmic_spi_prepare_tx; diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 15bc4c706fdd..740e357e00e9 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -24,7 +24,7 @@ #define CFG_FSL_PMIC_BUS 0 #define CFG_FSL_PMIC_CS 0 #define CFG_FSL_PMIC_CLK 2500000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) +#define CFG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CFG_FSL_PMIC_BITLEN 32

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a6598b01bb61..8ba453991703 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -43,7 +43,7 @@ CFG_FSL_PMIC_BITLEN CFG_FSL_PMIC_BUS CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS -CONFIG_FSL_PMIC_MODE +CFG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2

Signed-off-by: Tom Rini trini@konsulko.com --- board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++-- include/configs/MPC837XERDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 4a1455402650..9c08a2bfef02 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -146,7 +146,7 @@ int board_early_init_f(void) /* we check only part num, and don't look for CPU revisions */ switch (PARTID_NO_E(spridr)) { case SPR_8377: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, + fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_PEX, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); @@ -156,7 +156,7 @@ int board_early_init_f(void) FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); break; case SPR_8379: - fsl_setup_serdes(CONFIG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, + fsl_setup_serdes(CFG_FSL_SERDES1, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); fsl_setup_serdes(CONFIG_FSL_SERDES2, FSL_SERDES_PROTO_SATA, FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V); diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 9af76e830dc0..4a3db8dec0ed 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -153,7 +153,7 @@ #define CFG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)

/* SERDES */ -#define CONFIG_FSL_SERDES1 0xe3000 +#define CFG_FSL_SERDES1 0xe3000 #define CONFIG_FSL_SERDES2 0xe3100

/* I2C */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1093721dca5c..29d5b933b9df 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -45,7 +45,7 @@ CFG_FSL_PMIC_CLK CFG_FSL_PMIC_CS CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 -CONFIG_FSL_SERDES1 +CFG_FSL_SERDES1 CONFIG_FSL_SERDES2 CONFIG_GATEWAYIP CONFIG_GMII

Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README b/README index 02ae72e009ef..d76058e1ab41 100644 --- a/README +++ b/README @@ -750,7 +750,7 @@ The following options need to be configured: (Environment variable "serverip")

- Gateway IP address: - CONFIG_GATEWAYIP + CFG_GATEWAYIP

Defines a default value for the IP address of the default router where packets to other networks are diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ef3837e137c7..83ffe7ce76d9 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -21,7 +21,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5208EVBe" diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index a31d44177362..fc56834bd9be 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -30,7 +30,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5235EVB" diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 501785ac82e0..78eeca342c82 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5272C3" diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 3912aae750d4..afc19de8ce73 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -33,7 +33,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* CONFIG_MCFFEC */

#define CONFIG_HOSTNAME "M5282EVB" diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 6d97e6ca84ab..1fcc34184928 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -34,7 +34,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M53017" diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index f8aabe4944a4..a49cf6dacb81 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -26,7 +26,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5329EVB" diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 228fcde98dc3..53434881f4c7 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -28,7 +28,7 @@ # define CONFIG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 -# define CONFIG_GATEWAYIP 192.162.1.1 +# define CFG_GATEWAYIP 192.162.1.1 #endif /* FEC_ENET */

#define CONFIG_HOSTNAME "M5373EVB" diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 515e88cf8206..e93b3cb97517 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -332,7 +332,7 @@ #define CONFIG_UBOOTPATH 8548cds/u-boot.bin /* TFTP server */

#define CONFIG_SERVERIP 192.168.1.1 -#define CONFIG_GATEWAYIP 192.168.1.1 +#define CFG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0

#define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index c8c0fc671ab0..204a9b0b5458 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -18,7 +18,7 @@ #define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ #define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_GATEWAYIP 0.0.0.0 +#define CFG_GATEWAYIP 0.0.0.0 #define CONFIG_ROOTPATH "/srv/nfs/" /* Default Dir for NFS */

#define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2fe056cfef4a..874f75404712 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -48,7 +48,7 @@ */ #define CONFIG_SERVERIP 192.168.11.1 #define CONFIG_IPADDR 192.168.11.10 -#define CONFIG_GATEWAYIP 192.168.11.1 +#define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0

#if defined(CONFIG_ARM64) diff --git a/include/env_default.h b/include/env_default.h index 1621815f257a..7d0af83a5913 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -68,8 +68,8 @@ const char default_environment[] = { #ifdef CONFIG_ROOTPATH "rootpath=" CONFIG_ROOTPATH "\0" #endif -#ifdef CONFIG_GATEWAYIP - "gatewayip=" __stringify(CONFIG_GATEWAYIP) "\0" +#ifdef CFG_GATEWAYIP + "gatewayip=" __stringify(CFG_GATEWAYIP) "\0" #endif #ifdef CONFIG_NETMASK "netmask=" __stringify(CONFIG_NETMASK) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea7eaef5d15f..e634d868a090 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE CFG_FSL_SDHC_V2_3 CFG_FSL_SERDES1 CFG_FSL_SERDES2 -CONFIG_GATEWAYIP +CFG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM

Signed-off-by: Tom Rini trini@konsulko.com --- board/samsung/common/gadget.c | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index 6d783e61e0d3..38d8773f9083 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -11,7 +11,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { if (!strcmp(name, "usb_dnl_thor")) { put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor); - put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); + put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 81f450cde6c4..b29d9b0d5bac 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -17,7 +17,7 @@

/* USB Samsung's IDs */ #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index a1542f3f8025..c6f6246d76ce 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -22,7 +22,7 @@

/* THOR */ #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D

/* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index f898d2d9ee52..5567505c8182 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -27,7 +27,7 @@ /* USB Samsung's IDs */

#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8203c5ccee12..f2304c23b80f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -49,7 +49,7 @@ CFG_FSL_SERDES1 CFG_FSL_SERDES2 CFG_GATEWAYIP CFG_GMII -CONFIG_G_DNL_THOR_PRODUCT_NUM +CFG_G_DNL_THOR_PRODUCT_NUM CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM

Signed-off-by: Tom Rini trini@konsulko.com --- board/samsung/common/gadget.c | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index f883c95f9643..71d361548434 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -14,7 +14,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct); } else if (!strcmp(name, "usb_dnl_ums")) { put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor); - put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); + put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct); } else { put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor); put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 56bb856a6dc2..a53846b762c1 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -41,7 +41,7 @@

/* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif #endif

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index defbe4bf335c..f3db02d78d8b 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -19,7 +19,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

/* Common environment variables */ #define ENV_ITB \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 967ba83d4510..bd8d455375dd 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -26,7 +26,7 @@

/* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

#define CFG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 67d01e816f9a..d1c3f495c253 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -29,7 +29,7 @@ #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5

/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3603bb9f4a0b..dbb84ab9ad08 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -86,7 +86,7 @@

/* USB IDs */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f04275b6b1d4..5da8953712a5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -51,7 +51,7 @@ CFG_GATEWAYIP CFG_GMII CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM -CONFIG_G_DNL_UMS_PRODUCT_NUM +CFG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/T104xRDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index e6a9dccd752b..4b7b53094446 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -288,7 +288,7 @@ #define CFG_SYS_I2C_RTC_ADDR 0x68

/*DVI encoder*/ -#define CONFIG_HDMI_ENCODER_I2C_ADDR 0x75 +#define CFG_HDMI_ENCODER_I2C_ADDR 0x75 #endif

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3473e7c4560b..9079fbb2e3f6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -53,7 +53,7 @@ CFG_G_DNL_THOR_PRODUCT_NUM CFG_G_DNL_THOR_VENDOR_NUM CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM -CONFIG_HDMI_ENCODER_I2C_ADDR +CFG_HDMI_ENCODER_I2C_ADDR CONFIG_HOSTNAME CONFIG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mmc/omap_hsmmc.c | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/omap5_uevm.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index a2595d19e7f6..80dd70f087e2 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio, #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \ defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \ defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \ - defined(CONFIG_HSMMC2_8BIT) + defined(CFG_HSMMC2_8BIT) /* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */ host_caps_val |= MMC_MODE_8BIT; #endif diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index c66650c8e8d1..577a622d42c9 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -20,7 +20,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)

-#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT

#ifndef CONFIG_SPL_BUILD #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index dacfd41ccedf..afacf70e74a9 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -36,7 +36,7 @@ #include <configs/ti_omap5_common.h>

/* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT

/* CPSW Ethernet */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 06de4dbeb6d5..5a795fe99171 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -36,7 +36,7 @@ * we don't need to do it twice. */

-#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT

#include <configs/ti_armv7_omap.h>

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index ac3fcacc68ed..30def6abf8f4 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -49,7 +49,7 @@ #include <configs/ti_omap5_common.h>

/* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT

/* * Default to using SPI for environment, etc. diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index d7fa2d43914a..8a9a6dfc4c34 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -33,7 +33,7 @@ /* MMC ENV related defines */

/* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT +#define CFG_HSMMC2_8BIT

/* Required support for the TCA642X GPIO we have on the uEVM */ #define CFG_SYS_I2C_TCA642X_BUS_NUM 4 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fc29f456c13..d7265e370d05 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM CFG_G_DNL_UMS_VENDOR_NUM CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME -CONFIG_HSMMC2_8BIT +CFG_HSMMC2_8BIT CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS

Signed-off-by: Tom Rini trini@konsulko.com --- env/Kconfig | 4 ++-- env/eeprom.c | 18 +++++++++--------- scripts/config_whitelist.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/env/Kconfig b/env/Kconfig index 5a7e2f299b06..1c7a414321ce 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -78,12 +78,12 @@ config ENV_IS_IN_EEPROM still be one byte because the extra address bits are hidden in the chip address.

- - CONFIG_I2C_ENV_EEPROM_BUS + - CFG_I2C_ENV_EEPROM_BUS if you have an Environment on an EEPROM reached over I2C muxes, you can define here, how to reach this EEPROM. For example:

- #define CONFIG_I2C_ENV_EEPROM_BUS 1 + #define CFG_I2C_ENV_EEPROM_BUS 1

EEPROM which holds the environment, is reached over a pca9547 i2c mux with address 0x70, channel 3. diff --git a/env/eeprom.c b/env/eeprom.c index f8556a47213c..192e0f3af6d0 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -15,7 +15,7 @@ #include <asm/global_data.h> #include <linux/stddef.h> #include <u-boot/crc.h> -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) #include <i2c.h> #endif #include <search.h> @@ -28,16 +28,16 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num();

- if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif

rcode = eeprom_read(dev_addr, offset, buffer, cnt);

-#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif

@@ -48,16 +48,16 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt) { int rcode; -#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) int old_bus = i2c_get_bus_num();

- if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS) - i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS); + if (old_bus != CFG_I2C_ENV_EEPROM_BUS) + i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS); #endif

rcode = eeprom_write(dev_addr, offset, buffer, cnt);

-#if defined(CONFIG_I2C_ENV_EEPROM_BUS) +#if defined(CFG_I2C_ENV_EEPROM_BUS) i2c_set_bus_num(old_bus); #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 44956bff3940..440bef90575d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,7 @@ CFG_HDMI_ENCODER_I2C_ADDR CFG_HOSTNAME CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS -CONFIG_I2C_ENV_EEPROM_BUS +CFG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI CONFIG_I2C_MVTWSI_BASE0

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/arch-sunxi/i2c.h | 6 ++-- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- arch/arm/mach-mvebu/include/mach/config.h | 2 +- drivers/i2c/mvtwsi.c | 38 ++++++++++---------- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/theadorable.h | 4 +-- scripts/config_whitelist.txt | 6 ++-- 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h index 241b44928a95..f0da46d863cf 100644 --- a/arch/arm/include/asm/arch-sunxi/i2c.h +++ b/arch/arm/include/asm/arch-sunxi/i2c.h @@ -8,13 +8,13 @@ #include <asm/arch/cpu.h>

#ifdef CONFIG_I2C0_ENABLE -#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE +#define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE #endif #ifdef CONFIG_I2C1_ENABLE -#define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE +#define CFG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE #endif #ifdef CONFIG_R_I2C_ENABLE -#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE +#define CFG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE #endif

/* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */ diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index a6de7676294b..fbef9c99b1d3 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -24,7 +24,7 @@

#include <asm/arch/soc.h>

-#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 KW_TWSI_BASE #define MV_UART_CONSOLE_BASE KW_UART0_BASE #define MV_SATA_BASE KW_SATA_BASE #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 2e06f2bdaee3..19f9f083129b 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -35,7 +35,7 @@ */ #ifdef CONFIG_CMD_I2C #ifndef CONFIG_SYS_I2C_SOFT -#define CONFIG_I2C_MVTWSI +#define CFG_I2C_MVTWSI #endif #endif

diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index a9c7d6e1bc26..55f9b983e884 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;

/* - * Include a file that will provide CONFIG_I2C_MVTWSI_BASE*, and possibly other + * Include a file that will provide CFG_I2C_MVTWSI_BASE*, and possibly other * settings */

@@ -197,29 +197,29 @@ inline uint calc_tick(uint speed) static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap) { switch (adap->hwadapnr) { -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 case 0: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 case 1: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE2 +#ifdef CFG_I2C_MVTWSI_BASE2 case 2: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE2; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE2; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE3 +#ifdef CFG_I2C_MVTWSI_BASE3 case 3: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE3; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE3; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE4 +#ifdef CFG_I2C_MVTWSI_BASE4 case 4: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE4; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE4; #endif -#ifdef CONFIG_I2C_MVTWSI_BASE5 +#ifdef CFG_I2C_MVTWSI_BASE5 case 5: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE5; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE5; #endif default: printf("Missing mvtwsi controller %d base\n", adap->hwadapnr); @@ -737,41 +737,41 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr, 10000); }

-#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0) #endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 1)

#endif -#ifdef CONFIG_I2C_MVTWSI_BASE2 +#ifdef CFG_I2C_MVTWSI_BASE2 U_BOOT_I2C_ADAP_COMPLETE(twsi2, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 2)

#endif -#ifdef CONFIG_I2C_MVTWSI_BASE3 +#ifdef CFG_I2C_MVTWSI_BASE3 U_BOOT_I2C_ADAP_COMPLETE(twsi3, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 3)

#endif -#ifdef CONFIG_I2C_MVTWSI_BASE4 +#ifdef CFG_I2C_MVTWSI_BASE4 U_BOOT_I2C_ADAP_COMPLETE(twsi4, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 4)

#endif -#ifdef CONFIG_I2C_MVTWSI_BASE5 +#ifdef CFG_I2C_MVTWSI_BASE5 U_BOOT_I2C_ADAP_COMPLETE(twsi5, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index ef9c457e1020..54de2d0d8334 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -17,7 +17,7 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE

/* USB/EHCI configuration */

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6dbf582d733b..2cbe4eb440b4 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -11,7 +11,7 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE

/* Environment in SPI NOR flash */

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index bf8b35102ad7..5c6d7fa1b776 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -13,7 +13,7 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE

/* USB/EHCI configuration */

diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e69883ba73bc..9446acba7923 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -17,7 +17,7 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE

/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 5ad945b55896..413597e09b26 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -19,7 +19,7 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE

/* SPI NOR flash default params, used by sf commands */

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 9722b0db72aa..2ce92845f1c0 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -25,8 +25,8 @@ */

/* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE

/* USB/EHCI configuration */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 501e39bb4900..1798a7420cd7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -59,9 +59,9 @@ CFG_HSMMC2_8BIT CFG_HW_ENV_SETTINGS CFG_I2C_ENV_EEPROM_BUS CFG_I2C_MULTI_BUS -CONFIG_I2C_MVTWSI -CONFIG_I2C_MVTWSI_BASE0 -CONFIG_I2C_MVTWSI_BASE1 +CFG_I2C_MVTWSI +CFG_I2C_MVTWSI_BASE0 +CFG_I2C_MVTWSI_BASE1 CONFIG_I2C_RTC_ADDR CONFIG_ICS307_REFCLK_HZ CONFIG_IMX6_PWM_PER_CLK

Signed-off-by: Tom Rini trini@konsulko.com --- board/freescale/common/ics307_clk.c | 4 ++-- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c index 01662d36e9fb..5f95571d24cc 100644 --- a/board/freescale/common/ics307_clk.c +++ b/board/freescale/common/ics307_clk.c @@ -50,7 +50,7 @@ static u8 ics307_s_to_od[] = { */ unsigned long ics307_sysclk_calculator(unsigned long out_freq) { - const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ; + const unsigned long input_freq = CFG_ICS307_REFCLK_HZ; unsigned long vdw, rdw, odp, s_vdw = 0, s_rdw = 0, s_odp = 0, od; unsigned long tmp_out, diff, result = 0; int found = 0; @@ -101,7 +101,7 @@ unsigned long ics307_sysclk_calculator(unsigned long out_freq) */ static unsigned long ics307_clk_freq(u8 cw0, u8 cw1, u8 cw2) { - const unsigned long input_freq = CONFIG_ICS307_REFCLK_HZ; + const unsigned long input_freq = CFG_ICS307_REFCLK_HZ; unsigned long vdw = ((cw1 << 1) & 0x1FE) + ((cw2 >> 7) & 1); unsigned long rdw = cw2 & 0x7F; unsigned long od = ics307_s_to_od[cw0 & 0x7]; diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 0d245940dc0e..c614a539b391 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -13,7 +13,7 @@

#include <linux/stringify.h>

-#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */

/* High Level Configuration Options */

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 28c59b4e66f8..2da4f5a09b14 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -13,7 +13,7 @@

#include <linux/stringify.h>

-#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */

/* High Level Configuration Options */

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 640c12d91ab5..b8bfc52f07ae 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -12,7 +12,7 @@

#include <linux/stringify.h>

-#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */

#ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e507dca614f5..9516ba848bfc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -63,7 +63,7 @@ CFG_I2C_MVTWSI CFG_I2C_MVTWSI_BASE0 CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR -CONFIG_ICS307_REFCLK_HZ +CFG_ICS307_REFCLK_HZ CONFIG_IMX6_PWM_PER_CLK CONFIG_IPADDR CONFIG_IRAM_BASE

Signed-off-by: Tom Rini trini@konsulko.com --- README | 2 +- doc/README.usb | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 4 ++-- include/configs/apalis_imx6.h | 4 ++-- include/configs/cobra5272.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 4 ++-- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/integratorcp.h | 2 +- include/configs/mt7622.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt7629.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/poleg.h | 2 +- include/configs/uniphier.h | 2 +- include/env_default.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 30 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/README b/README index 50bfd7e4fffc..d09ebd47cd83 100644 --- a/README +++ b/README @@ -735,7 +735,7 @@ The following options need to be configured: command issued before MII status register can be read

- IP address: - CONFIG_IPADDR + CFG_IPADDR

Define a default value for the IP address to use for the default Ethernet interface, in case this is not diff --git a/doc/README.usb b/doc/README.usb index 650a6daae0a5..495b1859a771 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -162,7 +162,7 @@ common executable is discouraged, as it leads to potential conflicts, and all the parameters can either get stored in the board's external environment, or get obtained from the bootp server if not set.

-#define CONFIG_IPADDR 10.0.0.2 (replace with your value) +#define CFG_IPADDR 10.0.0.2 (replace with your value) #define CONFIG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_BOOTFILE "uImage"

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index ce75c4cbcaf0..647e23f380b8 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -18,7 +18,7 @@ /* I2C */

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 8cebf099f1db..7bc86eb8b5f6 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -27,7 +27,7 @@

/* this must be included AFTER the definition of CONFIG COMMANDS (if any) */ #ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 10bfb01a2e03..4b88cfc2cdd9 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -30,7 +30,7 @@ env/embedded.o(.text);

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index b69e452b9e50..f34985c47d4b 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -30,7 +30,7 @@ env/embedded.o(.text*);

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index ce38b823436d..5afd8383c1bd 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -31,7 +31,7 @@ /* I2C */

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 2dc22a0b5af8..9d5f0e1c0964 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -23,7 +23,7 @@ /* I2C */

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index bce4a8470f91..807d591c9f12 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -25,7 +25,7 @@ /* I2C */

#ifdef CONFIG_MCFFEC -# define CONFIG_IPADDR 192.162.1.2 +# define CFG_IPADDR 192.162.1.2 # define CONFIG_NETMASK 255.255.255.0 # define CONFIG_SERVERIP 192.162.1.1 # define CFG_GATEWAYIP 192.162.1.1 diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 6e7b6e81208f..d61ed82ab3bf 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -52,7 +52,7 @@ "${ofl_args}; " \ "bootm ${loadaddr} - 0xf00000\0"

-#define CONFIG_IPADDR 192.168.0.3 +#define CFG_IPADDR 192.168.0.3 #define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_NETMASK 255.0.0.0

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 2ce8597c0c52..d2a70aa88f88 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -325,7 +325,7 @@ * Environment Configuration */

-#define CONFIG_IPADDR 192.168.1.253 +#define CFG_IPADDR 192.168.1.253

#define CFG_HOSTNAME "unknown" #define CONFIG_ROOTPATH "/nfsroot" diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 15bedc0afc29..0258a70d923b 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -14,7 +14,7 @@ #define USDHC2_BASE_ADDR 0x5b020000

/* Networking */ -#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index f0a02ae17953..4db3465cd9b7 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -33,8 +33,8 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na)

-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4899dfb4dee1..8db2909c96b2 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -35,8 +35,8 @@

/* Command definition */

-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 6d6e2fc69620..1b5115f7caf1 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -91,7 +91,7 @@ enter a valid image address in flash */

/* User network settings */

-#define CONFIG_IPADDR 192.168.100.2 /* default board IP address */ +#define CFG_IPADDR 192.168.100.2 /* default board IP address */ #define CONFIG_SERVERIP 192.168.100.1 /* default tftp server IP address */

#endif diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index a748d4f3169f..4f5287b6bcfb 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -20,7 +20,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR 0 #define CFG_SYS_FSL_USDHC_NUM 1

-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index e4bb71d47d62..35f29da0c351 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -14,7 +14,7 @@ #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000

-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 0486db6b51ed..2f30322bb4f8 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -30,8 +30,8 @@

/* Command definition */

-#undef CONFIG_IPADDR -#define CONFIG_IPADDR 192.168.10.2 +#undef CFG_IPADDR +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #undef CONFIG_SERVERIP #define CONFIG_SERVERIP 192.168.10.1 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 99ed8183ef21..0da7553e0245 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -21,7 +21,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 #endif

-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index ef49969598c9..808d69d0c865 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -16,7 +16,7 @@

/* NAND support */

-#define CONFIG_IPADDR 192.168.10.2 +#define CFG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4d0a78c6269c..e71f10a24fa1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -57,7 +57,7 @@ /* Persistent Environment Config */

/* Environment */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.146

#endif /* __CONFIG_H */ diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 25bb41ebc46c..ccf73604480b 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -20,7 +20,7 @@ #define CFG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */

#define CONFIG_SERVERIP 192.168.1.100 -#define CONFIG_IPADDR 192.168.1.104 +#define CFG_IPADDR 192.168.1.104

/* * Miscellaneous configurable options diff --git a/include/configs/mt7622.h b/include/configs/mt7622.h index 8c297266d8b1..199da46ad018 100644 --- a/include/configs/mt7622.h +++ b/include/configs/mt7622.h @@ -18,7 +18,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000

/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.3

#endif diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 031c1aea0c00..d3cf6597a633 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -33,7 +33,7 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"

/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2

#ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index bfa44aacc726..8c0b02b40e50 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -28,7 +28,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000

/* Ethernet */ -#define CONFIG_IPADDR 192.168.1.1 +#define CFG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2

#endif diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 204a9b0b5458..0d38645c0e60 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -15,7 +15,7 @@ 115200, 230400, 460800, 921600 }

/* Default Env vars */ -#define CONFIG_IPADDR 0.0.0.0 /* In order to cause an error */ +#define CFG_IPADDR 0.0.0.0 /* In order to cause an error */ #define CONFIG_SERVERIP 0.0.0.0 /* In order to cause an error */ #define CONFIG_NETMASK 255.255.255.0 #define CFG_GATEWAYIP 0.0.0.0 diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 7998ef7347fb..3e4309512cc1 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -15,7 +15,7 @@

/* Default environemnt variables */ #define CONFIG_SERVERIP 192.168.0.1 -#define CONFIG_IPADDR 192.168.0.2 +#define CFG_IPADDR 192.168.0.2 #define CONFIG_NETMASK 255.255.255.0 #define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \ "stdin=serial\0" \ diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 874f75404712..3ec3caade49c 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -47,7 +47,7 @@ * Network Configuration */ #define CONFIG_SERVERIP 192.168.11.1 -#define CONFIG_IPADDR 192.168.11.10 +#define CFG_IPADDR 192.168.11.10 #define CFG_GATEWAYIP 192.168.11.1 #define CONFIG_NETMASK 255.255.255.0

diff --git a/include/env_default.h b/include/env_default.h index b1fe945bae5b..5ee28a54960d 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -53,8 +53,8 @@ const char default_environment[] = { #ifdef CONFIG_ETHPRIME "ethprime=" CONFIG_ETHPRIME "\0" #endif -#ifdef CONFIG_IPADDR - "ipaddr=" __stringify(CONFIG_IPADDR) "\0" +#ifdef CFG_IPADDR + "ipaddr=" __stringify(CFG_IPADDR) "\0" #endif #ifdef CONFIG_SERVERIP "serverip=" __stringify(CONFIG_SERVERIP) "\0" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 48de265ee7e1..9e927d81200a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -65,7 +65,7 @@ CFG_I2C_MVTWSI_BASE1 CFG_I2C_RTC_ADDR CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK -CONFIG_IPADDR +CFG_IPADDR CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/exynos7420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 937a3c8820c1..44843aba3c30 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -18,7 +18,7 @@ /* IRAM Layout */ #define CFG_IRAM_BASE 0x02100000 #define CONFIG_IRAM_SIZE 0x58000 -#define CONFIG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) +#define CFG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE) #define CPU_RELEASE_ADDR secondary_boot_addr

/* select serial console configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ccc719a3b985..ee3bb81bb47f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -67,7 +67,7 @@ CFG_ICS307_REFCLK_HZ CFG_IMX6_PWM_PER_CLK CFG_IPADDR CFG_IRAM_BASE -CONFIG_IRAM_END +CFG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP CONFIG_KM_DEF_ARCH

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-exynos/lowlevel_init.c | 2 +- arch/arm/mach-exynos/sec_boot.S | 2 +- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 1ff5fcac1b38..9225d2cc1f2a 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -51,7 +51,7 @@ enum { #ifdef CONFIG_EXYNOS5420

/* Address for relocating helper code (Last 4 KB of IRAM) */ -#define EXYNOS_RELOCATE_CODE_BASE (CONFIG_IRAM_TOP - 0x1000) +#define EXYNOS_RELOCATE_CODE_BASE (CFG_IRAM_TOP - 0x1000)

/* * Power up secondary CPUs. diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S index 40c07209e475..1303544d83b6 100644 --- a/arch/arm/mach-exynos/sec_boot.S +++ b/arch/arm/mach-exynos/sec_boot.S @@ -21,7 +21,7 @@ relocate_wait_code: .ltorg /* * Secondary core waits here until Primary wake it up. - * Below code is copied to (CONFIG_IRAM_TOP - 0x1000) + * Below code is copied to (CFG_IRAM_TOP - 0x1000) * This is a workaround code which is supposed to act as a * substitute/supplement to the iROM code. * diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 7a9307ccc3db..d5f480de0ef7 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -10,7 +10,7 @@

#define CONFIG_VAR_SIZE_SPL

-#define CONFIG_IRAM_TOP 0x02074000 +#define CFG_IRAM_TOP 0x02074000

#define CONFIG_PHY_IRAM_BASE 0x02020000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 249ec5090b8a..d2683e317bd6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -69,7 +69,7 @@ CFG_IPADDR CFG_IRAM_BASE CFG_IRAM_END CFG_IRAM_SIZE -CONFIG_IRAM_TOP +CFG_IRAM_TOP CONFIG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/keymile-common.h | 2 +- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index cc5ec219b8db..94408e6efd9a 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -98,7 +98,7 @@ CONFIG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ " " CONFIG_KM_UBI_LINUX_MTD " " \ - CONFIG_KM_DEF_BOOT_ARGS_CPU \ + CFG_KM_DEF_BOOT_ARGS_CPU \ "\0" \ "addpanic=" \ "setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index f6c21e1666d1..da0ee3f27e7e 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -28,7 +28,7 @@ #define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)

/* architecture specific default bootargs */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#define CFG_KM_DEF_BOOT_ARGS_CPU ""

#define CONFIG_KM_DEF_ENV_CPU \ "u-boot="CFG_HOSTNAME "/u-boot.bin\0" \ diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index e64cf24bd5e9..516fa76e3209 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -179,8 +179,8 @@ #define CONFIG_KM_DEF_ENV #endif

-#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#ifndef CFG_KM_DEF_BOOT_ARGS_CPU +#define CFG_KM_DEF_BOOT_ARGS_CPU "" #endif

#define CONFIG_KM_DEF_ENV_CPU \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 870603d461af..3c49e174d9a0 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -16,7 +16,7 @@ * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot * parameters */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" +#define CFG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558"

#include "km/keymile-common.h"

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 12edc317773f..d203ede8c963 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -71,7 +71,7 @@ CFG_IRAM_END CFG_IRAM_SIZE CFG_IRAM_TOP CFG_KM_DEF_ARCH -CONFIG_KM_DEF_BOOT_ARGS_CPU +CFG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS CONFIG_KM_DEF_ENV_BOOTPARAMS

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 3d77b1770651..5e3baca75b23 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -34,7 +34,7 @@ # define CONFIG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ @@ -44,7 +44,7 @@ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" @@ -125,7 +125,7 @@ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI + CFG_KM_DEV_ENV_FLASH_BOOT_UBI

/* * constants diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d5909de8762e..fb702a42bd6b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -79,7 +79,7 @@ CFG_KM_DEF_ENV_BOOTTARGETS CFG_KM_DEF_ENV_CONSTANTS CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT -CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI +CFG_KM_DEV_ENV_FLASH_BOOT_UBI CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- include/configs/socfpga_arria5_secu1.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 974486fc4c32..856d2e909200 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -209,7 +209,7 @@ "checkfdt=true\0" \ ""

-#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -223,7 +223,7 @@ "asrc,spdif,lpuart1,ftm1\0"

#define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 35ec79f7b7db..97070bc77c45 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -428,7 +428,7 @@ int get_scl(void); "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0"

-#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -444,7 +444,7 @@ int get_scl(void); #define CFG_EXTRA_ENV_SETTINGS \ CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "" diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 71aa5a7ca949..6fb7a895995b 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -42,7 +42,7 @@ "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \

-#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=" \ "nand erase 0x100000 0x40000\0"

@@ -55,7 +55,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CFG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ "bootlimit=6\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 11a501212b8c..471b3243f380 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU CFG_KM_DEF_ENV_FLASH_BOOT CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE -CONFIG_KM_NEW_ENV +CFG_KM_NEW_ENV CONFIG_KM_UBI_LINUX_MTD CONFIG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/keymile-common.h | 12 ++++++------ include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- scripts/config_whitelist.txt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 7e347e5b8f4f..2e73d9d6d28f 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -28,7 +28,7 @@ #define CONFIG_KM_UBI_PART_BOOT_OPTS "" #endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */

-#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP +#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ @@ -36,19 +36,19 @@ CONFIG_KM_UBI_PART_BOOT_OPTS # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" -#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ +#else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ +/* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP # define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ + "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0" +#endif /* CFG_KM_UBI_PARTITION_NAME_APP */

#ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 8681145c309f..9386daa19ccc 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -13,7 +13,7 @@ #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* include common defines/options for all Keymile boards */ #include "km/keymile-common.h" diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 5b5637762aca..f7a598b5f9cb 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -10,7 +10,7 @@ #define CFG_HOSTNAME "EXPU1"

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* CLIPS FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index a1c1ca993d7e..b7051e3749d0 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -9,7 +9,7 @@ #define CFG_HOSTNAME "SELI8"

#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"

/* PAXK FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 19a4fc540336..a311539ab15c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI CFG_KM_ECC_MODE CFG_KM_NEW_ENV CFG_KM_UBI_LINUX_MTD -CONFIG_KM_UBI_PARTITION_NAME_APP +CFG_KM_UBI_PARTITION_NAME_APP CONFIG_KM_UBI_PARTITION_NAME_BOOT CONFIG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/km/keymile-common.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index b33bf3615e4f..ffcd44d5ef97 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -51,10 +51,10 @@ #endif /* CFG_KM_UBI_PARTITION_NAME_APP */

#ifdef CONFIG_NAND_ECC_BCH -#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" +#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0" #define CFG_KM_ECC_MODE " eccmode=bch" #else -#define CONFIG_KM_UIMAGE_NAME "uImage\0" +#define CFG_KM_UIMAGE_NAME "uImage\0" #define CFG_KM_ECC_MODE #endif

@@ -124,7 +124,7 @@ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ - "uimage=" CONFIG_KM_UIMAGE_NAME \ + "uimage=" CFG_KM_UIMAGE_NAME \ CFG_KM_DEV_ENV_FLASH_BOOT_UBI

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e5eeb35bfec4..2b4db3778e20 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -86,7 +86,7 @@ CFG_KM_UBI_LINUX_MTD CFG_KM_UBI_PARTITION_NAME_APP CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS -CONFIG_KM_UIMAGE_NAME +CFG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 21cac6ea312a..f191c909f41f 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -49,7 +49,7 @@

#define KEYSTONE2_EMAC_GIG_ENABLE

-#define MAC_ID_BASE_ADDR CONFIG_KSNET_MAC_ID_BASE +#define MAC_ID_BASE_ADDR CFG_KSNET_MAC_ID_BASE

/* MDIO module input frequency */ #ifdef CONFIG_SOC_K2G diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 479ab46e4edd..e46d635ca032 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -47,7 +47,7 @@ #define CFG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6)

/* Keystone net */ -#define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR +#define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ddcc89f508e1..031e72702307 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -88,7 +88,7 @@ CFG_KM_UBI_PARTITION_NAME_BOOT CFG_KM_UBI_PART_BOOT_OPTS CFG_KM_UIMAGE_NAME CFG_KSNET_CPSW_NUM_PORTS -CONFIG_KSNET_MAC_ID_BASE +CFG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE CONFIG_KSNET_NETCP_BASE CONFIG_KSNET_NETCP_V1_0

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index f191c909f41f..bedbcdc8bac6 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -18,7 +18,7 @@ /* EMAC */ #ifdef CONFIG_KSNET_NETCP_V1_0

-#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00090000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00090000) #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x900) #define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x300) #define EMAC_SGMII_BASE_ADDR (GBETH_BASE + 0x100) @@ -32,7 +32,7 @@

#elif defined CONFIG_KSNET_NETCP_V1_5

-#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00200000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 #define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x22000) #define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x00f00) @@ -190,14 +190,14 @@ struct mac_sl_cfg { /* PSS */ #ifdef CONFIG_KSNET_NETCP_V1_0

-#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x604) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x604) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x06060606 #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);

#elif defined CONFIG_KSNET_NETCP_V1_5

-#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x500) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0

#define hw_config_streaming_switch()\ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index e46d635ca032..c21fabc36ed5 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -48,7 +48,7 @@

/* Keystone net */ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR -#define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE +#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 70296e18643b..7d609640e855 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -90,7 +90,7 @@ CFG_KM_UIMAGE_NAME CFG_KSNET_CPSW_NUM_PORTS CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE -CONFIG_KSNET_NETCP_BASE +CFG_KSNET_NETCP_BASE CONFIG_KSNET_NETCP_V1_0 CONFIG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- drivers/net/ti/keystone_net.c | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index 1576a0473850..3f3c580328bf 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -30,7 +30,7 @@ #define CPGMACSL_REG_RESET 0x0c #define CPGMACSL_REG_MAXLEN 0x10

-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5

#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000) #define CPGMACSL_REG_RX_PRI_MAP 0x020 @@ -130,7 +130,7 @@ struct mac_sl_cfg { #define CPSW_REG_ALE_PORTCTL(x) (0x640 + (x) * 4) #define CPSW_REG_VAL_STAT_ENABLE_ALL 0xf

-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5

#define DEVICE_CPSW_BASE (GBETH_BASE + 0x20000) #define CPSW_REG_CTL 0x00004 @@ -168,7 +168,7 @@ struct mac_sl_cfg {

#ifdef CFG_KSNET_NETCP_V1_0 #define SGMII_OFFSET(x) ((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100)) -#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5 #define SGMII_OFFSET(x) ((x) * 0x100) #endif

@@ -195,7 +195,7 @@ struct mac_sl_cfg { #define hw_config_streaming_switch()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);

-#elif defined CONFIG_KSNET_NETCP_V1_5 +#elif defined CFG_KSNET_NETCP_V1_5

#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500) #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0 diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 513c7b32521f..db942811db76 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -70,7 +70,7 @@ enum link_type { #define DEVICE_EMACSW_BASE(base, x) ((base) + EMAC_EMACSW_PORT_BASE_OFS + \ (x) * 0x30)

-#elif defined(CONFIG_KSNET_NETCP_V1_5) +#elif defined(CFG_KSNET_NETCP_V1_5)

#define EMAC_EMACSW_PORT_BASE_OFS 0x222000

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index eabd06ff9b7a..024563b5dd68 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS

/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 9 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index e3f4f5ed4743..a6022cba68ad 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -51,7 +51,7 @@ "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"

/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 2 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index aa9075cfd8ef..5ebc108d098c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -37,7 +37,7 @@ #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS

/* Network */ -#define CONFIG_KSNET_NETCP_V1_5 +#define CFG_KSNET_NETCP_V1_5 #define CFG_KSNET_CPSW_NUM_PORTS 5 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3861edb19315..262995ea1f6a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE CFG_KSNET_MDIO_PHY_CONFIG_ENABLE CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 -CONFIG_KSNET_NETCP_V1_5 +CFG_KSNET_NETCP_V1_5 CONFIG_KSNET_SERDES_LANES_PER_SGMII CONFIG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/net/ti/keystone_net.c | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 5d344d73c3bc..306b862e20ff 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -375,7 +375,7 @@ static void keystone2_net_serdes_setup(void) CFG_KSNET_SERDES_LANES_PER_SGMII);

#if defined(CONFIG_SOC_K2E) || defined(CONFIG_SOC_K2L) - ks2_serdes_init(CONFIG_KSNET_SERDES_SGMII2_BASE, + ks2_serdes_init(CFG_KSNET_SERDES_SGMII2_BASE, &ks2_serdes_sgmii_156p25mhz, CFG_KSNET_SERDES_LANES_PER_SGMII); #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index cb4ea394eb8b..1429faa534e3 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -50,7 +50,7 @@ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE -#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE +#define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES

/* EEPROM definitions */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 980e6bc1d9b1..7470e7e1d91f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -94,7 +94,7 @@ CFG_KSNET_NETCP_BASE CFG_KSNET_NETCP_V1_0 CFG_KSNET_NETCP_V1_5 CFG_KSNET_SERDES_LANES_PER_SGMII -CONFIG_KSNET_SERDES_SGMII2_BASE +CFG_KSNET_SERDES_SGMII2_BASE CONFIG_KSNET_SERDES_SGMII_BASE CONFIG_L1_INIT_RAM CONFIG_L2_CACHE

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- scripts/config_whitelist.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index f2179db6b9b4..0a6fcde3913d 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -133,7 +133,7 @@ #define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS + 0x8000000}

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 09087a70895d..36ae8394d5d6 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -271,7 +271,7 @@ #endif

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #ifdef CONFIG_PHYS_64BIT #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 4b7b53094446..7a31e8bcdc0a 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -249,7 +249,7 @@ #endif

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index c614a539b391..8e2566dd2175 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -247,7 +247,7 @@ #endif

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 2da4f5a09b14..6a215557104f 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -212,7 +212,7 @@ #endif

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index b8bfc52f07ae..bf0c3ac1318b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -71,7 +71,7 @@ #define CFG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CFG_SYS_FLASH_BASE)

/* define to use L1 as initial stack */ -#define CONFIG_L1_INIT_RAM +#define CFG_L1_INIT_RAM #define CFG_SYS_INIT_RAM_ADDR 0xfdd00000 /* Initial L1 address */ #define CFG_SYS_INIT_RAM_ADDR_PHYS_HIGH 0xf #define CFG_SYS_INIT_RAM_ADDR_PHYS_LOW 0xfe03c000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bd22cbb231b8..ca45b1eeb514 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -96,7 +96,7 @@ CFG_KSNET_NETCP_V1_5 CFG_KSNET_SERDES_LANES_PER_SGMII CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE -CONFIG_L1_INIT_RAM +CFG_L1_INIT_RAM CONFIG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/pic32mzdask.h | 4 ++-- scripts/config_whitelist.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 60c747327588..0ae4fc55a97b 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -52,7 +52,7 @@ "fdt_addr_r=0x89d00000\0" \ "scriptaddr=0x88300000\0" \

-#define CONFIG_LEGACY_BOOTCMD_ENV \ +#define CFG_LEGACY_BOOTCMD_ENV \ "legacy_bootcmd= " \ "if load mmc 0 ${scriptaddr} uEnv.txt; then " \ "env import -tr ${scriptaddr} ${filesize}; " \ @@ -71,7 +71,7 @@

#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - CONFIG_LEGACY_BOOTCMD_ENV \ + CFG_LEGACY_BOOTCMD_ENV \ BOOTENV

#endif /* __PIC32MZDASK_CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 07fd8dbeab11..495467153157 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -98,7 +98,7 @@ CFG_KSNET_SERDES_SGMII2_BASE CFG_KSNET_SERDES_SGMII_BASE CFG_L1_INIT_RAM CFG_L2_CACHE -CONFIG_LEGACY_BOOTCMD_ENV +CFG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-exynos/lowlevel_init.c | 4 ++-- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 02a79962af24..243b5c80c90e 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -73,7 +73,7 @@ static void low_power_start(void)

reg_val = readl(EXYNOS5420_SPARE_BASE); if (reg_val != CPU_RST_FLAG_VAL) { - writel(0x0, CONFIG_LOWPOWER_FLAG); + writel(0x0, CFG_LOWPOWER_FLAG); branch_bx(0x0); }

@@ -160,7 +160,7 @@ static void secondary_cores_configure(void) writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C));

/* set lowpower flag and address */ - writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG); + writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG); writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR); writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE); /* Store jump address for power down */ diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index d7db17b2dc92..b617c062881b 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -17,7 +17,7 @@ /* * Low Power settings */ -#define CONFIG_LOWPOWER_FLAG 0x02020028 +#define CFG_LOWPOWER_FLAG 0x02020028 #define CFG_LOWPOWER_ADDR 0x0202002C

#endif /* __CONFIG_EXYNOS5420_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2d7a0202c22..99942bf36472 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -100,7 +100,7 @@ CFG_L1_INIT_RAM CFG_L2_CACHE CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR -CONFIG_LOWPOWER_FLAG +CFG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index dd3f35def0fa..cd3831b5ffeb 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void) writel( clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | + clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index a1ecd8ceef02..d345382545e5 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -29,7 +29,7 @@

#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 -#define CONFIG_LPC32XX_NAND_MLC_NAND_TA 18181818 +#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b38db2586a4f..bb3b1443ed5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -102,7 +102,7 @@ CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR CFG_LOWPOWER_FLAG CFG_LPC32XX_NAND_MLC_BUSY_DELAY -CONFIG_LPC32XX_NAND_MLC_NAND_TA +CFG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH CONFIG_LPC32XX_NAND_MLC_RD_LOW CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index 388be16e2e71..e75ed1f2ae9c 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void) clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | + clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), &lpc32xx_nand_mlc_registers->time_reg); diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 3959051a4ca6..1a4617c5c02b 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -31,7 +31,7 @@ #define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 -#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 +#define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 #define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index eda174693c08..4c28d978ce8a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -104,7 +104,7 @@ CFG_LOWPOWER_FLAG CFG_LPC32XX_NAND_MLC_BUSY_DELAY CFG_LPC32XX_NAND_MLC_NAND_TA CFG_LPC32XX_NAND_MLC_RD_HIGH -CONFIG_LPC32XX_NAND_MLC_RD_LOW +CFG_LPC32XX_NAND_MLC_RD_LOW CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY CONFIG_LPC32XX_NAND_MLC_WR_HIGH CONFIG_LPC32XX_NAND_MLC_WR_LOW

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index 088fdb7981da..31a9a22ba31f 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void) clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | + clkdiv(CFG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0), &lpc32xx_nand_mlc_registers->time_reg); } diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 34af515037fe..c67a0bb6e1a8 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -32,7 +32,7 @@ #define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 #define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 #define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 -#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 +#define CFG_LPC32XX_NAND_MLC_WR_HIGH 40000000 #define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f0976db1a818..607056ade394 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -106,7 +106,7 @@ CFG_LPC32XX_NAND_MLC_NAND_TA CFG_LPC32XX_NAND_MLC_RD_HIGH CFG_LPC32XX_NAND_MLC_RD_LOW CFG_LPC32XX_NAND_MLC_TCEA_DELAY -CONFIG_LPC32XX_NAND_MLC_WR_HIGH +CFG_LPC32XX_NAND_MLC_WR_HIGH CONFIG_LPC32XX_NAND_MLC_WR_LOW CONFIG_LPC32XX_NAND_SLC_RDR_CLKS CONFIG_LPC32XX_NAND_SLC_RHOLD

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index f4f1b22f5e21..0f12201aa0e3 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void) TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | - TAC_R_RDY(CONFIG_LPC32XX_NAND_SLC_RDR_CLKS) | + TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) | TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index ab10101f20a9..e17896841355 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -45,7 +45,7 @@ #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 -#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6eed044d853c..8c567e45590c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -108,7 +108,7 @@ CFG_LPC32XX_NAND_MLC_RD_LOW CFG_LPC32XX_NAND_MLC_TCEA_DELAY CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW -CONFIG_LPC32XX_NAND_SLC_RDR_CLKS +CFG_LPC32XX_NAND_SLC_RDR_CLKS CONFIG_LPC32XX_NAND_SLC_RHOLD CONFIG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index 1fdc80989fab..71e8286d1c8f 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void) TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | - TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), + TAC_R_SETUP(hclk / CFG_LPC32XX_NAND_SLC_RSETUP), &lpc32xx_nand_slc_regs->tac); }

diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 0b815ded7322..72cf031e05da 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -48,7 +48,7 @@ #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_RSETUP 50000000

/* * USB diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced36635799..fc20b83d66d0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -110,7 +110,7 @@ CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW CFG_LPC32XX_NAND_SLC_RDR_CLKS CFG_LPC32XX_NAND_SLC_RHOLD -CONFIG_LPC32XX_NAND_SLC_RSETUP +CFG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index fb1fb2d7dccf..7de5c840ed9b 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void) &lpc32xx_nand_slc_regs->icr);

/* Configure NAND flash timings */ - writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) | + writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5ba8c1bb20e2..dc16ed84c52c 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -41,7 +41,7 @@ /* * NAND chip timings */ -#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fc42b693e3e1..4f5de41ab95d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -112,7 +112,7 @@ CFG_LPC32XX_NAND_SLC_RDR_CLKS CFG_LPC32XX_NAND_SLC_RHOLD CFG_LPC32XX_NAND_SLC_RSETUP CFG_LPC32XX_NAND_SLC_RWIDTH -CONFIG_LPC32XX_NAND_SLC_WDR_CLKS +CFG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index dee8fd24b94b..a070df81d7cd 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void) writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | - TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | + TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 24312c848e2d..5719e422da97 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -44,7 +44,7 @@ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9609ea606fd3..1051a7b949ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -114,7 +114,7 @@ CFG_LPC32XX_NAND_SLC_RSETUP CFG_LPC32XX_NAND_SLC_RWIDTH CFG_LPC32XX_NAND_SLC_WDR_CLKS CFG_LPC32XX_NAND_SLC_WHOLD -CONFIG_LPC32XX_NAND_SLC_WSETUP +CFG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH CONFIG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index a070df81d7cd..356f8d9440bb 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void)

/* Configure NAND flash timings */ writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | - TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | + TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 5719e422da97..9cfee381d4ac 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -42,7 +42,7 @@ * NAND chip timings */ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 -#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 +#define CFG_LPC32XX_NAND_SLC_WWIDTH 66666666 #define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 #define CFG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1051a7b949ec..58792f1d2b7c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -115,7 +115,7 @@ CFG_LPC32XX_NAND_SLC_RWIDTH CFG_LPC32XX_NAND_SLC_WDR_CLKS CFG_LPC32XX_NAND_SLC_WHOLD CFG_LPC32XX_NAND_SLC_WSETUP -CONFIG_LPC32XX_NAND_SLC_WWIDTH +CFG_LPC32XX_NAND_SLC_WWIDTH CONFIG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR CONFIG_MALTA

Signed-off-by: Tom Rini trini@konsulko.com --- arch/sandbox/cpu/start.c | 2 +- common/init/board_init.c | 2 +- common/spl/spl.c | 4 ++-- doc/arch/sandbox/sandbox.rst | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/sandbox.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- scripts/config_whitelist.txt | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 622df41f54cf..234652872ecc 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[]) }

#if CONFIG_VAL(SYS_MALLOC_F_LEN) - gd->malloc_base = CONFIG_MALLOC_F_ADDR; + gd->malloc_base = CFG_MALLOC_F_ADDR; #endif #if CONFIG_IS_ENABLED(LOG) gd->default_log_level = state->default_log_level; diff --git a/common/init/board_init.c b/common/init/board_init.c index 6a550261778d..96ffb79a9869 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void) ulong board_init_f_alloc_reserve(ulong top) { /* Reserve early malloc arena */ -#ifndef CONFIG_MALLOC_F_ADDR +#ifndef CFG_MALLOC_F_ADDR #if CONFIG_VAL(SYS_MALLOC_F_LEN) top -= CONFIG_VAL(SYS_MALLOC_F_LEN); #endif diff --git a/common/spl/spl.c b/common/spl/spl.c index 1d2e8fda7284..4668367b680f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)

#if CONFIG_VAL(SYS_MALLOC_F_LEN) if (setup_malloc) { -#ifdef CONFIG_MALLOC_F_ADDR - gd->malloc_base = CONFIG_MALLOC_F_ADDR; +#ifdef CFG_MALLOC_F_ADDR + gd->malloc_base = CFG_MALLOC_F_ADDR; #endif gd->malloc_limit = CONFIG_VAL(SYS_MALLOC_F_LEN); gd->malloc_ptr = 0; diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst index e6d840365166..cd7f8a2cb0dc 100644 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@ -615,7 +615,7 @@ Addr Config Usage ======= ======================== =============================== 0 CONFIG_SYS_FDT_LOAD_ADDR Device tree c000 CONFIG_BLOBLIST_ADDR Blob list - 10000 CONFIG_MALLOC_F_ADDR Early memory allocation + 10000 CFG_MALLOC_F_ADDR Early memory allocation f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used as the SPL load buffer in spl_test_load(). diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 19c7fca03b29..9e7322cdb937 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -14,7 +14,7 @@

/* SPL config */ #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000

#endif /* CONFIG_SPL_BUILD */

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index caa1498acead..a63325973846 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -13,7 +13,7 @@

#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000

#endif

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 7785bdc7cbe6..64cdc401d039 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -16,7 +16,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x912000 +#define CFG_MALLOC_F_ADDR 0x912000 /* For RAW image gives a error info not panic */

#endif diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index ee524f0e63f2..d85ae21e2317 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -14,7 +14,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */

#endif diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 44d74bb1a788..0723d27ab703 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -11,7 +11,7 @@ #include <asm/arch/imx-regs.h>

#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000

/* For RAW image gives a error info not panic */

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index c364e06dc450..d5642b96495f 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -24,7 +24,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */

#endif diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index e718daa07c3e..2158b0af74f9 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -15,7 +15,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -# define CONFIG_MALLOC_F_ADDR 0x930000 +# define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif /* CONFIG_SPL_BUILD */

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index c490e3829f9a..5579a05d165f 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -14,7 +14,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 #endif

/* Enable Distro Boot */ diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 38ae5f137022..e4e24b522fdb 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -24,7 +24,7 @@ 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)

#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ +#define CFG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ * GD_FLG_FULL_MALLOC_INIT \ * set \ */ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index f6f356d27ba2..f7ae1b47d063 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */

#endif diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index d9ce5d5d0f1a..4b46321e8512 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -15,7 +15,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */

#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index eb7059f0648c..5158f2cc605a 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #endif

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 7772e71013ef..a25efbb16bdb 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -12,7 +12,7 @@

#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000

#endif

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 669da591fa2b..4f55ae49403d 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -12,7 +12,7 @@

#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000

#endif

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index b7397f6038fd..d77510e1685e 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -12,7 +12,7 @@ #define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)

#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x22040000 +#define CFG_MALLOC_F_ADDR 0x22040000

#endif diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h index 5cd6492dd503..7b7bef3ca755 100644 --- a/include/configs/imx93_evk.h +++ b/include/configs/imx93_evk.h @@ -14,7 +14,7 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)

#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x204D0000 +#define CFG_MALLOC_F_ADDR 0x204D0000 #endif

#ifdef CONFIG_DISTRO_DEFAULTS diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 56d0036147c6..657124cc725d 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -47,7 +47,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 #endif

#define CFG_EXTRA_ENV_SETTINGS BOOTENV diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 4dd51c7f1d7f..5a3c9f76a431 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -16,7 +16,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */

diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 218e9d9b3013..0a1df4ad4bd0 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -32,7 +32,7 @@ /* generic timer */

/* early heap for SPL DM */ -#define CONFIG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE +#define CFG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE

/* serial port */ #define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2) diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 9160c78c0464..ce6dc87c69c7 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -16,7 +16,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 1d8709180c83..37ade717ae99 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -14,7 +14,7 @@ #define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ #endif

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index c9e57da0160a..99893a7070fe 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -6,7 +6,7 @@ #ifndef __CONFIG_H #define __CONFIG_H

-#define CONFIG_MALLOC_F_ADDR 0x0010000 +#define CFG_MALLOC_F_ADDR 0x0010000

/* GUIDs for capsule updatable firmware images */ #define SANDBOX_UBOOT_IMAGE_GUID \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 7f3fa795afdc..27d7efb883de 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -14,7 +14,7 @@

#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ #endif

diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 3ce2714e196e..d03c69cf00ae 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -16,7 +16,7 @@ /*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/

/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 +#define CFG_MALLOC_F_ADDR 0x184000 /* For RAW image gives a error info not panic */

#define CONFIG_POWER_PCA9450 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 316095b75e0d..f42481a7b3bc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -117,7 +117,7 @@ CFG_LPC32XX_NAND_SLC_WHOLD CFG_LPC32XX_NAND_SLC_WSETUP CFG_LPC32XX_NAND_SLC_WWIDTH CFG_MACB_SEARCH_PHY -CONFIG_MALLOC_F_ADDR +CFG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MAX_DSP_CPUS CONFIG_MAX_MEM_MAPPED

Signed-off-by: Tom Rini trini@konsulko.com --- arch/powerpc/include/asm/config_mpc85xx.h | 4 ++-- doc/README.Heterogeneous-SoCs | 2 +- include/e500.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d6b2b9b469a3..9738c573452b 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -152,7 +152,7 @@ #define CFG_SYS_FM_MURAM_SIZE 0x60000

#ifdef CONFIG_ARCH_B4860 -#define CONFIG_MAX_DSP_CPUS 12 +#define CFG_MAX_DSP_CPUS 12 #define CONFIG_NUM_DSP_CPUS 6 #define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 } #define CFG_SYS_NUM_FM1_DTSEC 6 @@ -161,7 +161,7 @@ #define CFG_SYS_FSL_SRIO_OB_WIN_NUM 9 #define CFG_SYS_FSL_SRIO_IB_WIN_NUM 5 #else -#define CONFIG_MAX_DSP_CPUS 2 +#define CFG_MAX_DSP_CPUS 2 #define CFG_SYS_FSL_CLUSTER_CLOCKS { 1, 4 } #define CFG_SYS_NUM_FM1_DTSEC 4 #define CFG_SYS_NUM_FM1_10GEC 0 diff --git a/doc/README.Heterogeneous-SoCs b/doc/README.Heterogeneous-SoCs index 9da652e459be..11f2dbc0013d 100644 --- a/doc/README.Heterogeneous-SoCs +++ b/doc/README.Heterogeneous-SoCs @@ -72,7 +72,7 @@ CONFIG_SYS_ETVPE_CLK - Define PLL index for ETVPE clock

DSP cores and other device's components have been added in this structure.

-freq_processor_dsp[CONFIG_MAX_DSP_CPUS] - Array to contain the DSP core's frequencies +freq_processor_dsp[CFG_MAX_DSP_CPUS] - Array to contain the DSP core's frequencies freq_cpri - To store CPRI frequency freq_maple - To store MAPLE frequency freq_maple_ulb - To store MAPLE-ULB frequency diff --git a/include/e500.h b/include/e500.h index 9f68a834c2f0..9ea90109406c 100644 --- a/include/e500.h +++ b/include/e500.h @@ -12,7 +12,7 @@ typedef struct { unsigned long freq_processor[CONFIG_MAX_CPUS]; #ifdef CONFIG_HETROGENOUS_CLUSTERS - unsigned long freq_processor_dsp[CONFIG_MAX_DSP_CPUS]; + unsigned long freq_processor_dsp[CFG_MAX_DSP_CPUS]; #endif unsigned long freq_systembus; unsigned long freq_ddrbus; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c72372a11ddc..31484bd13fd9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -119,7 +119,7 @@ CFG_LPC32XX_NAND_SLC_WWIDTH CFG_MACB_SEARCH_PHY CFG_MALLOC_F_ADDR CFG_MALTA -CONFIG_MAX_DSP_CPUS +CFG_MAX_DSP_CPUS CONFIG_MAX_MEM_MAPPED CONFIG_MAX_RAM_BANK_SIZE CONFIG_MEMSIZE_IN_BYTES

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-omap2/am33xx/board.c | 4 ++-- arch/arm/mach-omap2/sec-common.c | 2 +- arch/arm/mach-orion5x/dram.c | 4 ++-- arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +- board/phytec/phycore_am335x_r2/board.c | 2 +- board/ti/ks2_evm/board.c | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rut.h | 2 +- include/configs/thuban.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 24 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index 42078b39f8ab..cfad28c43d0a 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -27,7 +27,7 @@ int dram_init(void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; }

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 86755d6d9543..a52d04d85c8a 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -73,7 +73,7 @@ int dram_init(void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; }

@@ -521,7 +521,7 @@ void board_init_f(ulong dummy) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); } #endif

diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 0f9b915ea3dd..64560b21e3f5 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -203,7 +203,7 @@ u32 get_sec_mem_start(void) omap_sdram_size() #else get_ram_size((void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE) + CFG_MAX_RAM_BANK_SIZE) #endif - sec_mem_size)); return sec_mem_start; diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c index c9a3750e48de..5647f847d78f 100644 --- a/arch/arm/mach-orion5x/dram.c +++ b/arch/arm/mach-orion5x/dram.c @@ -39,7 +39,7 @@ int dram_init (void) /* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size = get_ram_size( (long *) orion5x_sdram_bar(0), - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); return 0; }

@@ -51,7 +51,7 @@ int dram_init_banksize(void) gd->bd->bi_dram[i].start = orion5x_sdram_bar(i); gd->bd->bi_dram[i].size = get_ram_size( (long *) (gd->bd->bi_dram[i].start), - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); }

return 0; diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index 4b1b0b0f3716..e41d07e18cc5 100644 --- a/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -53,7 +53,7 @@ #define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE #define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE

-#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024) +#define CFG_MAX_RAM_BANK_SIZE (64*1024*1024)

/* include here SoC variants. 5181, 5281, 6183 should go here when adding support for them, and this comment should then be updated. */ diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c index e84dd251c254..eb573d076dd7 100644 --- a/board/phytec/phycore_am335x_r2/board.c +++ b/board/phytec/phycore_am335x_r2/board.c @@ -167,7 +167,7 @@ void sdram_init(void)

/* Detect memory physically present */ gd->ram_size = get_ram_size((void *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE);

/* Reconfigure memory for actual detected size */ switch (gd->ram_size) { diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 1683f780a33b..5dcda12105b9 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -47,7 +47,7 @@ int dram_init(void) ddr3_size = ddr3_init();

gd->ram_size = get_ram_size((long *)CFG_SYS_SDRAM_BASE, - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); #if defined(CONFIG_TI_AEMIF) if (!(board_is_k2g_ice() || board_is_k2g_i1())) aemif_init(ARRAY_SIZE(aemif_configs), aemif_configs); diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 3a6ffd9de0bb..f43e00e8a2b6 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_AM43XX_EVM_H #define __CONFIG_AM43XX_EVM_H

-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 21) /* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */

#include <asm/arch/omap.h> diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 3e0b42507888..ab57e14392d0 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -19,7 +19,7 @@

#endif /* CONFIG_DM */

-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

/* Timer information */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 5a795fe99171..48ee3a50be5e 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -8,7 +8,7 @@ #ifndef __CONFIG_CM_T43_H #define __CONFIG_CM_T43_H

-#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */

#include <asm/arch/omap.h> diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index cfc8330e35ae..736af88a0247 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -31,7 +31,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ /* memtest start addr */

/* memtest will be run on 16MB */ diff --git a/include/configs/draco.h b/include/configs/draco.h index b56ba9132af2..4c67174572f3 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -25,7 +25,7 @@ "led1=64,0,1\0"

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

/* Default env settings */ #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 32b45b1e5b8d..8b2745ea96e4 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -67,7 +67,7 @@ "led5=63,0,1\0"

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

#define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index b9ec7f379354..3a0622ab0b3b 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -27,7 +27,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20) /* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/

/* memtest start addr */

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 02b88da28efa..b1fc437395dd 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -26,7 +26,7 @@ */ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */ #define PHYS_SDRAM_1_SIZE (128 << 20) /* SDRAM size 128MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/

/* memtest start addr */

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 10eaeb49de62..b701e52076db 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -23,7 +23,7 @@ "led0=117,0,1\0" \

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */

/* Use common default */

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 777df4c11259..2efb4d23cdda 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -32,7 +32,7 @@ "led5=63,0,1\0"

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

#define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/rut.h b/include/configs/rut.h index 99799f8494e0..4002bc4b6c88 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -19,7 +19,7 @@ #define DDR_PLL_FREQ 303

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */ +#define CFG_MAX_RAM_BANK_SIZE (256 << 20) /* 256 MiB */

/* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14 diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 1753fa410d18..a5913e1e7d2c 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -25,7 +25,7 @@ "led1=64,0,1\0"

/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */

#define EEPROM_ADDR_DDR3 0x90 #define EEPROM_ADDR_CHIP 0x120 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 28dba4aa95b6..11e1936c2562 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -67,7 +67,7 @@ * Physical Memory Map */ #define PHYS_DRAM_1_SIZE 0x20000000 /* 512MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1024MB */

#define CFG_SYS_SDRAM_BASE 0x80000000

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 2d9d2fd66e9a..ac6d46f917b8 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -19,7 +19,7 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)

-#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ #define CFG_SYS_SDRAM_BASE 0x80000000

/** diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index ed17b4292096..20f8643771d8 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -11,7 +11,7 @@ #ifndef __CONFIG_TI_AM335X_COMMON_H__ #define __CONFIG_TI_AM335X_COMMON_H__

-#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define CFG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */

#include <asm/arch/omap.h> diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 7142d30a5994..a47f0902a267 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -15,7 +15,7 @@

/* Memory Configuration */ #define CFG_SYS_LPAE_SDRAM_BASE 0x800000000 -#define CONFIG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2 << 30) /* 2GB */

#ifdef CONFIG_SYS_MALLOC_F_LEN #define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index be26a6c456f2..88e4db9a9f5c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -121,7 +121,7 @@ CFG_MALLOC_F_ADDR CFG_MALTA CFG_MAX_DSP_CPUS CFG_MAX_MEM_MAPPED -CONFIG_MAX_RAM_BANK_SIZE +CFG_MAX_RAM_BANK_SIZE CONFIG_MEMSIZE_IN_BYTES CONFIG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS

Signed-off-by: Tom Rini trini@konsulko.com --- drivers/ddr/fsl/ctrl_regs.c | 6 +++--- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +- drivers/dma/fsl_dma.c | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1043aqds.h | 2 +- include/configs/ls1043ardb.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1046ardb.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/socrates.h | 2 +- scripts/config_whitelist.txt | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index df7ec484651a..684975eebc2d 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -938,7 +938,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num, #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) /* Use the DDR controller to auto initialize memory. */ d_init = popts->ecc_init_using_memctl; - ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE; + ddr->ddr_data_init = CFG_MEM_INIT_VALUE; debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init); #else /* Memory will be initialized via DMA, or not at all. */ @@ -1847,8 +1847,8 @@ static void set_ddr_data_init(fsl_ddr_cfg_regs_t *ddr) { unsigned int init_value; /* Initialization value */

-#ifdef CONFIG_MEM_INIT_VALUE - init_value = CONFIG_MEM_INIT_VALUE; +#ifdef CFG_MEM_INIT_VALUE + init_value = CFG_MEM_INIT_VALUE; #else init_value = 0xDEADBEEF; #endif diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index 0f1e99eeb039..ec8c79199b29 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -73,7 +73,7 @@ ddr_enable_ecc(unsigned int dram_size) struct ccsr_ddr __iomem *ddr = (struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR);

- dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size); + dma_meminit(CFG_MEM_INIT_VALUE, dram_size);

/* * Enable errors for ECC. diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index cd78e45d888a..8620c8f45d6f 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -142,7 +142,7 @@ void dma_meminit(uint val, uint size) if (((uint)p & 0x1f) == 0) ppcDcbz((ulong)p);

- *p = (uint)CONFIG_MEM_INIT_VALUE; + *p = (uint)CFG_MEM_INIT_VALUE;

if (((uint)p & 0x1c) == 0x1c) ppcDcbf((ulong)p); diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 5f2fc5516d5e..28315eef765d 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -31,7 +31,7 @@

/* DDR Setup */

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef

#define CFG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 794289627fe8..a486fb7d6bd5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -104,7 +104,7 @@ /* DDR Setup */ #define SPD_EEPROM_ADDRESS 0x52

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef

#ifndef __ASSEMBLY__ extern unsigned long get_sdram_size(void); diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 36ae8394d5d6..c61d086dbe57 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -95,7 +95,7 @@ */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 7a31e8bcdc0a..bae6742928e3 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -65,7 +65,7 @@ */ #define CFG_SYS_INIT_L2CSR0 L2CSR0_L2E #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 8e2566dd2175..d9841397fb6b 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -63,7 +63,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 6a215557104f..9e38d5e9f3a2 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -63,7 +63,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index bf0c3ac1318b..f1ee131aaa98 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -45,7 +45,7 @@ * These can be toggled for performance analysis, otherwise use default. */ #ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 0a1df4ad4bd0..0029499ea3c0 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -16,7 +16,7 @@ #endif

/* DDR */ -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef

#define CONFIG_VERY_BIG_RAM #define CFG_SYS_DDR_SDRAM_BASE 0x80000000 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 69f9bacad97c..9d2622a7d69f 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -23,7 +23,7 @@ #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE

#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index dab57382eddf..35662f65502f 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -13,7 +13,7 @@ #define SPD_EEPROM_ADDRESS 0x51

#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

#ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 12c4853ea963..80214e069cb1 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -12,7 +12,7 @@ /* Physical Memory Map */

#ifndef CONFIG_SPL -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

/* diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index e67ded55da6b..c4fbef7e7f9a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -13,7 +13,7 @@ #define SPD_EEPROM_ADDRESS 0x51

#ifdef CONFIG_DDR_ECC -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #endif

#ifdef CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index f3904e7b3f7b..1209f16619f9 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -13,7 +13,7 @@

#define SPD_EEPROM_ADDRESS 0x51

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef

#if defined(CONFIG_QSPI_BOOT) #define CFG_SYS_UBOOT_BASE 0x40100000 diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 0582a4568dc7..52a6a2768384 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -14,7 +14,7 @@

#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index ee796facc06c..542495956c32 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -15,7 +15,7 @@

#define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index d029d841d51e..db7e422336fe 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -16,7 +16,7 @@ #define CFG_SYS_I2C_FPGA_ADDR 0x66 #define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 73477978be46..e4c9b2c44ca6 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -21,7 +21,7 @@

#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4)

-#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a469c83fa4eb..0fc32efabc7f 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -19,7 +19,7 @@ #define CFG_SYS_DDR_BLOCK2_BASE 0x2080000000ULL #define CFG_SYS_SDRAM_SIZE 0x200000000UL #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE -#define CONFIG_MEM_INIT_VALUE 0xdeadbeef +#define CFG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS1 0x51 #define SPD_EEPROM_ADDRESS2 0x52 #define SPD_EEPROM_ADDRESS3 0x53 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 9eee8de41644..eb5c14fff28e 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -51,7 +51,7 @@

/* DDR Setup */

-#define CONFIG_MEM_INIT_VALUE 0xDeadBeef +#define CFG_MEM_INIT_VALUE 0xDeadBeef

#define CFG_SYS_DDR_SDRAM_BASE 0x00000000 #define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6461fc20d698..1adb99f49ec7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -123,7 +123,7 @@ CFG_MAX_DSP_CPUS CFG_MAX_MEM_MAPPED CFG_MAX_RAM_BANK_SIZE CFG_MEMSIZE_IN_BYTES -CONFIG_MEM_INIT_VALUE +CFG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS CONFIG_MII_DEFAULT_TSEC CONFIG_MIU_2BIT_21_7_INTERLEAVED

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/P1010RDB.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index a486fb7d6bd5..a75e1b8f7a8a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -350,7 +350,7 @@ extern unsigned long get_sdram_size(void); #endif

#if defined(CONFIG_TSEC_ENET) -#define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ +#define CFG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 0a08619384b6..7a9a89d02390 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -71,7 +71,7 @@ */

#ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 1 +#define CFG_MII_DEFAULT_TSEC 1 #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 9d2622a7d69f..be05ab9de8cb 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -252,7 +252,7 @@ */

#ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 3 +#define CFG_MII_DEFAULT_TSEC 3 #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a1b88d29cb15..0380ebb2a6e8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -125,7 +125,7 @@ CFG_MAX_RAM_BANK_SIZE CFG_MEMSIZE_IN_BYTES CFG_MEM_INIT_VALUE CFG_MFG_ENV_SETTINGS -CONFIG_MII_DEFAULT_TSEC +CFG_MII_DEFAULT_TSEC CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV

Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-exynos/exynos4_setup.h | 2 +- include/configs/smdkv310.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h index fbb45eb897e3..b696206cc855 100644 --- a/arch/arm/mach-exynos/exynos4_setup.h +++ b/arch/arm/mach-exynos/exynos4_setup.h @@ -434,7 +434,7 @@ struct mem_timings { /* Interleave_bit0: 0xC*/ #define APB_SFR_INTERLEAVE_CONF_VAL 0x0000000c #endif -#ifdef CONFIG_MIU_2BIT_INTERLEAVED +#ifdef CFG_MIU_2BIT_INTERLEAVED /* Interleave: 2Bit, Interleave_bit1: 0x15, Interleave_bit0: 0xc */ #define APB_SFR_INTERLEAVE_CONF_VAL 0x2000150c #endif diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 1f137dba90f7..00dd929d90e6 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -35,7 +35,7 @@ /* FLASH and environment organization */

/* MIU (Memory Interleaving Unit) */ -#define CONFIG_MIU_2BIT_INTERLEAVED +#define CFG_MIU_2BIT_INTERLEAVED

#define RESERVE_BLOCK_SIZE (512) #define BL1_SIZE (16 << 10) /*16 K reserved for BL1*/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8d6af14c3667..b2686806c5c4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -127,7 +127,7 @@ CFG_MEM_INIT_VALUE CFG_MFG_ENV_SETTINGS CFG_MII_DEFAULT_TSEC CFG_MIU_2BIT_21_7_INTERLEAVED -CONFIG_MIU_2BIT_INTERLEAVED +CFG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM