global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG
authorTom Rini <trini@konsulko.com>
Sun, 4 Dec 2022 15:03:50 +0000 (10:03 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 23 Dec 2022 15:09:42 +0000 (10:09 -0500)
Perform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS

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

diff --git a/README b/README
index e19aa1f..a278825 100644 (file)
--- a/README
+++ b/README
@@ -1124,7 +1124,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
@@ -1133,7 +1133,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"
 
index 10e63f3..f44bb2a 100644 (file)
@@ -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"                     \
         ......
 
index 148b498..ec2ef94 100644 (file)
@@ -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;"                \
index 634387a..725a1ae 100644 (file)
@@ -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::
 
index c71570d..0b3b32b 100644 (file)
@@ -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:
 
index bc72aa9..8016aca 100644 (file)
@@ -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:
index 83f210d..2c44e5d 100644 (file)
@@ -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
index 7ca992a..f73f0b8 100644 (file)
@@ -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
@@ -657,7 +657,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.
 
index e14650f..f7aba6e 100644 (file)
@@ -17,7 +17,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=40010000\0"                   \
        "u-boot=u-boot.bin\0"                   \
index 220524b..049516e 100644 (file)
@@ -27,7 +27,7 @@
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=10000\0"                      \
        "u-boot=u-boot.bin\0"                   \
index bc156df..a6349fc 100644 (file)
@@ -20,7 +20,7 @@
        env/embedded.o(.text*);
 
 #ifdef CONFIG_DRIVER_DM9000
-#      define CONFIG_EXTRA_ENV_SETTINGS                \
+#      define CFG_EXTRA_ENV_SETTINGS           \
                "netdev=eth0\0"                         \
                "inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"     \
                "loadaddr=10000\0"                      \
index 6aae584..33c2fc0 100644 (file)
@@ -27,7 +27,7 @@
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text);
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=10000\0"                      \
        "u-boot=u-boot.bin\0"                   \
index 41974cf..607c5de 100644 (file)
@@ -38,7 +38,7 @@
 #define CFG_SYS_I2C_PINMUX_CLR (0xFFF0)
 #define CFG_SYS_I2C_PINMUX_SET (0x000F)
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=10000\0"                      \
        "uboot=u-boot.bin\0"                    \
index 7cfe7a2..31699a4 100644 (file)
@@ -27,7 +27,7 @@
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text*);
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=10000\0"                      \
        "u-boot=u-boot.bin\0"                   \
index ac2bd0b..b6d82c7 100644 (file)
@@ -30,7 +30,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS              \
+#define CFG_EXTRA_ENV_SETTINGS         \
        "netdev=eth0\0"                         \
        "loadaddr=40010000\0"                   \
        "u-boot=u-boot.bin\0"                   \
index a86a117..d74a636 100644 (file)
@@ -22,7 +22,7 @@
 
 /* I2C */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "netdev=eth0\0"                 \
        "loadaddr=40010000\0"   \
        "u-boot=u-boot.bin\0"   \
index b2ad03c..fa6f2d2 100644 (file)
@@ -24,7 +24,7 @@
 
 /* I2C */
 
-#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"   \
index f836882..c6929c1 100644 (file)
@@ -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"                                           \
index e0ac933..fad1615 100644 (file)
 
 #define FDTFILE                        "mpc8379_rdb.dtb"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "netdev=eth1\0"                         \
        "uboot=" CONFIG_UBOOTPATH "\0"                                  \
        "tftpflash=tftp $loadaddr $uboot;"                              \
index 1e3ba6d..6f3e298 100644 (file)
  * Environment Configuration
  */
 
-#define        CONFIG_EXTRA_ENV_SETTINGS               \
+#define        CFG_EXTRA_ENV_SETTINGS          \
        "hwconfig=fsl_ddr:ecc=off\0"            \
        "netdev=eth0\0"                         \
        "uboot=" CONFIG_UBOOTPATH "\0"  \
index afb602c..b57e863 100644 (file)
@@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);
  * Environment Configuration
  */
 
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
+#define        CFG_EXTRA_ENV_SETTINGS                          \
        "hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"      \
        "netdev=eth0\0"                                         \
        "uboot=" CONFIG_UBOOTPATH "\0"          \
index 1a157a7..6e755fc 100644 (file)
 
 #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"                                         \
index 4794c5a..063b864 100644 (file)
        "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"  \
index cfde8ec..9d04d30 100644 (file)
 #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"\
