]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
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 e19aa1f722c195ca28d728edf4e40f220b6d7e1c..a278825bbcc9786d3b2d8c08561f7026ec0253ef 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 10e63f3be1d3bd4505727e5561aee45932035c16..f44bb2aa25d4865157e9eb12edc67523003ce9af 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 148b4987f27c5ec99a7ca92b5d177ab200c73fb8..ec2ef940e4c80ffd6b0922e26ad3db5ee23f56d7 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 634387ac095cf6a860a9a904c2ed634d5f5cd90d..725a1ae586396bd52fb88af05559b8ed4929b1d2 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 c71570d64b472aea881cd547653161dd1284fd07..0b3b32be1bb68c894963eabb5446bc47d7dd54ed 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 bc72aa951ef75dd2992ced7fa6109ceb0ee8c25f..8016acad098a2f005bf17210bbfb23c30b28207b 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 83f210d2d058efe79cdb783d0940be83838cbe8f..2c44e5da6aa0d9b8949156f6d4446a32dae1186f 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 7ca992aa1d4032d58b1652e19776116cd9e3e61d..f73f0b8bc0484a7f4aebf5f26c930d11f3917b80 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 e14650fe0d40467832ade3e249cde62ad94ed5ba..f7aba6e417f8a88ae0c9965e36a6bf2d6c8922f9 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 220524bfaed18695c8fecb89d47dcfc1d951769e..049516edf4ae4b058327be273145ed7ecd71936b 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 bc156df20d514e5fc41eec3d0b980ea58bb07a8b..a6349fc08617fcc40063b2ead2639a467109f10a 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 6aae584afda9b07d9860adcb82567e56b86e8d42..33c2fc0870601e5e1c5d0d0bc953c6751f107f08 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 41974cff410da71a1045b8be5f637c524982f0c3..607c5dee2fb0b44de478c1336c34debf0a03e8fd 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 7cfe7a2da3e3e307945a8841e5cf1c004efadbc8..31699a40b6f7a206c8a0227e9336fc5d44cb075d 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 ac2bd0b2241e589f6efe6bb81b3cc8fa4501bbc6..b6d82c730c64031d0513ca80723a9d742de410ce 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 a86a117fd8f9494c05894805b27d974e42b97ef1..d74a636fd7f87815d3dc14615e1f3424da1b432b 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 b2ad03cc3cb4eed392263fabcc321649eaf968cf..fa6f2d23e74eba59d8cec52c6a5fc6b1c8916cf6 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 f8368823aac6b5964bb30e16414e64224b1a6976..c6929c1b987da749187415b976bc85884ad7d697 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 e0ac9338d322ceb84ef2ec34c4352116e1ddffcb..fad161597e6150a3ceef2550c0e8f50a9397311e 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 1e3ba6de6e70020750a58eba95a5cc65681481ac..6f3e298a2492e83a608215da17b65c8bf22053c9 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 afb602c5bce9786d01896be71cc589753b524211..b57e8638ab71cac7b7fca6fb9d7d9841e0de2b0a 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 1a157a7da05d22f0baaeaa396e0e2df5be9101e1..6e755fc0a8f5a3af78de9d0f90c01dd85f70cd94 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 4794c5a84d1e42b75aaf0ee27c3af038e3ea1d12..063b864f9ff0e069bfca0d3c91dfb89888cb066b 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 cfde8ecf9c63ab0bff65fe7b4be3415bdf5a368e..9d04d30a53879f1d5e245049ac564650c72156a5 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 4b6bdaa3440dc7471fc2b0ac53239250172824cf..7f332cf2e3beb31c219df9a59d17a85eee400774 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 fab40f792af792e116fba5f37b8739e55262cb83..d6dd9c07b73f26c917a1fc6bbb1815a3d97c13f1 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 41565f284c6f91d04e3f5acd3e16ab54736ef264..22cbf92efb8011f2cc2adc85d2ab347f11493540 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 f277400169274d24aa2b4bbb7b3aaabc1ef1a48f..29f4d06b7f834a8770567d5accc19be65c3857bb 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 755f7fae3e4f6960394b241e01a69a199103a53c..1f473b5a15005636a397d63d0811ed26f8e0da7a 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 a5b83b0c25dd865ebe4c80f106a627312ff66744..a8fa61c7e505c3b907b049656840e60509e8f1f2 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 abd868c1453835bfc68dacb4d2c92b2571037c49..e2beaf271859e34aa3bd37d17b14f94df2473fe8 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 70645edcb140814a9f64273ec6be5502375842fd..ee6f62275a8c9511b65c6403cec01172496344c3 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 342a068c855ff443fcf96ef058f9f36bca82b15c..f3d3d18c055178db7b7886d433504f3ac8eaed84 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 c57a0ddc21dd7afd54db73dd247b55f3ec89015e..b75c6483883177a4b00bb3d3930f4e30a402b8c3 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 7659c1cc06198d411bd468537a6724bb7cf2fa0b..3a6ffd9de0bb85fac6b3bef2467903eed4d16b0b 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 5406c39350f64580b054d10713d8deb0d6b4aa83..1bd900df7a99e807a8c6c62fc5416e178de4bf38 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 57f3f37908df9b27669628052d55175d0825d108..809d89119c42aa114ca02675f985d52aca139b06 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 25c71f00a20fdf111bcb6e7f271103a209ebf131..26a7f2521ecc10ab189d7222535d11451346e327 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 0307426e4abab93e349a1709ac1df08e2d46ed9d..33dd6cfdfa45add2cac6af6bb2f87df1ee2971d7 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 ca29346fe6426ccd8ef01c70aa3e7f6ccd4cc4b4..648d30a5b24b29fb7c7e190cfdea8dc60fc9b3d5 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 aa3dcf4a8813a10d78b2110ee388f2f1c6bd2bf8..73d8d245a96437cfb5cace1eb99315f28ac23ba0 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 07587c7609be11e59726378e64d2a121e3ba035c..d46159076f2c05bc28acf36596eb39563dca9291 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 b06660add4fad8ffa538a43bebf849ee341353aa..fe7d11bcdb38d13fd207edfcbc5c8f1579a6722a 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 60758b0ca02a7d94e573ca4b7e386fcf29f59b20..8e27fb52a1c3e9fe0c0986ef169981880d4751dd 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 ff213a41b8f4b3da51c39d41e1cd8d287080d33d..a6e9d2bb65f79618cf8fa5cda428d36b4735870d 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 6aef3bd86f74eeafd212fdc11025a7197ba986e7..65224324fbc216041317ac1d92cdc6e17c2c4084 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 afdb74785f8a8ac8e5c00c7ded2719d47ba4a504..4101440ff5d5948e92220344bf12e38fc4c8657e 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 0f9e2cfb582dcf160d9e3ee54420d4f7f65ab247..c59d4bb38ca84df2af14f0c6362f232356dc14c4 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 d70f0382300f9f3ce38a0051fed3e77344b2959e..b566ecf296ffbaea42f56242efb6b95d9bd04730 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 04dc50b1cb2204411ec07ce5bcecbccb4547278d..a82dfc90294808ee1e95f5bd66ca5f16bea155e1 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 6f6552e6dc34579efc5d2f6cbfbd276aa7b3e835..e7946389eff32791bf369bf7a8e01bbd2fa07ddb 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 fc176dc201402691f7ab91a2d8f1065109ae5516..47de4bc201360e264cb1e44a9f8c53fe6afc26ab 100644 (file)
        QSPI_FLASH \
        FLASH_IMAGES
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        ARCH_ENV_SETTINGS
 
 #endif /* __BCM_NS3_H */