index 4b6bdaa..7f332cf 100644 (file)
 
 #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;"                                      \
index fab40f7..d6dd9c0 100644 (file)
 
 #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;"                                      \
index 41565f2..22cbf92 100644 (file)
 #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;"                                      \
index f277400..29f4d06 100644 (file)
@@ -30,7 +30,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"       \
        "usb_pgood_delay=2000\0"
 
index 755f7fa..1f473b5 100644 (file)
@@ -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" \
index a5b83b0..a8fa61c 100644 (file)
@@ -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 \
index abd868c..e2beaf2 100644 (file)
@@ -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" \
index 70645ed..ee6f622 100644 (file)
@@ -21,7 +21,7 @@
 #define V_SCLK                         (V_OSCK)
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
        "kloadaddr=0x84000000\0" \
        "fdtaddr=0x85000000\0" \
index 342a068..f3d3d18 100644 (file)
@@ -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
index c57a0dd..b75c648 100644 (file)
@@ -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" \
index 7659c1c..3a6ffd9 100644 (file)
@@ -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" \
index 5406c39..1bd900d 100644 (file)
@@ -56,7 +56,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_AM62A7_BOARD_SETTINGS                                 \
index 57f3f37..809d891 100644 (file)
@@ -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                                  \
index 25c71f0..26a7f25 100644 (file)
@@ -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                                  \
index 0307426..33dd6cf 100644 (file)
@@ -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                                             \
index ca29346..648d30a 100644 (file)
@@ -10,7 +10,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; "                 \
index aa3dcf4..73d8d24 100644 (file)
@@ -31,7 +31,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" \
index 07587c7..d461590 100644 (file)
@@ -62,7 +62,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" \
index b06660a..fe7d11b 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        ENV_DEVICE_SETTINGS \
        BOOTENV
 
index 60758b0..8e27fb5 100644 (file)
@@ -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"    \
index ff213a4..a6e9d2b 100644 (file)
@@ -94,7 +94,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" \
index 6aef3bd..6522432 100644 (file)
@@ -71,7 +71,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"                                \
index afdb747..4101440 100644 (file)
@@ -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};" \
index 0f9e2cf..c59d4bb 100644 (file)
@@ -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"
index d70f038..b566ecf 100644 (file)
@@ -82,7 +82,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" \
index 04dc50b..a82dfc9 100644 (file)
@@ -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 " \
index 6f6552e..e794638 100644 (file)
@@ -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" \
index fc176dc..47de4bc 100644 (file)
        QSPI_FLASH \
        FLASH_IMAGES
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        ARCH_ENV_SETTINGS
 
 #endif /* __BCM_NS3_H */
index 57360b6..d1de356 100644 (file)
@@ -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"
index 2713b15..65c0183 100644 (file)
@@ -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" \
index 556bfa0..3662668 100644 (file)
@@ -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" \
index 0842a4a..5df8d03 100644 (file)
@@ -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" \
index 2c5236a..236d720 100644 (file)
@@ -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" \
index 984602c..32d9f50 100644 (file)
@@ -24,7 +24,7 @@
 
 /* Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 BUR_COMMON_ENV \
 "cfgaddr=0x106F0000\0" \
 "scraddr=0x10700000\0" \
index f990835..ffb4cd3 100644 (file)
@@ -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;" \
index 410b3e6..9ca6d6f 100644 (file)
@@ -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" \
index 474ad69..a8273a7 100644 (file)
@@ -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 \
index 6f3396b..2639818 100644 (file)
@@ -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" \
index 1e5154a..850eb89 100644 (file)
@@ -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" \
index 5c9004c..2d56d37 100644 (file)
@@ -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" \
index 9c9e950..062d3d8 100644 (file)
 
 #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" \
index 9df8baa..c66cf72 100644 (file)
@@ -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" \
index 8a18d6f..aa17c9c 100644 (file)
@@ -41,7 +41,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" \
index 6f3524d..5b802aa 100644 (file)
@@ -79,7 +79,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        UBI_BOOTCMD \
index 215c633..13bc4e7 100644 (file)
@@ -56,7 +56,7 @@
                "${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        AHAB_ENV \
        BOOTENV \
        CONFIG_MFG_ENV_SETTINGS \
index 4e51df1..bf2a9bb 100644 (file)
@@ -56,7 +56,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" \
index 89546b8..91f87ea 100644 (file)
 #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 \
index e8918df..60f3138 100644 (file)
@@ -47,7 +47,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 \
index e9b85b4..6f43172 100644 (file)
@@ -18,8 +18,8 @@
 
 #define VIDEO_IO_OFFSET                                0
 
-#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;"               \
index 119a834..0e922b9 100644 (file)
@@ -21,7 +21,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+#define CFG_EXTRA_ENV_SETTINGS                                         \
        "netdev=eth1\0"                                         \
        "consoledev=ttyS1\0"                                                    \
        "u-boot=u-boot.bin\0"                                                   \
index 25bcc2a..6535730 100644 (file)
@@ -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"
 
index a818a4b..cfc8330 100644 (file)
 
 #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" \
index 4b31bbf..323703a 100644 (file)
@@ -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" \
index b9d03d2..c4ae397 100644 (file)
@@ -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"
 
index bba2b60..6dbf582 100644 (file)
@@ -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"
 
index 84ea1ba..0ee914e 100644 (file)
@@ -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"
 
index 66aa6d5..ab10101 100644 (file)
@@ -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"  \
index e3621fd..c522d33 100644 (file)
@@ -22,7 +22,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" \
index 154c4f4..d10422b 100644 (file)
@@ -22,8 +22,8 @@
 
 #define VIDEO_IO_OFFSET                                0
 
-#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;"       \
index 3aed629..6aef15c 100644 (file)
@@ -41,7 +41,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"         \
index 4401515..70ad88c 100644 (file)
                "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" \
index 1bfb741..4842ecc 100644 (file)
@@ -28,7 +28,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "stdin=serial\0" \
        "stdout=serial\0" \
        "stderr=serial\0" \
index a6c1e9c..9993891 100644 (file)
@@ -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" \
index ab3cf10..b56ba91 100644 (file)
@@ -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" \
index daf7ecd..73aec34 100644 (file)
@@ -28,6 +28,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif
index 31cd853..4997083 100644 (file)
@@ -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" \
index bd88c42..c1e590f 100644 (file)
@@ -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"
index 98322a5..85b47a1 100644 (file)
@@ -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" \
index 8e7a86e..ea77abb 100644 (file)
@@ -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" \
index 76d1713..e69883b 100644 (file)
@@ -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"       \
index 001596c..9f11e18 100644 (file)
@@ -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"    \
index 89e071c..a5e2dc0 100644 (file)
@@ -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"                     \
index 1742b11..c1748fc 100644 (file)
@@ -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=" FDTFILE "\0" \
index c2b921e..83aaa09 100644 (file)
@@ -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} && " \
index 57f619f..8d8e717 100644 (file)
        COMMON_ENV_NAND_CMDS
 
 /* 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" \
index bec1660..f304929 100644 (file)
@@ -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 */
index c9c988b..e1cce58 100644 (file)
@@ -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; " \
index 13e3cb2..e7d8665 100644 (file)
@@ -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"                                       \
index 43ea34d..ec09f6c 100644 (file)
@@ -91,7 +91,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 \
index e22dd03..9971385 100644 (file)
@@ -63,7 +63,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
index 8672b9e..92c84cd 100644 (file)
@@ -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 */
index 671b75e..855aaa1 100644 (file)
@@ -55,7 +55,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "netdev=eth0\0"                                                 \
        "consoledev=ttyS1\0"                                            \
        "u-boot=u-boot.bin\0"                                           \
index 1aaa3e6..0523ff9 100644 (file)
@@ -35,7 +35,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" \
index f62b8f1..32960fb 100644 (file)
@@ -41,7 +41,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        NETWORKBOOT \
        "image=/boot/fitImage\0" \
        "dev=mmc\0" \
index 1c86dcb..b7de159 100644 (file)
@@ -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"
index d1fe375..45f0ec6 100644 (file)
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 #endif /* __GOSE_H */
index d196c4e..44b4595 100644 (file)
@@ -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"                                         \
index fc32487..7d81d1c 100644 (file)
 
 #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" \
index 4aef0b4..76e6054 100644 (file)
@@ -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"
 