index 57360b60ca9c241b2f75a8a1170f9a5c665904f5..d1de3561af63944fc28a33e7ccbda79a3f073caf 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 2713b158438e23efa90c5b940f5631d2be2a63e2..65c01835cc6e02df199e764a3e34e375d889904a 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 556bfa08ebba7080e9c2868c05c5a688a1924d03..3662668c6a6b3ccddb394017969d614a0c20fd8c 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 0842a4a8f5430c292b737fbc0f99315bd395770b..5df8d03c70655af0d88a93307981db364486cd9a 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 2c5236aa58bbd14727a7a3620e6e3a7c719bcba7..236d720a55a8f9f97936d4c413a5ca01719ba114 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 984602c2cf7cb0292d7d67f9847736a8f1fb1e13..32d9f503d9f025c92336b8192bfd0fe3336fd0d7 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 f9908352b0dc9c8feb327c96fd1fb7335b3f77fe..ffb4cd3027a16bd90392ff6d324cf801aa9b787a 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 410b3e641c5c6fab78f9c6460583495336f5ddb4..9ca6d6f863d1f42eb9b62726838aa1c088aa5d57 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 474ad69d996c7c28e8bef548cdafe92ceab1c844..a8273a7fcd8d7f7e785a7a01474c41f9056d277e 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 6f3396bad4c8a01180109ad31f43a03ce6aee2a4..263981860e86865f1a2d611acd2977abc8b32e9a 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 1e5154af0a15949887f8977d60d14fd0abdc80b8..850eb892db79496abb032cb31caf959b5d0829bc 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 5c9004cbd93a450574f4aff9545a106b32a1f490..2d56d37f06f812146d6939e52a2d1915c3366caf 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 9c9e9506dc64da8166a8dfdffbb50fe135fe27af..062d3d87026967baf96b46060ef4bd2eaed06d8e 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 9df8baa8a969ccf6b4dd5d3f575ffe5339184c45..c66cf721870c5e9321baefd080ff779396ec05f9 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 8a18d6f97ab58faf70c6f0fbfdc1f72fcd4f1935..aa17c9cbe2ce665104c132c4edeed9b1b38db643 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 6f3524deb5614b077efd428d5f43af22b51f2f06..5b802aa92a9cfc74c83336f8813c5270b9311e41 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 215c633a4c955bb8e40e5b0dd228d5ab3e4dbb71..13bc4e7e682ac914cadccf01472f42752685a1bb 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 4e51df123a64b2293c56765c12f5f98571f8d427..bf2a9bbaaff1810e143d208ce927d4c0050f6972 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 89546b857fee07128b5a6230b92c47ca48703d8e..91f87ea283fe70d8a29efd7d81fb9c3b14319611 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 e8918df69e0532e2eff829f7c8fc77ad2a7b88fa..60f31389fd41fc6fdee0beed61a0bd5efd25e267 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 e9b85b4e1c7276a399ed109394fb2be118d3ef06..6f431725269cae1f14eee05c26363eaf1874ebda 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 119a834fe742995cd157d64688eaf3224ead2364..0e922b96644071c27a126e3c10c6563501eef07c 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 25bcc2a6841cd4c75fdb11597c9c2922102030c2..6535730731a6ed435889dacea591497a11a10111 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 a818a4b39f83b9f7e55cee93fffdb8844752aff0..cfc8330e35ae613842b6cc9aa45a7e1868d72d36 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 4b31bbf4e11a9685388d3a977696c9328d4c6ed1..323703ac5c9004e67db0eaffd578262376f468eb 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 b9d03d253d99d9d793d6b1b921d4cb742dc8538f..c4ae397e3e68c7a46236c44ad78268f29b864d0b 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 bba2b607aa8621e11ddef16f5e792502bff61b04..6dbf582d733bb907b96acdd63381c1786289a3df 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 84ea1baa99799b8167f9635f7d14a9a10b20f302..0ee914e91d0854f4e1192984e24876d7156a296b 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 66aa6d5c3c450925d84618633d2f3d288f02ceb2..ab10101f20a9cf766968776125acddadbd65a571 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 e3621fd6f9c74aa36c8b630f9f66cbd3ec7b35b1..c522d334dcc25fd773554070dcfa46ef9e1ed2f0 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 154c4f4f13f375dcce3e099c0152ca50a149ba81..d10422b6c1c7e470382befd739ebf73224ff0c33 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 3aed6299ed56fbd9c7ae8e0e5d69a41805183320..6aef15c658c0cc26b1b4f138a87da4365ad06fd5 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 4401515a65ebe09967481aa7a06995ff1cae1639..70ad88c90750561a0113b8ea3a2ecac12162a185 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 1bfb741346a7132f6657c63c110f1f66ce8ae328..4842eccf40de9c05b3571683b70f68d9d03e09ed 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 a6c1e9c6d02949fefc3d6786dcccba0868e75076..999389197c6a9f14eec8ea14bbe6f0519424ca74 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 ab3cf10d7793e191b29181b0a5d5d407e0fe9159..b56ba9132af24b40780de241b1777d3c21666306 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 daf7ecd7975b54e95fca04eaec69b39446192fa2..73aec348458a51c5d44d4ac268d175d8047ce0b5 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 31cd8536de4b343b84ca4af6751c50f640018aaf..499708371113221d56349d1ec49bf783a8629d87 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 bd88c42a3ba57289e3c2a1b56bd2f9a9bcaf052e..c1e590fae2a52a1c6cf813fb29890bcea7b6730d 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 98322a54f631e4845e305616133f764e106ffaff..85b47a15d710ba582609207e668dba245299fb2e 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 8e7a86e06262e7cfdd7852138c96561811d2c75d..ea77abb4746ac5403e2dbbdc8f203c06fa2a6b8f 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 76d1713fdc6883cf60e97da1d8c8ed3fb062ccff..e69883ba73bcac0526f6f0e91fd465dfc28896b6 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 001596c00a45eddfc1a7bb1405b8d6873adb1f77..9f11e18d34ad54e2837c0b37cd8d3b98ab18cd64 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 89e071c0df663934de6220467af5ae26b96dd0d3..a5e2dc063a74267d5678c57ab292a9be1987a399 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 1742b1192fb4faeb4ba260ac18df0a83af7b8b5b..c1748fc26025b8b0382a120e6d01fad09a38ab80 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 c2b921e7cb8b26fa1ae3df83eed31e7eeee88809..83aaa09cdbb072e74136dc7fb2a7ee5d97b78a04 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 57f619f55ff9d2d5f3e98b5711612866bdd6f324..8d8e717b38d86443575433ecbb1e4b15533d0f9a 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 bec1660cf485201345bf4d08260c39fdf15248ac..f304929263e9d4045775b75226ffebfa188a22d5 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 c9c988b93740b390ae12a41f7c1a4b20717b09c5..e1cce58fa9331f7cd042ed84f8e01cfbe0861cf2 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 13e3cb2ffeb1c37415a55be58bbb382f85847c63..e7d866551a5f2d927c41c117536be120e2901f3e 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 43ea34db7b6aebe9bdd2b015cbc4dd16c3898d43..ec09f6cc5de6364f83aceb1812ceab5170fe5bbb 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 e22dd036ccb8239957377e344eb4e6466c115e29..9971385848a0507902904532efb08d347a43fcc8 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 8672b9e9527006ad6ecd7c184e2d7bbc570c9f1b..92c84cd8ce05a0a948444e50397d785dd57c378b 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 671b75e69861ccabdb1eb6d1b86c20f72bf4a699..855aaa1aa57eb28d6e65f21d7257c798822339d4 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 1aaa3e67d6088e3cad14c8908d31aa8543a427e1..0523ff9a64b8b12149ac957cf4adb1ef0974769d 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 f62b8f175e1f561355846cd64f4e5982d5b4fc02..32960fb93256f39a06cf0781a580036b4a05e013 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 1c86dcb1f6dd2f8412862d6000761bbc780fbcc1..b7de159c865acd3491e9971019214931993fc82a 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 d1fe375a2c1f950bb3410c0b8a507c8fcb319ab4..45f0ec6f6a0ea10fb7eda77462cdccb1539b584a 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 d196c4eda53583d5d0f86e987cf6830b410722cc..44b4595440ed7b59b3a60938aae6027b016d4794 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 fc32487e1c7b4a6fd5590d4ac4a18785dbbf2b87..7d81d1cf1e4cb7a1aef07d49c1e038bd5fcfaad4 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 4aef0b4abd12232029aba5dcf6d4d94a5533b806..76e6054b0cc1efdc4abc25d1364c4eecd184565b 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 d4280decc9f07e0db590170c7dc17053ec126350..36bf22b1870edec595a2d79d2f5db1c9d7f986ea 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 fad1f980481e79b694904d75fdb21a0fc7f83536..40d5e653c3f1142971af197a02da13d24cb6a5b5 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 59ea8960071a235fdb44771c59d909bd8342c220..f59da41773167e4f88e30fb213797d48c0d1e81e 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 fbfcded4712333ff106d0f47f8eae0f848a305b8..2177fafcdc0656a452213956956d3851432519e9 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 76fc4ac8b66cdb1373388d8f241d9e36b3281f08..e1b62f78b21e7682b0d5091416523cc69c2d06c3 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 6d2104b3a1cdbf85ffa0d61a3e2877fd15017213..d372ffb802c1607cc497b236d82ffe92a56cd51d 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 36b6b95b84de01aea0b203b5508de16b23afccac..4208ba95915e562b3a719466853161ca86ff47a0 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 4e23f1a2dc5dac1c44ce541644aba19048cc1436..0df61916b7d283fcb0c05c5765b2642c3aadc064 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 402f83c18eaec04220bbefe733fe84ad89bbfa20..b6006c021d5c66f63aa67d227d3561298ad13e26 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 392f97050a65760b69b86e1dbab8de525116d76f..e28185f24dd3e22a6ece84bbb36ae0c864426b1b 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 2d9d3c34b0dba12c189ebbc3d192cbf9cca10c3b..c95038eaa537caf3670a5e9db3b0c714fb26926c 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 8e9dbefc4969dd33b80abc82f55d70e4ca8e1fd7..66cf5b463fc212d64c5df1e3d5ec4f7134275208 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 c228cf7f37ba519e9f3ad4dd2b38e929fc36e3c4..00ce7fb62a93f5b010706291959e66c40bf0f876 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 938c5406b821aeee9c98c92a85e28f9059813677..a86bd76a3c725541b9c26b60dc264dfd414d63ea 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 03325e6c3a7a41040eae9703c1c2f85d66fea96c..ee524f0e63f22d0b987dd74ea42b1a1ca90ff3a8 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 80321cf2d8d3cd8f5075877bfefc83cdd1b4f8c4..44d74bb1a78813b57458d74fb2146f8e78df13a5 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 8a694c88a53a9a7a6339caab5ff4b07550cf1035..d28f3f1972b930fb32f85ed2a75ef7e826cc81ce 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 41ab9307793f0266750b2267e9059f51e8857962..e718daa07c3e4a6bf1765786685664b3ec58e445 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 28ce834769c38546fab5b70aeba581ea09c911d9..c490e3829f9adbce4a37664213dd23397d62b0db 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 85fd5e2371f976b1e7aabba0f74ddf4772d0e02c..bb3dfe3fa0d29531b55b6cba6eea1a63da26605a 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 a768ff355109ebd7f76dd1f4abd030c227904631..e97b8e871d22cd21c54201086845851ca15d85b5 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 035e5c7bd90f4c5ddcc55b50dfe116e532c15c79..8619fdde7fdbcc51dcc3d9a8f32048339f5622da 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 024b86c7f1d013c6ee30b55ac9b40cded69f9b22..b759b834b808ff4c6dc8b619175ece10c6101289 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 4633843d1bbb9b4dcfcfd5ccc80bbf45a776bd72..205337948cfc4d45724fb5d6ddd53a6a66a2f80b 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 a585cbf87e44ac6264909e82218edc49e16f1f2b..80c2df9f30ff064a198f4c01e17a4f4c2d8541b0 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 5443022b04c77a2ea4e0ecdfb793feb7d2d7945f..b8fdedefa21f6e58f4c7e7995a2bfd577062957d 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 137bd3b095272e5bf93cfd1c457bf9bd497df2fa..c6e3b105a8ad84c2d757a788f65f9b5cb0716d64 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 b261a81e44a47dff517d1cc85528572858d20c0d..c3abcee40e8910f66a34f8b6a5b57ade47619e0a 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 58f7dc6518c1dcfdb9a593876d5b9768fecb6d38..ed4da0e69b5bedb50bd097c54e7922c8f630e611 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 e79aa5707537946f2a327421530f96809ec65496..4b32d5a77ef61f1d4d51bb944a16907244ec1d96 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 4df98e3f3735fba98c18381efa47b7d74a8a2934..f6f356d27ba239f18d7d442b8b51e5ce48a88840 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 688c0bf700805328bbc791ea9f2da5fbb783c001..c40448715f8a299ffb758979b4ba15fa4eab0394 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 3b4cd656223540245c3fcf719f92abebf6f8d6e3..8fed3e31964c898834245ef908c35859e2e244ce 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 f1f907f3e5a45088aa85ffe6f578f5e58dc8c1c8..7772e71013effba7eae8902d43acdf27d71ba17f 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 2e2e5ed43cde4513541aea19929a30c63baa961a..5692e3d00007874fea44d91466b5d6a57e8b5236 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 d75b8bf0c18f7c5a97f8593e80dac1c4d29bee09..669da591fa2b398592f2975289ba7c7a92962a91 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 d313bdc2a4485ed9fa6e7c48cb20fe4e955d4e25..30dd5af03b00938c1295787e1226a1dbfc25f2d2 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 895c50f602531031afa00f13a718fb587066216d..5cd6492dd503f95518850dcbaee44310af24da69 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 84228676c7fd1ff613f9a4ec64d65bc149c60157..7688464841ebb572d0127e8f2ff6cb6a55a9881c 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 0f6150fc9c7edd1fa448559e28ad6bc6983e128a..7d087413362ce9978d1e4f38dfc16eab299ac6aa 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 e66f994a375ff368796d0c971af68f410de2623c..a7210b5cf3ae5666d3ceb8685e507389caa6e24f 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 ab204c62b7d65d6822ef385effd96cf100953ee7..54dfea6952e9c1705efa7f6517c8873edf95e534 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 736865ad80af5a96234e7ed9c1f742bcd84b433b..61ff80d2c983f44a28b2f3ce62dc7dd1e8c2ba76 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 7c5f673c0f4d021b328e0250daf979a5c8d07af7..e3ae91089ffa96f198faef557e28a6b514734ef0 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 beb1926c12aaadabab41f173c6f634d226a235f9..e4d6a8a15408589cc64b54da140eb257c89eae79 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 17c63d8341073b778bd096b73c205faf2b70d929..d909bbbbcfda61f651d07bf3a2456b05bffdf19a 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 a073a06c8275db8163ce99572a43a9715a170fbd..0d293f316b7f66ae359145599f8bc1ccf1a9750b 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 c551585a206252c31740780557fe19f295bb2920..da8a67b4ab63740129f572c8952e1f6e6c91fff2 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 136e228682a6f2d716523b246e60bcbed8176893..99321b320f5f8dc328b0013f7b1c42867a43c361 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 7a66df548a3b614c1ac89f2b45701b459b7282d3..7ad29f9299799471e4892f3301070fa21a48c268 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 f3feaa539fcc8ad78681db1e3f471d8713cc9a21..777d5b94d1cd52f3998c0ee96af260eba3dca321 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 794c1fcbed060ce5b24e3ec6077085a8b500d9d9..687ac89b8579ef92b2d2abd80e80195938e5859f 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 377e3e7b3fa806407e7f95e47d102932204db474..7417f8582a4cf629882888d194960cd376dbc826 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 721da818633a2a6e0a4a798dd65a7b5c9d4a7e8c..938ab5ade9a7ad4fa2abdb3822b2fee2bc683b17 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 f0a9e9ab315580c3642264b91ea9fdf3db03a2a6..d1e0ed5817e94aa81851dcd039e8f6dedc6111f0 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 9e4f949016ef7d077ceef1b5f4441918f073f5a0..a5f680db2d37f699d38b7c6ea5294088308e165f 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 c19ed2f43ecfdef09318dcdfd298ac7a174fc894..4243a21f1f1820cd8dbff288a98d81599f88569f 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 1b417c72e7047b9dd5672f347db6434f1d2dd1b4..872296749c0a3c2e9330f17c31470dddcf919d26 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 495bb3911b3a6cb39e5e2b68670182c7bfd0d3ca..35e8ff057986578a34387205fc3f48cd62b9dfcc 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 d74936d1281dbb1ee6bca9a944b3f7be67a0f0c4..1e843f896c7ea7c9f4dc62a66bf5bc26c430800d 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 0e3ff3c5b7a4d7e64b4407b6b9042a4e87af4b8f..8b5fba51c6ffab3b1d3be80da322822e1479e22b 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 76e75335c588e9bab7cb8fd16c3b8683a3ae15cd..78432e558117915138ec122595b02aa45fa02506 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 b15c4a238bca2013b73a0cf34cfc801bda23d719..b722586dd6bef4e80814e96ae3b0a3d736e78182 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 9b22a2db21a0c6e1ba8a4a6fbbd33a427f36f1a4..a387eeab472ad7adfffae2ac4f00b3bde7349dd1 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 228fb122f5f3bcc5b2a7657998aa3bbf38c001c5..769ece901c19e29bcf5335e4cbfba3c34adee46a 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 5c134612576cd49e48f93a02b1b9f92a0b0a5851..8c53636beac3b0a68b375a1ad2c449982319e3ff 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 685e7e65d15464b14df086ea6e0d9519d316215c..ac2319c1b42b1d346dbd3286cc5cf2ba8da49c7a 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 ae9dc0c73b05fd97a49cec931864203807cac33a..38fb1d45bcb38791a0f074698eba2c8abfcc9fab 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 86c5d48c0de497d1ca3d4d93ccc2c3dfed77f88d..720a95d2f5394dcea14872c02ad9297d0e27701c 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 3391540c6e36454197ffc2b88955df7e5d0143b5..084ee064ae685b79198249a4be93cb401cbc6982 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 1ddf0687f43ccf0bc0619edda88bb6f46056ae22..a1749149e505c46238d9f1fa39f8137a9956805e 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 bd78bdb793a6f4ac92337263f4bbc62f11292318..f51eb31ed0650921e403dde893085ad15f5de046 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 4a52fcdfddb411928abd141ad7d9d3d99897eae8..7ad2432a775be623cfac0cfd62e325544c6c8052 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 b8ab501c98e46075a81720ec874fde00e7f13d5f..794ea84852e2ebf272d39e0b1bf91606f081fb34 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 c82eb8b04bf83f42a4b9bb8edaa6aa3d50e92b37..47d7ec57b80a0d763cac8a6f3e392d1a503a65a1 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 9f891064bd5d5ee32dffe724e30b339efbad5701..3a316e73308f30d928002d4d2dc5e24feb33fa02 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 58c0ff36571e95806e84ef4e9c3ff25b67a82bce..8cc4e0db03f031ed936b154f2c503214c8681693 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 157688ef7d7a35967d5f4ab4a249506ade8ccde2..54d7cea4c599dbb65a76e9195bac660e2ca37943 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 d42ad9acb40d2f83b331846539e74a08ce02e79d..0deb7672f9e99ab621424cd2c26639c554152f5b 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 a7f5507692612a2e7a718f84487ca8b3811f9153..436f5f0059deea91aaa1f1ad56f3b8ff5aa652d9 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 a22f7a81b001652c500e52ed66b068c95241edd1..9244601284b8e3d066ac2bf7b30c0a9e114c8c25 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 1266851196d2398a526954dd1d72ab7b9ef259ea..c0e977abb01fb9efb7a462906a0073c84c800897 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 b8b08974c7e79d62e45db7906d79c03baeb91555..6740ab2be3e2a5ed9fedc1e24ed201aeec61af47 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 c73c5a1d9fe02871d896c0868bf19ac8bd1d95bb..5ced45b88b2dcb2f9cd93ceb9938342057263d2a 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 cfe926c0a141d3ac7f2ef641e37b2af090be7d22..ef2111cd20aba8c90cb0961df901ea090e1e5b0c 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 93161bd24f025bbb979803d0512340d47359e91c..db12377b004c3644d0c675d228ea67ed3b67f42c 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 3da7619d78d742703a2a0c67178e0458bcffece7..1f973829bba4d81111612f8fcfba304ef0369930 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 3a35527da10d80bc8b30f895eaf66d82d20e6f0c..c0fc8688ca6714506b1921d7359e906328eb102d 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 0f7981a5661121d06f04a8667162bb13ca6f1c32..73776e3705b778407a6512be04dcf84ff86fe31a 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 8a8bc85ca70e2659b946edd036019d08519ac993..d6bd1a103866629e28975f055b77efa33f597911 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 3ad3aefa7559e03287d4dd63dd0edf41e1d6e129..39e37ffbf7c859bec9ca8c568a0ffc6a3137d6b1 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 9bfc48c52d904cccdc6b190f4012adf264250370..76e148f55ebf44bc9f7710bacc7e961b4d7c578b 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 beac3ae6496d44a55dd9373ebb99bfb77d2b94ba..239a09763ae1bc775f66bfd9250e35a46502d69e 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 aa3d7a1a3fc82e5310cef080e1ed34d2a15f7967..e769ba2e8377c62245abdab0aed8b165603f63a4 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 f597cdb305631622b84e1e21adf5cfb671ffa8fb..5ceba8b15fa492c13240b92a17b8d6578c23b2e5 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 c740d85332748cf4a2386738452e694cc4b0bddc..f9f65f6968e1f86ed9afb309da938286c62b8a5f 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 ddd37b3936ff0a47ccc99a29617f838ce801dd38..8ab1ee79a79c18f651d66a4221b193963a0a23a2 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 cd806cb698e941263e2fd8ebcd931de403c3263e..baffe65c3697d4ec667058b10958640b11264e3b 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 d0107fcc8cb180620b2db8a57df23b87557def8e..0ac93d6e0432af0f06e039f7803fb880c1064aba 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 9464d6e44aeabaa5d345efb98bac46ea6892f0f2..94d2191af91dc7d2e4ab7b3e13d19361025b4c25 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 f7f209c20b5916b9b113d65edbc52fd1b5465a90..d4af96b51ea4a8b6fb91228fb39fa2600e4b5346 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 96a48a97a306b936e714f31f80e7c967f2af0d9b..9c61350a33b75d83c6e33d88ebdb2638ebac794c 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 358d9f47c0f356f54cf3d909a9238c3865dad1e5..4fbd06783a6de3496fb8411dc67306e64f7151f8 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 8731f6a3e4aded3bdbcb7e125c1d190fc5d315ca..cf4871cbae3968e2f93a6b3f59bfa83ce327be98 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 0dd40563c29b2b482193c355537b93463b753205..9d8737c1942556bec98bfd8730bc73190271e60e 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 6f5dffe4fbb8c3757abfe189c737df1630be57d7..8372f979dc86793dfcb1699111547b18d3204fbb 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 cb1019bd56a766193f7ccef709a38ee2d35c8659..90c78846871027f4a95eaea7142ea415042a024d 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 0e986093f35a964e6aa07e3b504883954c7339c8..4a27fd22902bbe1076c51b2993175029a11037ca 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 e56b6101af4306e9652bf353d0a0f510c4da1b2e..e56083f8e61c0e3c837280e4ab370c745507da3f 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 85922fa436cb3b34687f447ba3d4bba16ecab8e1..5ee5129801d207a15efcaf370ad5f0586656c934 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 99e01896c71b26ec8e6d0020fd3eb48718a72720..5f4cd93062315f7f947ec552ecbfe95c890f6dff 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 a32fcd57f8fce23193d36b81378d1835335c9571..43261824d3cffd561440646a7e0998b9a0939b3b 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 85691ca94f0851ea3b8052a97124e2c50e528611..358c3bb85a5eac19ede66b40b378d31f30c995d5 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 1d101977c28190efa317b4c437706f7af73b239c..496a3164f4048fea4f528ce56f4bf95784fb7bc0 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 caaa9ed86b3402ccc24a8073fe59975ebd652eaa..97d0868529027af2e2e903fdff2367e8c3d3acf6 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 b0d473eeee37a3bc63c298cbb11238ff9a6d95af..3ffb44ab72524fb909fdd6dec942d7996b376b1b 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 2eebd0c9a457279678bf8cd44144cfe9174bdd63..a12e34b6e607c44069d50ce2812f77dd5b9176a2 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 e2ad77072cd564b49baf6c838654660967b78f1a..fa029a176bd74ced7d1024177c07bae02b0dbca6 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 ea1edab9fc1271e6944b331afcf369ec0af6fc8f..0e1083a2130c401413aaa6f1d7b4df6b8175f51a 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 03d1a8e7b5fcce09a6cd740ed6a778ce952363b9..c4db38562d831ddcd7a5328b2ea2083f840282f9 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 58275ccffa01414fcc12c0ec54386376b880687e..0be26ef3287f6ea8e478940aba5613162ad8474a 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 e2331e45cdfe44563fdadc50b677aba19aa4ff1f..3ac13a65d63f41b2bc83771ae58c4a91b13790f2 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 e4a81499a7260a66f44214f314be8fb4ef71fd0c..2bac017ea083a9e2e1cbb3165c7b52b08a93423a 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 f4e23bbb0f30154114c0a415f17649f96bb06bef..efeb7bf1007815e7f24b46d99a3cee343d332253 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 8bb8521f1c1cf963d9f4ef5d461df7698678f138..adb25a62970cfe3b23b5f462cafcc9868f0f8b2e 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 a6b5e55b5415334be2a9a36592a06b6a74c594b8..93d36353ffb0e75bc7f6636fdae15f1021536ea5 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 3895537751004d01b5628d5a6132c68b6ab7d36d..957f1c369e6d6f457dd31dd9a1402cac81dabc29 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 f19211fe64794ac9039fb4c56d63c5495ae2e054..5e71ebcba8571648001ce58021100d0b46fdacab 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 5b097e9fef295a2eb22cb6816483e5566e5d1b67..5adfc67195854d7eba328043e1c9638bdb8607eb 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 2cec20ca425963d3ef55e788c12f01a804df48bb..1e6b16b4e709966f48b7d1b0148efb29905c170b 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 a608df44e80e4544a7e2574d7bcc75057b7e959f..fd4cc70a6709a93d72cee42973be7626a7f2e407 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 74627b2e6302aaa1db8f9983e66c23feeab59dae..a353c16f74b1055e040018f8883591ede5e2f259 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 2a1660bf188dbd0186e007d0f9f1b96b993d00be..146f87e9ce3397cc2f98deac03f37d87f5cace2a 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 4421e740d9ea2beabd3c9cce7e09e1531842f21b..0890c115700cb1ee828098901f52f68c8d3ad2cd 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 5c2ff5d02ee7498e5e928af9ebe9eb8da44f1da3..34994016c54c1dd0d521a93a0881b6f7fc8e34b7 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 3674e4cddaedac51328253a287141705c7ec458d..2991076c50a1b2f9791878e3ff1c3fce5bbe5900 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 71807837673f589a5cecf1f974ce2dc6f0220081..80b14b002a92dd919243c5cbee42bc9371c297d7 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 f922491637d94359802417ef1384394ecbff3204..4e6dc79f41b2c1d735b5edbc8c9d66c93cb92039 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 7f73117ac1c84c0d47d548f3184a6ef764d43bfa..9160c78c0464de03f0a454089d0fc2712890490e 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 7a38382034a69adf0c27fc87c8beccb0f98f550e..d79d364c8e2f94d98659249825d13eb8c1236106 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 3cc2a693ceee916caad0bdd545897d578d92858b..60c7473275882e7223cab93edcded72e79431b5b 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 719b70144051be1926750abaf2604213b5a50b6b..66258a3ab73b73778d2edb924cd9441b23962100 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 36f648f634006542a0181f5046857c46618f0ec6..45fc6126c8798d81f6fa51f565a6dd41b32618cd 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 5819215104263a6130b92ad4aaa7dd53b4eb67b8..7fc6211ff73253a41dcd1190e66d26384b666ccc 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 f9301a5524b9838fb6b2516cae072f6ca566d470..ac25991703f2f7209ba2e6ae3e5645b25dbe2350 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 a233fb8ed746d600595106b05ddf7f4b5321cca6..f4a34f261a6e68be24f0ad6837643e39970c5a73 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 fa08744b6febb5db96035afe7158e25489414b37..cd9d21e420bc15cf62a4a238857c57b4f3c68dcb 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 fc9f113dee66a4136c6b49cdaede921590a2b4f3..b1354219c9ffe19a49ed3bc3cc1cc56b3527c966 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 239d33d8e9de409a49c3b015c005fc0e951737a4..33715790233a7dd439485718f695424296979e81 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 075729e5d37d38d8dc0bc96bb8b5c1702e14e14d..c3f1d3393cb66ce7cfb5954969c67f49b951de9e 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 1c11685f49e4f3802f57b7627f57ee3528d446fa..8e74dc4888758e4ad8ef601decdfcd78b2852f6f 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 c58105597e47f78c0f1d14c4708e0903e470e9bb..6e8adf91877cd05f680b5b706f889b482ceb7099 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 e0f77f358b959ef2d10d361853a583aa7cf96c19..202bd914d506dc4f4838fc3ddf7db11411dc7918 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 2b25c31b1d8d1fe736818d0fa36f2b78bd199f51..df07df6a5a728eab7645a43ad434b16d45f046f6 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 99376155b491e41a7ca2416feb7abf8c93e135c7..003686930a4b125c0186e82b68abb3f33a04b5dd 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 48f49906b84e26ff32949c29244acb1298d7405a..10eaeb49de622450b6e149e41639e0e669c8c923 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 c41bb341d82ead3456aef5e43512c6d2eb5f5214..8ea59aa21ca69a5b3dd7891c651af526ad68730e 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 a67af73fd56f6284b1b323b6dc6b6e86d5916d44..45bd94ee5c76f3965d62788366ddf8c271d22176 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 35172da3ff1e18ee76cecb92bfb0d4015cc8386e..20135f569eb23c9481ec2387d6f00b3c20b592e7 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 59d56d6662426e9e4f8e766e10806d6b7274789d..777df4c11259e6518858f08f074317a0a0cd819b 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 86012adfb36f8bb7dcd52e04133db84e694cc7ab..8e0837a30275676faec2eedc15b59240ada8afe3 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 a4cae697181da66c86a6b7b0fdb00def288c4141..ea6073f2944608a13290f76f2ad712ea0ebce5d6 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 99c86edeaa40bf91fe023729778ac1646775a73c..c4758e148ba727cd79d0f6d6a9761ed9a0cd54c3 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 302546630ac6307c182dd2f4ee2416ce11e0a28c..5b0ec3700040020679adb950bc520d3d494fb667 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 334fb3affa5e7a29482fc214b9ac9202a96f7cc5..58f491c2f3204c855d9646bdabbe6e82cd29907a 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 58ad62afe165b9cbe3cbd71bd3fb42b6093cba3c..b95268df87c2c6296b70a6bc124cd99c2413fa80 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 6b55c57dd770d0ae07b0dba1365f732891a1998b..d3b8a5150f6b7255002c3a3e912ed11b4915f977 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 4b510b139910f969fb94c79a629bc10e07481150..bc03e113fef0cae3c61817a9bf7f04f896720121 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 132b7d0fe9bcdade4c276a51e260c1f3e2831ea8..85d2186f23e0dd867201f95de82a70e700c058b3 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 92cdc1a51fbdc1933fcb527eb0a5e468e93fd9f3..17636250510bc370163d3cec2a9180e7c8c93811 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 a721f27ec00b8cf849afceb1ff904b7b4452219b..2278b6215d4835a63b11609f71b5eb20845330e4 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 d43dc2580e4642bebeda599d6564200cf23652b8..750f16d03999a3ff4c419fe8be54da2bafbee113 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 e3549275138b23cc83bccde3b4e088f75b85ad3d..c3f8e7bf85cd6bdf28a6353de77497ca53ec5f33 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 b07d0c50604daa912c91a2de46c5268f9f02b20d..99799f8494e0a7e4efcfc9a63bde5b40923def17 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 84a5ae6965dd44af58e47ee48554016524113fa1..6e17b23b624c67fee6d1e5886fd92c04767f3e18 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 b4b2dbd038677a68ef72c4429e042d533a13f2c9..bfe559f6e2cd4dba194c193cb4147bb75356d406 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 555bedb93d659eec93f35484d22cd21006796fd0..d1ff00a27f83cf712dade88908b40c7ed338eec1 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 80d3fc9258cccf731ff29a7f49aa5e1c72e2c470..bf2d04a169b37ee62d69c8cdef21a90b9abdd1ab 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 f7cdd5a19568576cf72678399760790f91f100ac..9a4fe530a20b731d0a0b6d04a0385dbd2f124df0 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 d7923967a721d848f756ecfb4eba796a6d18d61b..4e0b3c663c77d56d8a46f960bfe7b5ba29ad68a6 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 4a453a9df4070d7219fd3e4fef37bdb08a515478..de3a0dcdd592cd27825598263f333fad399e335b 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 ac42108620faa017662554942a0ca43edd854109..24904aa238718d9561c92aca4be43c8e09f8709a 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 6d605edf78868f40b02f6028693f111cf563abec..9114a0575828b38de5c2454b2524456507ac1198 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 974531ea0d82ad81d75678c3c099f6b0584f703f..760a0a5b913553b6978b8b951a41da141abe3cba 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 ff0ed180e92ecd6484cc3c62f14dd57d7f15e8b1..748a423b08336c6521ea90433afa9a7c88d33673 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 b988b96e58d8696bc81a8e4fe1aebb2154270148..762f61470b15d933b9fc2617a6bfa7ace324c2de 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 ccb7ec38d033e82c1c72d58a908967030ed87295..c148757915a2b01dd316355ac2d67e67727911d9 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 14f9cf5602866657052078e9a077fca99ea8001d..11031744bef8b46805bb30f84d83497bb9fcc6db 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 b7aa49ce435ebe1c1bff257024b86e806431ae12..df8ed451a43a49eb59f6c702b79deb309b0e3546 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 afca7e18e9bef6433eefcf084c17dac4268c0faf..eaee8dd3739683c2a72a8ef2244abb74fd4b21c4 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 aa13878177effd57dc7ebcf0732e9b1d6698d2f4..2ce7011529a49a270ec197c12c3fc34ca4e1b761 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 d0f5331d451881ddafa264b32c8e2dedf9c0e23b..0c96c9c24fed1ca15b3125b7a56c21d49b95c519 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 8f1c2de998ea327dfaca3d373ee2f1e82aae8216..565a661258fd641f4ad629fea8f113acda4bdbe0 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 e76438e228d52e3c90e7bf868b2bd56481d7981a..ac70d91e208191f0a67439c0b922c0f23d76c430 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 c295e91e3d3e2ca199062ed7ed4c3bdea91c6d04..fe5286e12cd1e90c14748251d3b40328c90fcf1c 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 df3927297bbed1629010c1cebd9abc4e0d73ff96..66ecb168a0a0e49d59283a4c25916b342dadd149 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 d88b07bc159478900c828f18163054529d51b632..4bb15cf46293272f24dc0af711cc169fb5eaae2f 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 4c752091fb5ec9147f7e3f0100ce14fcb4b63a06..2b35be83ec651eeaa7ee1b5a62ad10b9112f7581 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 de0f48b79a15bcedffd7d11efa442e4ddab2d257..e132805635139f2aa108f3d9b7aa46fa1a848c2c 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 a5987c5e17a1a2e2c03151cc1fcd9956de2593b3..e58ddd752cd377f811cd0c230a2af94204556c33 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 9294d57ca84ed9c9b8cc1798f6b9e6996b6cda9a..b3fce503168731d0abc957ce5a85f99f5de4c134 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 afd7d50428bf733ebb379593ec041c32b503408a..de5019a364a0f1e65d67efbc39bfdca0a4d1d7fa 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 c8aad47966fed24c50512184661217959e6b85bb..a4f3e43dc5a124121c6ec334e3fe01e4dab16cef 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 573a6b179561c25a8e5bb40d9ba8ee5c984c9231..62a7e9af0c56e09138d303d11d74c6aed5c3fc49 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 14e883a35892ad017640bfdb518c46b98a16f313..34856d30040309dee9b81210d7ad86950e47862c 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 67e6a3a19d21c741cf5eea81ecbfc1a7f4163357..d36cd6fdd44ab82950fc4b40ef4fb2878943dcf8 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 4786eb001bc131f767a6b067fa9a44f4ebbd5450..8f242bf0ff6e122f9d6fec05cd3e1ea2da510813 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 e667fe6f6ac2ab9ad8ccf015662f7fcef35b8ba1..d27b6a3d1de20d1e8802a6140633b4155b8bb3f2 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 c259a616133b42cffba9917c154e558a0447be6b..7c59c69e0bdca6b579c8a694d7f69c0e4adf3093 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 9715dfad1c97e0d967bcfe7ee3ec3525f2dbac04..7db72a19ed95c3ee9eb919ee40edb863890f045c 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 910d7ef107b574d1af4ab925f7e896e0b49ad9d8..919216906249e5d3724758f8f5048a0446f29e38 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 38b5aa7319cfc21f9cc5f2b8194540d4a375e602..d0cd4130cec2060395965491b148050d7864c350 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 ce941d832a5482722aedd5f5ab3fa9e4fa470254..fe2ba9a03b4151ecf34477db93845ec481fd302b 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 977c0adc5f021aba4abcb1e36353088cfd18792d..ee1abe691bfd4365223308acc2694018f74ed28f 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 5d82e7e560f6be0adb664e0eee1d468cbaf7c6e4..eae107fe5ec69039792086b635363eb317176977 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 a2b6a1f57d7cace2eed6cf0b21af4d22ba0b787d..a62d1d325478f2c6f300526a4ca08992fab89fa4 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 7af7b08eb48525448e933affea0792c2ef37285b..e8a207f54167451586a8ba4a63e5ab156641d92b 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 30f842558207caa4212d9e8ba7ff4d88445aa984..855218a8901eb2be246afb0398b07a37fc3d9313 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 689914cb1873add1d1fc77dd2d15a3001f3126a9..9b396e6e73b0d384fbfe42868bbbcfd199a77321 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 2c668e0611ba0edc3a3c168b8c64a7d64d4dfe91..0fdb5a81605d180dfef9429327ac2b22254a2ef7 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 57724719a9d6a5cd7615c4cb283db2ea6a72a73d..e86c16313293736c099fc83d59f29820924c5e25 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 b57b1beaafe42342745a7ef8b085ac4caff02437..746995179f9c90e7eef07bc5ffa2f49cc8dc2630 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 76b496303f3e540187d7041d7682d0d416a7709a..9722b0db72aad8a8f385e2dc363bd42870e92536 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 c8b27263e85ef9b7e312ba2b4592a2d25f217502..1753fa410d18bf77378777b7bea272caaade4b45 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 7becf1eb7cb42aa5878389e534e31ff6a71726c8..8ba40546b2c0496c7900e4f50c7ca0cea0fb2cf4 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 7b04292d21882497f8f441408acde26e0fea625e..2d9d2fd66e9a0ec74758be25f665aa7f420b3fc9 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 ea45bba409cb598ba508f4a6ff777a43b7b2bc6b..479ab46e4eddc418d180fc4c87c73ee5f34d4914 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 64ec59d78eb642331e95220547bfa5a545d56104..49f4263e16ba0abfb80f76a956019f11a52c7cf8 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 37ab2e4467245130d1427bf9901c201181f2fb21..e9723ed5b3dd4be1565fd8810c2b2d4306c0867e 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 83abaeddf125703f7902b183c917100b3baf242d..3795e6152fa9b3df6429f04fdd2f20310f60f596 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 0f28690612abb39a26ca16f48709113ed0d2de03..e007be8e456404e7b3159732033e434c5c2d832d 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 7a1ad9544a30868ad1c0f5c6bd273aa51da23345..14d7730f67bf368183e2ba6ded201fd7b4665399 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 3eac66539dfe7fb30e6afe52c779095cdf001ceb..2067327918a2db4f275fe9e2cc71c1d80939b196 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 18fca09a3807354305c9caa7c90465d27bb31393..9925531aba43300c2a6f000fd0428e570838372e 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 fdb420ed874e58f6f8561a6ba8ea3844bb760536..3443c80d06efda2ad9d9b8e1c9a6cc6bd3ea4831 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 52de4cdc78939fb3bf2c3c3ec8e78d2c044117f2..47b220ff9ee77c080a8caafe84cf8f36caf33b9f 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 fac8c1eeb4e2d73a416f02f901af8aebf4853a91..f0092eff14948073397ffe7d21d19d6057b8c332 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 d4c92233acaa7b439c532072977313c489aeac6c..5d7d734daa2d57dadfc439b0a7ed2f5396196681 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 7fee64029d8dd103daea3565d3b1d9b60d2e09c1..ecf0d2ac44ae5be5aefe4e9515c7dd5d73c5d3fa 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 657dbadd3396c5f3b4ad9374204669dbc8ea1e66..b90e047955b909f26c4c2e6000d3c561288a9f12 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 7f79c6342fc323651e9ebde1931eea0d856aeadd..11706148f1e20d44824734bfcc496e1c1325e190 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 b03159805c150d1d1ebe04efe36f6bb0e6c2b347..2e150276e7a4182e49f2760e54fd964d27d784d6 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 18ac6b2b08958c0ea937113e107ddf26c82f16cf..7f3fa795afdc1add5019df6e233ac19fbc521701 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 22dc364223ce1cb427348293d73c27d7459f4a95..2cb076cabac9320e67b25b020383ab8276cf4352 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 30c1f5025b05d9a164905f95019e10de0c1ad14d..87b8c5d57ee7bd40a6d1a97077c0bfdbd4698b53 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 e8b6acf8b8feec4e0246c3c11011d0c9c71c9b6e..705a941e3603b32ce652b45f07d9fd66517fb7be 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 14e6b2bac91c00e8e03856f7cbe2a9b06e8895f2..0e0b3a7b594da6adf1cc14e973eb01ca48c32641 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 1c1789ac3fb8c6934bd6e7fa1ef7d95d90eed2ff..0698ae1d1c6e5d953756a7cc3def326c06690201 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 6923009d459851fd319151cbc5ae4caa3bd7eb94..1e765439fabe6f5868820134a1fcbee5940a02a7 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 188180da54eba699c7d95aa745da15a46fbb2705..0826e0bbe0258183425cfbd30e56a4add2d1db49 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 4cf41f52fd71d6bc096aa566d0380b27cfd44c13..fddf00d3d13cb8c52205f9b09f93a60e7987c8cc 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 d71108dd3186ba36644650d4bf05de68e01086d1..65a1e63e00e6452cf2fc7c2f7a29f9962aabdb0b 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 a3dc0c74ebb114ad765d4aea522f262ce5826b38..04ca5aa12ac194aee033c2c6527b55bd2db9bb35 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 612436aeb48fb437b80bdb036734f25ea00a9e77..bc268d25dc3a3b96f9609336a920903dcc8e81fb 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 6ee6786e054a9a3e881e0479224af046d66343f8..e70acd93bac4179f3fa913755d421a0031cc7150 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 e1f95de3c34fb083c3949ecc1c957d5c1421932f..23655a475221f2415047c0123362c2ba4d3455a8 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 37bdb214629d6068ebc4b9b767b36ebc851f845c..424ead038e3285071835084f4f4ced588b4d052c 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 1939832a848e7b17cf310dffd7839c98d8020e46..50bacc39ac58beceb9199ab4456f003dc1d4eaf1 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 f71cd6609932cabe107121f9c779943eb8f688f8..011f0034c50927715ca7b148a69041fcc8ba854f 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 1c0ab25c64401ab452cca717d527ceeb4fabd041..9af05456640bd8c76a89f2a8b6d282c6285d4f9b 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 3a7b7e03d6af567480dc231df5c32c192ef8cd19..918aa3d7402aeb66e11b2c6cf459f264906ccdff 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 9f1f2d90dbe104aab61cf4aacde067528ef988cd..0d72008bb46645bb7da533046b8b8c76d1fb8c20 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 d95178eb64221b8e84b8e073fe7d744b8b05eb6e..e372e903170a873f853d8f871bc9cace22b0a154 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 ac6e8c4ff86709124bad48f0b3c4c374e8392942..a9bb5bb90ad13d31b46d372413a162230d2619f2 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 3b7685ee26c323c68827594d87f07b695ae377fa..c0df39d62f9b8ec8bc8186c43cd2147a363f7add 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 */