index d4280de..36bf22b 100644 (file)
@@ -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" \
index fad1f98..40d5e65 100644 (file)
@@ -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" \
index 59ea896..f59da41 100644 (file)
@@ -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 " \
index fbfcded..2177faf 100644 (file)
@@ -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 " \
index 76fc4ac..e1b62f7 100644 (file)
@@ -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"                                        \
index 6d2104b..d372ffb 100644 (file)
@@ -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"
index 36b6b95..4208ba9 100644 (file)
@@ -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" \
index 4e23f1a..0df6191 100644 (file)
@@ -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" \
index 402f83c..b6006c0 100644 (file)
@@ -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"    \
index 392f970..e28185f 100644 (file)
@@ -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" \
index 2d9d3c3..c95038e 100644 (file)
@@ -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
index 8e9dbef..66cf5b4 100644 (file)
@@ -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" \
index c228cf7..00ce7fb 100644 (file)
@@ -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" \
index 938c540..a86bd76 100644 (file)
@@ -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"                                                 \
index 03325e6..ee524f0 100644 (file)
@@ -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" \
index 80321cf..44d74bb 100644 (file)
@@ -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"                                                 \
index 8a694c8..d28f3f1 100644 (file)
@@ -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" \
index 41ab930..e718daa 100644 (file)
@@ -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" \
index 28ce834..c490e38 100644 (file)
@@ -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
 
index 85fd5e2..bb3dfe3 100644 (file)
@@ -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" \
index a768ff3..e97b8e8 100644 (file)
@@ -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
index 035e5c7..8619fdd 100644 (file)
@@ -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
index 024b86c..b759b83 100644 (file)
@@ -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" \
index 4633843..2053379 100644 (file)
@@ -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
 
index a585cbf..80c2df9 100644 (file)
@@ -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
 
index 5443022..b8fdede 100644 (file)
@@ -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"         \
index 137bd3b..c6e3b10 100644 (file)
@@ -26,7 +26,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" \
index b261a81..c3abcee 100644 (file)
@@ -29,7 +29,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" \
index 58f7dc6..ed4da0e 100644 (file)
@@ -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" \
index e79aa57..4b32d5a 100644 (file)
@@ -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
 
index 4df98e3..f6f356d 100644 (file)
@@ -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" \
index 688c0bf..c404487 100644 (file)
@@ -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" \
index 3b4cd65..8fed3e3 100644 (file)
@@ -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" \
index f1f907f..7772e71 100644 (file)
@@ -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" \
index 2e2e5ed..5692e3d 100644 (file)
@@ -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" \
index d75b8bf..669da59 100644 (file)
@@ -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" \
index d313bdc..30dd5af 100644 (file)
@@ -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" \
index 895c50f..5cd6492 100644 (file)
@@ -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" \
index 8422867..7688464 100644 (file)
@@ -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"
index 0f6150f..7d08741 100644 (file)
@@ -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
index e66f994..a7210b5 100644 (file)
 #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                                             \
index ab204c6..54dfea6 100644 (file)
        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                                             \
index 736865a..61ff80d 100644 (file)
@@ -29,7 +29,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 /* SPL support */
index 7c5f673..e3ae910 100644 (file)
@@ -45,6 +45,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 */
index beb1926..e4d6a8a 100644 (file)
@@ -49,6 +49,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 */
index 17c63d8..d909bbb 100644 (file)
@@ -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" \
index a073a06..0d293f3 100644 (file)
@@ -61,7 +61,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" \
index c551585..da8a67b 100644 (file)
@@ -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"         \
index 136e228..99321b3 100644 (file)
@@ -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"         \
index 7a66df5..7ad29f9 100644 (file)
@@ -44,7 +44,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                              \
+#define CFG_EXTRA_ENV_SETTINGS                         \
        "stdin=serial\0"                                        \
        "stdout=serial\0"                                       \
        "stderr=serial\0"                                       \
index f3feaa5..777d5b9 100644 (file)
@@ -30,7 +30,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 /* SPL support */
index 794c1fc..687ac89 100644 (file)
@@ -48,7 +48,7 @@
  * Linux Information
  */
 #define LINUX_BOOT_PARAM_ADDR  (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootenvfile=uEnv.txt\0" \
        "fdtfile=da850-lego-ev3.dtb\0" \
        "memsize=64M\0" \
index 377e3e7..7417f85 100644 (file)
@@ -62,7 +62,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" \
index 721da81..938ab5a 100644 (file)
@@ -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" \
index f0a9e9a..d1e0ed5 100644 (file)
@@ -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"              \
index 9e4f949..a5f680d 100644 (file)
@@ -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"                \
index c19ed2f..4243a21 100644 (file)
@@ -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"              \
index 1b417c7..8722967 100644 (file)
@@ -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"              \
index 495bb39..35e8ff0 100644 (file)
@@ -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"          \
index d74936d..1e843f8 100644 (file)
@@ -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"              \
index 0e3ff3c..8b5fba5 100644 (file)
@@ -72,7 +72,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"
 
index 76e7533..78432e5 100644 (file)
 #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"
index b15c4a2..b722586 100644 (file)
@@ -60,7 +60,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"                                      \
index 9b22a2d..a387eea 100644 (file)
 #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"      \
                "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"      \
index 228fb12..769ece9 100644 (file)
@@ -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" \
index 5c13461..8c53636 100644 (file)
@@ -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"               \
index 685e7e6..ac2319c 100644 (file)
@@ -88,7 +88,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"      \
index ae9dc0c..38fb1d4 100644 (file)
@@ -84,7 +84,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"              \
index 86c5d48..720a95d 100644 (file)
@@ -117,7 +117,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"                \
index 3391540..084ee06 100644 (file)
 
 /* 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"                 \
 #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"                 \
                "$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"                 \
        "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"                 \
        "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"                 \
index 1ddf068..a174914 100644 (file)
 #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"               \
                " && 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"               \
index bd78bdb..f51eb31 100644 (file)
@@ -109,7 +109,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"                \
index 4a52fcd..7ad2432 100644 (file)
 #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"                \
 #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"                 \
        "$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"                \
        "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"                \
index b8ab501..794ea84 100644 (file)
 #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"              \
                "$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"              \
index c82eb8b..47d7ec5 100644 (file)
@@ -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"                                    \
index 9f89106..3a316e7 100644 (file)
@@ -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"       \
index 58c0ff3..8cc4e0d 100644 (file)
@@ -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"       \
index 157688e..54d7cea 100644 (file)
@@ -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"       \
index d42ad9a..0deb767 100644 (file)
@@ -84,7 +84,7 @@
  * Extra Environments
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "consdev=ttymxc0\0"                                             \
        "baudrate=115200\0"                                             \
        "bootscript=boot.scr\0"                                         \
index a7f5507..436f5f0 100644 (file)
@@ -33,7 +33,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" \
index a22f7a8..9244601 100644 (file)
@@ -83,8 +83,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" \
index 1266851..c0e977a 100644 (file)
                "fi;" \
        "fi;"
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                     \
+#define CFG_EXTRA_ENV_SETTINGS                                     \
        EXTRA_ANDROID_ENV_SETTINGS                                    \
        "partitions=" PARTS_DEFAULT "\0"                              \
        "mmcdev=2\0"                                                  \
index b8b0897..6740ab2 100644 (file)
@@ -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 \
        "unlock=yes\0"\
        "nor0=flash-0\0"\
        "mtdparts=mtdparts=flash-0:"\
index c73c5a1..5ced45b 100644 (file)
@@ -19,7 +19,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" \
index cfe926c..ef2111c 100644 (file)
@@ -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" \
index 93161bd..db12377 100644 (file)
@@ -42,7 +42,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS         \
        BOOTENV
 
index 3da7619..1f97382 100644 (file)
@@ -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
 
index 3a35527..c0fc868 100644 (file)
@@ -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 \
index 0f7981a..73776e3 100644 (file)
@@ -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
 
index 8a8bc85..d6bd1a1 100644 (file)
@@ -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 \
index 3ad3aef..39e37ff 100644 (file)
@@ -22,7 +22,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"    \
index 9bfc48c..76e148f 100644 (file)
@@ -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"          \
index beac3ae..239a097 100644 (file)
@@ -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"        \
index aa3d7a1..e769ba2 100644 (file)
@@ -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 " \
index f597cdb..5ceba8b 100644 (file)
@@ -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 " \
index c740d85..f9f65f6 100644 (file)
@@ -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"     \
index ddd37b3..8ab1ee7 100644 (file)
@@ -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" \
index cd806cb..baffe65 100644 (file)
@@ -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" \
index d0107fc..0ac93d6 100644 (file)
@@ -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" \
index 9464d6e..94d2191 100644 (file)
@@ -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" \
index f7f209c..d4af96b 100644 (file)
@@ -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" \
index 96a48a9..9c61350 100644 (file)
@@ -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" \
index 358d9f4..4fbd067 100644 (file)
@@ -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" \
index 8731f6a..cf4871c 100644 (file)
@@ -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" \
index 0dd4056..9d8737c 100644 (file)
@@ -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" \
index 6f5dffe..8372f97 100644 (file)
@@ -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" \
index cb1019b..90c7884 100644 (file)
@@ -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" \
index 0e98609..4a27fd2 100644 (file)
@@ -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" \
index e56b610..e56083f 100644 (file)
@@ -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 \
index 85922fa..5ee5129 100644 (file)
@@ -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" \
index 99e0189..5f4cd93 100644 (file)
@@ -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" \
index a32fcd5..4326182 100644 (file)
@@ -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" \
index 85691ca..358c3bb 100644 (file)
@@ -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"
 
index 1d10197..496a316 100644 (file)
@@ -64,7 +64,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" \
index caaa9ed..97d0868 100644 (file)
@@ -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" \
index b0d473e..3ffb44a 100644 (file)
@@ -58,7 +58,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"                                             \
index 2eebd0c..a12e34b 100644 (file)
@@ -38,7 +38,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" \
index e2ad770..fa029a1 100644 (file)
@@ -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" \
index ea1edab..0e1083a 100644 (file)
@@ -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" \
index 03d1a8e..c4db385 100644 (file)
@@ -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"
 
index 58275cc..0be26ef 100644 (file)
@@ -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"
 
index e2331e4..3ac13a6 100644 (file)
@@ -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} " \
index e4a8149..2bac017 100644 (file)
@@ -60,8 +60,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 \
index f4e23bb..efeb7bf 100644 (file)
@@ -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" \
index 8bb8521..adb25a6 100644 (file)
@@ -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 \
index a6b5e55..93d3635 100644 (file)
@@ -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 \
index 3895537..957f1c3 100644 (file)
@@ -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" \
index f19211f..5e71ebc 100644 (file)
 
 #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" \
index 5b097e9..5adfc67 100644 (file)
@@ -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" \
index 2cec20c..1e6b16b 100644 (file)
@@ -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"                                     \
index a608df4..fd4cc70 100644 (file)
@@ -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" \
index 74627b2..a353c16 100644 (file)
 
 #include "p1_p2_bootsrc.h"
 
-#define        CONFIG_EXTRA_ENV_SETTINGS       \
+#define        CFG_EXTRA_ENV_SETTINGS  \
 "netdev=eth0\0"        \
 "uboot=" CONFIG_UBOOTPATH "\0" \
 "loadaddr=1000000\0"   \
index 2a1660b..146f87e 100644 (file)
@@ -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" \
index 4421e74..0890c11 100644 (file)
@@ -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" \
index 5c2ff5d..3499401 100644 (file)
@@ -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" \
index 3674e4c..2991076 100644 (file)
@@ -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 \
index 7180783..80b14b0 100644 (file)
@@ -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" \
index f922491..4e6dc79 100644 (file)
@@ -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" \
index 7f73117..9160c78 100644 (file)
@@ -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" \
index 7a38382..d79d364 100644 (file)
@@ -13,7 +13,7 @@
 #define CFG_SYS_UBOOT_BASE \
                (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "image=Image\0" \
        "console=ttymxc0,115200\0" \
        "fdt_addr=0x48000000\0" \
index 3cc2a69..60c7473 100644 (file)
@@ -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
index 719b701..66258a3 100644 (file)
@@ -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 \
index 36f648f..45fc612 100644 (file)
@@ -45,7 +45,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" \
index 5819215..7fc6211 100644 (file)
@@ -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" \
index f9301a5..ac25991 100644 (file)
@@ -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"                                      \
index a233fb8..f4a34f2 100644 (file)
 /* 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 "             \
index fa08744..cd9d21e 100644 (file)
 /* 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 "             \
index fc9f113..b135421 100644 (file)
@@ -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"
index 239d33d..3371579 100644 (file)
@@ -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" \
index 075729e..c3f1d33 100644 (file)
@@ -14,7 +14,7 @@
 #define CFG_SYS_SDRAM_BASE           0x0
 
 /* 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"    \
index 1c11685..8e74dc4 100644 (file)
@@ -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" \
index c581055..6e8adf9 100644 (file)
@@ -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"                        \
index e0f77f3..202bd91 100644 (file)
@@ -31,7 +31,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 /* SPL support */
index 2b25c31..df07df6 100644 (file)
@@ -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
index 9937615..0036869 100644 (file)
@@ -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 \
index 48f4990..10eaeb4 100644 (file)
@@ -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" \
index c41bb34..8ea59aa 100644 (file)
@@ -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"
index a67af73..45bd94e 100644 (file)
@@ -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" \
index 35172da..20135f5 100644 (file)
@@ -34,7 +34,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" \
index 59d56d6..777df4c 100644 (file)
@@ -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" \
index 86012ad..8e0837a 100644 (file)
@@ -32,7 +32,7 @@
 
 /* ENV setting */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 #endif /* __RCAR_GEN3_COMMON_H */
index a4cae69..ea6073f 100644 (file)
@@ -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 \
index 99c86ed..c4758e1 100644 (file)
@@ -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 \
index 3025466..5b0ec37 100644 (file)
@@ -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 \
index 334fb3a..58f491c 100644 (file)
@@ -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" \
index 58ad62a..b95268d 100644 (file)
@@ -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 \
index 6b55c57..d3b8a51 100644 (file)
@@ -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" \
index 4b510b1..bc03e11 100644 (file)
@@ -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 \
index 132b7d0..85d2186 100644 (file)
@@ -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 \
index 92cdc1a..1763625 100644 (file)
@@ -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
index a721f27..2278b62 100644 (file)
@@ -50,7 +50,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 \
index d43dc25..750f16d 100644 (file)
@@ -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             \
index e354927..c3f8e7b 100644 (file)
 
 #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 \
index b07d0c5..99799f8 100644 (file)
@@ -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" \
index 84a5ae6..6e17b23 100644 (file)
@@ -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 \
index b4b2dbd..bfe559f 100644 (file)
        #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"            \
index 555bedb..d1ff00a 100644 (file)
@@ -54,7 +54,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" \
index 80d3fc9..bf2d04a 100644 (file)
@@ -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" \
index f7cdd5a..9a4fe53 100644 (file)
@@ -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"   \
index d792396..4e0b3c6 100644 (file)
@@ -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" \
index 4a453a9..de3a0dc 100644 (file)
@@ -37,7 +37,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" \
index ac42108..24904aa 100644 (file)
@@ -34,7 +34,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" \
index 6d605ed..9114a05 100644 (file)
@@ -31,7 +31,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 /* SPL support */
index 974531e..760a0a5 100644 (file)
@@ -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" \
index ff0ed18..748a423 100644 (file)
        "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"                    \
index b988b96..762f614 100644 (file)
@@ -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"                              \
                                                                        \
index ccb7ec3..c148757 100644 (file)
@@ -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" \
index 14f9cf5..1103174 100644 (file)
@@ -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" \
index b7aa49c..df8ed45 100644 (file)
@@ -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" \
index afca7e1..eaee8dd 100644 (file)
@@ -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" \
index aa13878..2ce7011 100644 (file)
@@ -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" \
index d0f5331..0c96c9c 100644 (file)
 
 #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" \
index 8f1c2de..565a661 100644 (file)
@@ -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"                                         \
index e76438e..ac70d91 100644 (file)
@@ -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"                                         \
index c295e91..fe5286e 100644 (file)
@@ -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" \
index df39272..66ecb16 100644 (file)
@@ -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" \
index d88b07b..4bb15cf 100644 (file)
@@ -27,7 +27,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"                                             \
index 4c75209..2b35be8 100644 (file)
 #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"                    \
index de0f48b..e132805 100644 (file)
@@ -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" \
index a5987c5..e58ddd7 100644 (file)
@@ -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 \
index 9294d57..b3fce50 100644 (file)
@@ -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"               \
index afd7d50..de5019a 100644 (file)
@@ -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"
index c8aad47..a4f3e43 100644 (file)
@@ -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"               \
index 573a6b1..62a7e9a 100644 (file)
@@ -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"               \
index 14e883a..34856d3 100644 (file)
@@ -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"               \
index 67e6a3a..d36cd6f 100644 (file)
@@ -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"               \
index 4786eb0..8f242bf 100644 (file)
@@ -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"               \
index e667fe6..d27b6a3 100644 (file)
@@ -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"               \
index c259a61..7c59c69 100644 (file)
@@ -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 \
index 9715dfa..7db72a1 100644 (file)
        "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 \
index 910d7ef..9192169 100644 (file)
@@ -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"
index 38b5aa7..d0cd413 100644 (file)
@@ -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 \
index ce941d8..fe2ba9a 100644 (file)
@@ -13,7 +13,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"                                   \
index 977c0ad..ee1abe6 100644 (file)
@@ -35,7 +35,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "bootm_size=0x10000000\0"
 
 /* SPL support */
index 5d82e7e..eae107f 100644 (file)
 #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 \
index a2b6a1f..a62d1d3 100644 (file)
@@ -91,7 +91,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"           \
index 7af7b08..e8a207f 100644 (file)
@@ -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"      \
index 30f8425..855218a 100644 (file)
@@ -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" \
index 689914c..9b396e6 100644 (file)
@@ -30,7 +30,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 \
        BOOTENV \
        "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
        "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
index 2c668e0..0fdb5a8 100644 (file)
@@ -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" \
index 5772471..e86c163 100644 (file)
@@ -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"                 \
index b57b1be..7469951 100644 (file)
@@ -19,9 +19,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"    \
index 76b4963..9722b0d 100644 (file)
@@ -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"
 
index c8b2726..1753fa4 100644 (file)
@@ -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" \
index 7becf1e..8ba4054 100644 (file)
@@ -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"
index 7b04292..2d9d2fd 100644 (file)
@@ -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 */
index ea45bba..479ab46 100644 (file)
                "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                                                         \
index 64ec59d..49f4263 100644 (file)
@@ -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 \
index 37ab2e4..e9723ed 100644 (file)
 
 #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 \
index 83abaed..3795e61 100644 (file)
@@ -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"     \
index 0f28690..e007be8 100644 (file)
@@ -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"    \
index 7a1ad95..14d7730 100644 (file)
 /* 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"                                                      \
index 3eac665..2067327 100644 (file)
@@ -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 " \
index 18fca09..9925531 100644 (file)
@@ -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 " \
index fdb420e..3443c80 100644 (file)
@@ -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"                            \
index 52de4cd..47b220f 100644 (file)
@@ -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" \
index fac8c1e..f0092ef 100644 (file)
@@ -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" \
index d4c9223..5d7d734 100644 (file)
@@ -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" \
index 7fee640..ecf0d2a 100644 (file)
@@ -86,7 +86,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" \
index 657dbad..b90e047 100644 (file)
@@ -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
index 7f79c63..1170614 100644 (file)
@@ -40,7 +40,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"                         \
index b031598..2e15027 100644 (file)
@@ -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"                                        \
index 18ac6b2..7f3fa79 100644 (file)
@@ -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" \
index 22dc364..2cb076c 100644 (file)
@@ -43,7 +43,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" \
index 30c1f50..87b8c5d 100644 (file)
 #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"      \
index e8b6acf..705a941 100644 (file)
         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" \
index 14e6b2b..0e0b3a7 100644 (file)
@@ -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" \
index 1c1789a..0698ae1 100644 (file)
@@ -45,7 +45,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" \
index 6923009..1e76543 100644 (file)
@@ -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" \
index 188180d..0826e0b 100644 (file)
@@ -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" \
index 4cf41f5..fddf00d 100644 (file)
@@ -47,7 +47,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"
 
index d71108d..65a1e63 100644 (file)
@@ -42,7 +42,7 @@
 #define SPLASH_SETTINGS
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS                      \
+#define CFG_EXTRA_ENV_SETTINGS                 \
        DISTRO_BOOTENV                                  \
        CONFIG_STD_DEVICES_SETTINGS                     \
        SPLASH_SETTINGS                                 \
index a3dc0c7..04ca5aa 100644 (file)
@@ -27,7 +27,7 @@
 
 /* Extra Environment */
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+#define CFG_EXTRA_ENV_SETTINGS                                 \
        "bootmode=update\0"                                             \
        "bootpri=mmc_mmc\0"                                             \
        "bootsec=sf_swu\0"                                              \
index 612436a..bc268d2 100644 (file)
@@ -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"
index 6ee6786..e70acd9 100644 (file)
 #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
index e1f95de..23655a4 100644 (file)
 #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 */
index 37bdb21..424ead0 100644 (file)
 #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
index 1939832..50bacc3 100644 (file)
 #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 */
index f71cd66..011f003 100644 (file)
 #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;" \
index 1c0ab25..9af0545 100644 (file)
 #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 */
index 3a7b7e0..918aa3d 100644 (file)
@@ -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 */
index 9f1f2d9..0d72008 100644 (file)
@@ -34,7 +34,7 @@
 #define CONFIG_FEC_ENET_DEV            0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
        "console=ttymxc6\0" \
index d95178e..e372e90 100644 (file)
 #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"        \
index ac6e8c4..a9bb5bb 100644 (file)
@@ -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
index 3b7685e..c0df39d 100644 (file)
@@ -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 */