power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY
Subsystems (59)
PATCH 25/149 global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS
--- README | 4 ++-- doc/README.fsl-ddr | 4 ++-- doc/README.link-local | 2 +- doc/arch/x86.rst | 4 ++-- doc/develop/devicetree/control.rst | 2 +- doc/develop/distro.rst | 2 +- doc/usage/environment.rst | 2 +- env/Kconfig | 4 ++-- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MCR3000.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/alt.h | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_igep003x.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 2 +- include/configs/am65x_evm.h | 2 +- include/configs/amcore.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/apple.h | 2 +- include/configs/arbel.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/ax25-ae350.h | 2 +- include/configs/axs10x.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bcm_ns3.h | 2 +- include/configs/bcmstb.h | 2 +- include/configs/beacon-rzg2m.h | 4 ++-- include/configs/bitmain_antminer_s9.h | 2 +- include/configs/bk4r1.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/brppt2.h | 2 +- include/configs/brsmarc1.h | 2 +- include/configs/brxre1.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/cl-som-imx7.h | 4 ++-- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/conga-qeval20-qa3-e3845.h | 4 ++-- include/configs/controlcenterdc.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/dfi-bt700.h | 4 ++-- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/draco.h | 2 +- include/configs/dragonboard410c.h | 2 +- include/configs/dragonboard820c.h | 2 +- include/configs/dragonboard845c.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/ds414.h | 2 +- include/configs/durian.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/emsdp.h | 2 +- include/configs/etamin.h | 2 +- include/configs/evb_ast2500.h | 2 +- include/configs/evb_ast2600.h | 2 +- include/configs/evb_rv1108.h | 4 ++-- include/configs/exynos5-common.h | 2 +- include/configs/exynos7420-common.h | 2 +- include/configs/exynos78x0-common.h | 2 +- include/configs/gazerbeam.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/gose.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/helios4.h | 2 +- include/configs/highbank.h | 2 +- include/configs/hikey.h | 2 +- include/configs/hikey960.h | 2 +- include/configs/hsdk-4xd.h | 2 +- include/configs/hsdk.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/imx6-engicam.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 4 ++-- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm-mx8menlo.h | 4 ++-- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mn_beacon.h | 2 +- include/configs/imx8mn_bsh_smm_s2.h | 2 +- include/configs/imx8mn_bsh_smm_s2pro.h | 2 +- include/configs/imx8mn_evk.h | 2 +- include/configs/imx8mn_var_som.h | 2 +- include/configs/imx8mn_venice.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mp_venice.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qm_rom7720.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/imxrt1050-evk.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/j721s2_evm.h | 2 +- include/configs/km/km-mpc83xx.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/koelsch.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/lager.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/librem5.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/ls1012a2g5rdb.h | 4 ++-- include/configs/ls1012a_common.h | 2 +- include/configs/ls1012afrdm.h | 4 ++-- include/configs/ls1012afrwy.h | 4 ++-- include/configs/ls1012aqds.h | 4 ++-- include/configs/ls1012ardb.h | 4 ++-- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 4 ++-- include/configs/ls1021atsn.h | 2 +- include/configs/ls1021atwr.h | 4 ++-- include/configs/ls1028aqds.h | 4 ++-- include/configs/ls1028ardb.h | 4 ++-- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls1088aqds.h | 20 ++++++++++---------- include/configs/ls1088ardb.h | 6 +++--- include/configs/ls2080a_common.h | 2 +- include/configs/ls2080aqds.h | 10 +++++----- include/configs/ls2080ardb.h | 6 +++--- include/configs/lsxl.h | 2 +- include/configs/lx2160aqds.h | 2 +- include/configs/lx2160ardb.h | 2 +- include/configs/lx2162aqds.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/meson64.h | 4 ++-- include/configs/meson64_android.h | 2 +- include/configs/microblaze-generic.h | 4 ++-- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mt7623.h | 2 +- include/configs/mt8183.h | 2 +- include/configs/mt8512.h | 2 +- include/configs/mt8516.h | 2 +- include/configs/mt8518.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/mvebu_armada-37xx.h | 2 +- include/configs/mvebu_armada-8k.h | 2 +- include/configs/mx23_olinuxino.h | 2 +- include/configs/mx23evk.h | 2 +- include/configs/mx28evk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53ppd.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mx7ulp_evk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/octeontx2_common.h | 2 +- include/configs/octeontx_common.h | 4 ++-- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 4 ++-- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/openpiton-riscv64.h | 2 +- include/configs/openrd.h | 2 +- include/configs/origen.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pdu001.h | 2 +- include/configs/phycore_am335x_r2.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/phycore_imx8mp.h | 2 +- include/configs/pic32mzdask.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/poleg.h | 2 +- include/configs/pomelo.h | 2 +- include/configs/poplar.h | 2 +- include/configs/porter.h | 2 +- include/configs/presidio_asic.h | 2 +- include/configs/px30_common.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/qcs404-evb.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/rut.h | 2 +- include/configs/rv1108_common.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/sdm845.h | 2 +- include/configs/sheevaplug.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/silk.h | 2 +- include/configs/sipeed-maix.h | 4 ++-- include/configs/slimbootloader.h | 6 +++--- include/configs/smartweb.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smegw01.h | 2 +- include/configs/snapper9g45.h | 2 +- include/configs/sniper.h | 2 +- include/configs/socfpga_arria5_secu1.h | 2 +- include/configs/socfpga_chameleonv3.h | 2 +- include/configs/socfpga_common.h | 4 ++-- include/configs/socfpga_dbm_soc1.h | 2 +- include/configs/socfpga_mcvevk.h | 2 +- include/configs/socfpga_n5x_socdk.h | 4 ++-- include/configs/socfpga_soc64_common.h | 2 +- include/configs/socfpga_vining_fpga.h | 2 +- include/configs/socrates.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/stemmy.h | 2 +- include/configs/stih410-b2260.h | 2 +- include/configs/stm32f429-discovery.h | 2 +- include/configs/stm32f429-evaluation.h | 2 +- include/configs/stm32f469-discovery.h | 2 +- include/configs/stm32f746-disco.h | 2 +- include/configs/stm32h743-disco.h | 2 +- include/configs/stm32h743-eval.h | 2 +- include/configs/stm32h750-art-pi.h | 2 +- include/configs/stm32mp13_common.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/stm32mp15_dh_dhsom.h | 2 +- include/configs/stm32mp15_st_common.h | 6 +++--- include/configs/stmark2.h | 2 +- include/configs/stout.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/syzygy_hub.h | 2 +- include/configs/taurus.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tegra-common-post.h | 2 +- include/configs/ten64.h | 4 ++-- include/configs/theadorable-x86-common.h | 4 ++-- include/configs/theadorable.h | 2 +- include/configs/thuban.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- include/configs/topic_miami.h | 4 ++-- include/configs/total_compute.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/configs/turris_mox.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/usb_a9263.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vcoreiii.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- include/configs/vexpress_aemv8.h | 2 +- include/configs/vexpress_common.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vinco.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp7.h | 2 +- include/configs/x530.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xea.h | 2 +- include/configs/xenguest_arm64.h | 6 +++--- include/configs/xilinx_versal.h | 4 ++-- include/configs/xilinx_versal_mini.h | 4 ++-- include/configs/xilinx_versal_net.h | 4 ++-- include/configs/xilinx_versal_net_mini.h | 4 ++-- include/configs/xilinx_zynqmp.h | 8 ++++---- include/configs/xilinx_zynqmp_mini.h | 4 ++-- include/configs/xilinx_zynqmp_r5.h | 2 +- include/configs/xpress.h | 2 +- include/configs/zynq-common.h | 4 ++-- include/configs/zynq_cse.h | 2 +- include/env_default.h | 4 ++-- 381 files changed, 444 insertions(+), 444 deletions(-)
README +2 -2
@@ -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"
doc/README.fsl-ddr +2 -2
@@ -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" \ ......
doc/README.link-local +1 -1
@@ -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;" \
doc/arch/x86.rst +2 -2
@@ -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::
doc/develop/devicetree/control.rst +1 -1
@@ -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:
doc/develop/distro.rst +1 -1
@@ -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:
doc/usage/environment.rst +1 -1
@@ -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
env/Kconfig +2 -2
@@ -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.
include/configs/M5208EVBE.h +1 -1
@@ -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" \
include/configs/M5235EVB.h +1 -1
@@ -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" \
include/configs/M5253DEMO.h +1 -1
@@ -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" \
include/configs/M5272C3.h +1 -1
@@ -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" \
include/configs/M5275EVB.h +1 -1
@@ -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" \
include/configs/M5282EVB.h +1 -1
@@ -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" \
include/configs/M53017EVB.h +1 -1
@@ -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" \
include/configs/M5329EVB.h +1 -1
@@ -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" \
include/configs/M5373EVB.h +1 -1
@@ -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" \
include/configs/MCR3000.h +1 -1
@@ -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" \
include/configs/MPC837XERDB.h +1 -1
@@ -195,7 +195,7 @@#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;" \
include/configs/MPC8548CDS.h +1 -1
@@ -291,7 +291,7 @@* 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" \
include/configs/P1010RDB.h +1 -1
@@ -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" \
include/configs/P2041RDB.h +1 -1
@@ -304,7 +304,7 @@#define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "bank_intlv=cs0_cs1\0" \ "netdev=eth0\0" \
include/configs/T102xRDB.h +1 -1
@@ -430,7 +430,7 @@ "fdtfile=t1023rdb/t1023rdb.dtb\0"#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline," \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \
include/configs/T104xRDB.h +1 -1
@@ -370,7 +370,7 @@#define FDTFILE "t1042rdb/t1042d4rdb.dtb"#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\ "usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
include/configs/T208xQDS.h +1 -1
@@ -413,7 +413,7 @@#define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \
include/configs/T208xRDB.h +1 -1
@@ -379,7 +379,7 @@#define __USB_PHY_TYPE utmi -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \
include/configs/T4240RDB.h +1 -1
@@ -368,7 +368,7 @@#define CTRL_INTLV_PREFERED cacheline#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:" \ "ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \ "bank_intlv=auto;" \
include/configs/alt.h +1 -1
@@ -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"
include/configs/am335x_evm.h +1 -1
@@ -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" \
include/configs/am335x_guardian.h +1 -1
@@ -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 \
include/configs/am335x_igep003x.h +1 -1
@@ -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" \
include/configs/am335x_shc.h +1 -1
@@ -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" \
include/configs/am335x_sl50.h +1 -1
@@ -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
include/configs/am3517_evm.h +1 -1
@@ -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" \
include/configs/am43xx_evm.h +1 -1
@@ -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" \
include/configs/am62x_evm.h +1 -1
@@ -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 \
include/configs/am64x_evm.h +1 -1
@@ -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 \
include/configs/am65x_evm.h +1 -1
@@ -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 \
include/configs/amcore.h +1 -1
@@ -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; " \
include/configs/apalis-imx8.h +1 -1
@@ -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" \
include/configs/apalis_imx6.h +1 -1
@@ -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" \
include/configs/apple.h +1 -1
@@ -27,7 +27,7 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ BOOTENV
include/configs/arbel.h +1 -1
@@ -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" \
include/configs/aristainetos2.h +1 -1
@@ -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" \
include/configs/astro_mcf5373l.h +1 -1
@@ -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" \
include/configs/at91sam9263ek.h +1 -1
@@ -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};" \
include/configs/at91sam9n12ek.h +1 -1
@@ -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"
include/configs/ax25-ae350.h +1 -1
@@ -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" \
include/configs/axs10x.h +1 -1
@@ -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 " \
include/configs/baltos.h +1 -1
@@ -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" \
include/configs/bcm_ns3.h +1 -1
@@ -793,7 +793,7 @@QSPI_FLASH \ FLASH_IMAGES -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ ARCH_ENV_SETTINGS#endif /* __BCM_NS3_H */
include/configs/bcmstb.h +1 -1
@@ -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"
include/configs/beacon-rzg2m.h +2 -2
@@ -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" \
include/configs/bitmain_antminer_s9.h +1 -1
@@ -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" \
include/configs/bk4r1.h +1 -1
@@ -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" \
include/configs/brppt1.h +1 -1
@@ -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" \
include/configs/brppt2.h +1 -1
@@ -24,7 +24,7 @@/* Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "cfgaddr=0x106F0000\0" \ "scraddr=0x10700000\0" \
include/configs/brsmarc1.h +1 -1
@@ -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;" \
include/configs/brxre1.h +1 -1
@@ -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" \
include/configs/capricorn-common.h +1 -1
@@ -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 \
include/configs/cgtqmx8.h +1 -1
@@ -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" \
include/configs/chiliboard.h +1 -1
@@ -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" \
include/configs/cl-som-imx7.h +2 -2
@@ -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" \
include/configs/clearfog.h +1 -1
@@ -110,7 +110,7 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "console=ttyS0,115200\0" \
include/configs/cm_fx6.h +1 -1
@@ -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" \
include/configs/cm_t43.h +1 -1
@@ -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" \
include/configs/colibri-imx6ull.h +1 -1
@@ -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 \
include/configs/colibri-imx8x.h +1 -1
@@ -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 \
include/configs/colibri_imx6.h +1 -1
@@ -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" \
include/configs/colibri_imx7.h +1 -1
@@ -119,7 +119,7 @@#endif #include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ MODULE_EXTRA_ENV_SETTINGS \
include/configs/colibri_vf.h +1 -1
@@ -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 \
include/configs/conga-qeval20-qa3-e3845.h +2 -2
@@ -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;" \
include/configs/controlcenterdc.h +1 -1
@@ -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" \
include/configs/crs3xx-98dx3236.h +1 -1
@@ -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"
include/configs/da850evm.h +1 -1
@@ -145,7 +145,7 @@#include <environment/ti/mmc.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \
include/configs/dart_6ul.h +1 -1
@@ -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" \
include/configs/db-88f6820-amc.h +1 -1
@@ -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"
include/configs/db-88f6820-gp.h +1 -1
@@ -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"
include/configs/db-xc3-24g4xg.h +1 -1
@@ -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"
include/configs/devkit3250.h +1 -1
@@ -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" \
include/configs/devkit8000.h +1 -1
@@ -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" \
include/configs/dfi-bt700.h +2 -2
@@ -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;" \
include/configs/dh_imx6.h +1 -1
@@ -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" \
include/configs/display5.h +1 -1
@@ -164,7 +164,7 @@"sf write ${loadaddr} 0x0 ${filesize};" \"fi\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \PARTS_DEFAULT \"gpio_recovery=93\0" \"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \
include/configs/dns325.h +1 -1
@@ -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" \
include/configs/dockstar.h +1 -1
@@ -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" \
include/configs/draco.h +1 -1
@@ -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" \
include/configs/dragonboard410c.h +1 -1
@@ -28,6 +28,6 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV +#define CFG_EXTRA_ENV_SETTINGS BOOTENV#endif
include/configs/dragonboard820c.h +1 -1
@@ -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" \
include/configs/dragonboard845c.h +1 -1
@@ -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"
include/configs/dreamplug.h +1 -1
@@ -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" \
include/configs/ds109.h +1 -1
@@ -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" \
include/configs/ds414.h +1 -1
@@ -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" \
include/configs/durian.h +1 -1
@@ -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" \
include/configs/el6x_common.h +1 -1
@@ -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" \
include/configs/embestmx6boards.h +1 -1
@@ -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" \
include/configs/emsdp.h +1 -1
@@ -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} && " \
include/configs/etamin.h +1 -1
@@ -128,7 +128,7 @@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" \
include/configs/evb_ast2500.h +1 -1
@@ -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 */
include/configs/evb_ast2600.h +1 -1
@@ -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; " \
include/configs/evb_rv1108.h +2 -2
@@ -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" \
include/configs/exynos5-common.h +1 -1
@@ -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 \
include/configs/exynos7420-common.h +1 -1
@@ -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
include/configs/exynos78x0-common.h +1 -1
@@ -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 */
include/configs/gazerbeam.h +1 -1
@@ -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" \
include/configs/ge_b1x5v2.h +1 -1
@@ -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" \
include/configs/ge_bx50v3.h +1 -1
@@ -41,7 +41,7 @@#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ NETWORKBOOT \ "image=/boot/fitImage\0" \ "dev=mmc\0" \
include/configs/goflexhome.h +1 -1
@@ -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"
include/configs/gose.h +1 -1
@@ -29,7 +29,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"#endif /* __GOSE_H */
include/configs/guruplug.h +1 -1
@@ -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" \
include/configs/helios4.h +1 -1
@@ -110,7 +110,7 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ RELOCATION_LIMITS_ENV_SETTINGS \ LOAD_ADDRESS_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
include/configs/highbank.h +1 -1
@@ -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"
include/configs/hikey.h +1 -1
@@ -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" \
include/configs/hikey960.h +1 -1
@@ -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" \
include/configs/hsdk-4xd.h +1 -1
@@ -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 " \
include/configs/hsdk.h +1 -1
@@ -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 " \
include/configs/ib62x0.h +1 -1
@@ -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" \
include/configs/iconnect.h +1 -1
@@ -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"
include/configs/imx6-engicam.h +1 -1
@@ -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" \
include/configs/imx6_logic.h +1 -1
@@ -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" \
include/configs/imx6dl-mamoj.h +1 -1
@@ -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" \
include/configs/imx6q-bosch-acc.h +1 -1
@@ -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" \
include/configs/imx6ulz_smm_m2.h +1 -1
@@ -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
include/configs/imx7-cm.h +2 -2
@@ -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" \
include/configs/imx8mm-cl-iot-gate.h +1 -1
@@ -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" \
include/configs/imx8mm-mx8menlo.h +2 -2
@@ -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" \
include/configs/imx8mm_beacon.h +1 -1
@@ -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" \
include/configs/imx8mm_data_modul_edm_sbc.h +1 -1
@@ -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" \
include/configs/imx8mm_evk.h +1 -1
@@ -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" \
include/configs/imx8mm_icore_mx8mm.h +1 -1
@@ -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" \
include/configs/imx8mm_venice.h +1 -1
@@ -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
include/configs/imx8mn_beacon.h +1 -1
@@ -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" \
include/configs/imx8mn_bsh_smm_s2.h +1 -1
@@ -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
include/configs/imx8mn_bsh_smm_s2pro.h +1 -1
@@ -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
include/configs/imx8mn_evk.h +1 -1
@@ -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" \
include/configs/imx8mn_var_som.h +1 -1
@@ -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
include/configs/imx8mn_venice.h +1 -1
@@ -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
include/configs/imx8mp_dhcom_pdk2.h +1 -1
@@ -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" \
include/configs/imx8mp_evk.h +1 -1
@@ -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" \
include/configs/imx8mp_icore_mx8mp.h +1 -1
@@ -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" \
include/configs/imx8mp_rsb3720.h +1 -1
@@ -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" \
include/configs/imx8mp_venice.h +1 -1
@@ -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
include/configs/imx8mq_cm.h +1 -1
@@ -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" \
include/configs/imx8mq_evk.h +1 -1
@@ -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" \
include/configs/imx8mq_phanbell.h +1 -1
@@ -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" \
include/configs/imx8qm_mek.h +1 -1
@@ -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" \
include/configs/imx8qm_rom7720.h +1 -1
@@ -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" \
include/configs/imx8qxp_mek.h +1 -1
@@ -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" \
include/configs/imx8ulp_evk.h +1 -1
@@ -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" \
include/configs/imx93_evk.h +1 -1
@@ -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" \
include/configs/imxrt1050-evk.h +1 -1
@@ -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"
include/configs/iot2050.h +1 -1
@@ -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
include/configs/j721e_evm.h +1 -1
@@ -170,7 +170,7 @@#include <config_distro_bootcmd.h> /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \
include/configs/j721s2_evm.h +1 -1
@@ -127,7 +127,7 @@DFU_ALT_INFO_OSPI /* Incorporate settings into the U-Boot environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \
include/configs/km/km-mpc83xx.h +1 -1
@@ -82,7 +82,7 @@#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0"#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ "newenv=" \
include/configs/km/pg-wcom-ls102xa.h +1 -1
@@ -219,7 +219,7 @@"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \"asrc,spdif,lpuart1,ftm1\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \CONFIG_KM_NEW_ENV \CONFIG_KM_DEF_ENV \CONFIG_HW_ENV_SETTINGS \
include/configs/kmcent2.h +1 -1
@@ -439,7 +439,7 @@ int get_scl(void);#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0"#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \
include/configs/koelsch.h +1 -1
@@ -29,7 +29,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"/* SPL support */
include/configs/kontron-sl-mx6ul.h +1 -1
@@ -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 */
include/configs/kontron-sl-mx8mm.h +1 -1
@@ -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 */
include/configs/kontron_pitx_imx8m.h +1 -1
@@ -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" \
include/configs/kontron_sl28.h +1 -1
@@ -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" \
include/configs/kp_imx53.h +1 -1
@@ -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" \
include/configs/kp_imx6q_tpc.h +1 -1
@@ -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" \
include/configs/lacie_kw.h +1 -1
@@ -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" \
include/configs/lager.h +1 -1
@@ -30,7 +30,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"/* SPL support */
include/configs/legoev3.h +1 -1
@@ -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" \
include/configs/librem5.h +1 -1
@@ -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" \
include/configs/liteboard.h +1 -1
@@ -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" \
include/configs/ls1012a2g5rdb.h +2 -2
@@ -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" \
include/configs/ls1012a_common.h +1 -1
@@ -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" \
include/configs/ls1012afrdm.h +2 -2
@@ -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" \
include/configs/ls1012afrwy.h +2 -2
@@ -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" \
include/configs/ls1012aqds.h +2 -2
@@ -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" \
include/configs/ls1012ardb.h +2 -2
@@ -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" \
include/configs/ls1021aiot.h +1 -1
@@ -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"
include/configs/ls1021aqds.h +2 -2
@@ -247,12 +247,12 @@#define HWCONFIG_BUFFER_SIZE 256#ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"#else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
include/configs/ls1021atsn.h +1 -1
@@ -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" \
include/configs/ls1021atwr.h +2 -2
@@ -144,7 +144,7 @@#include <config_distro_bootcmd.h> #ifdef CONFIG_LPUART -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \
@@ -200,7 +200,7 @@"cp.b $kernel_addr $load_addr " \ "$kernel_size && bootm $load_addr#$board\0"#else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200 " \ "cma=64M@0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \
include/configs/ls1028aqds.h +2 -2
@@ -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" \
include/configs/ls1028ardb.h +2 -2
@@ -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" \
include/configs/ls1043a_common.h +1 -1
@@ -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" \
include/configs/ls1046a_common.h +1 -1
@@ -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" \
include/configs/ls1088a_common.h +1 -1
@@ -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" \
include/configs/ls1088aqds.h +10 -10
@@ -293,8 +293,8 @@/* Initial environment variables */ #ifdef CONFIG_NXP_ESBC -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \
@@ -325,8 +325,8 @@#define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580A00000 0x580E00000\0" -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \
@@ -387,8 +387,8 @@ "$kernel_size && bootm $kernel_load#$BOARD\0"#else #if defined(CONFIG_QSPI_BOOT ) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \
@@ -405,8 +405,8 @@"fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0"#elif defined(CONFIG_SD_BOOT ) -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \
@@ -423,8 +423,8 @@"fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0"#else /* NOR BOOT */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ COMMON_ENV \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \
include/configs/ls1088ardb.h +3 -3
@@ -234,9 +234,9 @@#endif #endif /* CONFIG_TFABOOT */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS#ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \
@@ -304,7 +304,7 @@" && esbc_validate ${kernelheader_addr_r};" \ "bootm $load_addr#$BOARD\0"#else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "BOARD=ls1088ardb\0" \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \
include/configs/ls2080a_common.h +1 -1
@@ -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" \
include/configs/ls2080aqds.h +5 -5
@@ -226,9 +226,9 @@#define CFG_SYS_I2C_RTC_ADDR 0x68/* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS#ifdef CONFIG_NXP_ESBC -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \
@@ -253,7 +253,7 @@#define IFC_MC_INIT_CMD \ "fsl_mc start mc 0x580a00000" \ " 0x580e00000 \0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "loadaddr_sd=0x90100000\0" \
@@ -309,7 +309,7 @@"$kernel_addr_sd $kernel_size_sd && " \ "bootm $load_addr#$BOARD\0"#elif defined(CONFIG_SD_BOOT ) -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x90100000\0" \ "kernel_addr=0x800\0" \
@@ -325,7 +325,7 @@"fsl_mc start mc 0x80a00000 0x80e00000\0" \ "mcmemsize=0x70000000 \0"#else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "kernel_addr=0x100000\0" \
include/configs/ls2080ardb.h +3 -3
@@ -275,9 +275,9 @@#endif /* Initial environment variables */ -#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CFG_EXTRA_ENV_SETTINGS#ifdef CONFIG_TFABOOT -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \
@@ -339,7 +339,7 @@"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ "bootm $load_addr#$board\0"#else -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \
include/configs/lsxl.h +1 -1
@@ -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" \
include/configs/lx2160aqds.h +1 -1
@@ -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" \
include/configs/lx2160ardb.h +1 -1
@@ -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" \
include/configs/lx2162aqds.h +1 -1
@@ -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" \
include/configs/m53menlo.h +1 -1
@@ -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" \
include/configs/mccmon6.h +1 -1
@@ -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" \
include/configs/meson64.h +2 -2
@@ -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" \
include/configs/meson64_android.h +1 -1
@@ -279,7 +279,7 @@"fi;" \"fi;" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \EXTRA_ANDROID_ENV_SETTINGS \"partitions=" PARTS_DEFAULT "\0" \"mmcdev=2\0" \
include/configs/microblaze-generic.h +2 -2
@@ -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:"\
include/configs/microchip_mpfs_icicle.h +1 -1
@@ -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" \
include/configs/msc_sm2s_imx8mp.h +1 -1
@@ -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" \
include/configs/mt7623.h +1 -1
@@ -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
include/configs/mt8183.h +1 -1
@@ -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
include/configs/mt8512.h +1 -1
@@ -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 \
include/configs/mt8516.h +1 -1
@@ -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
include/configs/mt8518.h +1 -1
@@ -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 \
include/configs/mvebu_alleycat-5.h +1 -1
@@ -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" \
include/configs/mvebu_armada-37xx.h +1 -1
@@ -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" \
include/configs/mvebu_armada-8k.h +1 -1
@@ -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" \
include/configs/mx23_olinuxino.h +1 -1
@@ -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 " \
include/configs/mx23evk.h +1 -1
@@ -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 " \
include/configs/mx28evk.h +1 -1
@@ -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" \
include/configs/mx51evk.h +1 -1
@@ -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" \
include/configs/mx53cx9020.h +1 -1
@@ -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" \
include/configs/mx53loco.h +1 -1
@@ -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" \
include/configs/mx53ppd.h +1 -1
@@ -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" \
include/configs/mx6cuboxi.h +1 -1
@@ -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" \
include/configs/mx6sabre_common.h +1 -1
@@ -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" \
include/configs/mx6slevk.h +1 -1
@@ -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" \
include/configs/mx6sllevk.h +1 -1
@@ -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" \
include/configs/mx6sxsabreauto.h +1 -1
@@ -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" \
include/configs/mx6sxsabresd.h +1 -1
@@ -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" \
include/configs/mx6ul_14x14_evk.h +1 -1
@@ -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" \
include/configs/mx6ullevk.h +1 -1
@@ -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" \
include/configs/mx7dsabresd.h +1 -1
@@ -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 \
include/configs/mx7ulp_com.h +1 -1
@@ -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" \
include/configs/mx7ulp_evk.h +1 -1
@@ -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" \
include/configs/mys_6ulx.h +1 -1
@@ -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" \
include/configs/nas220.h +1 -1
@@ -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"
include/configs/nitrogen6x.h +1 -1
@@ -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" \
include/configs/nokia_rx51.h +1 -1
@@ -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" \
include/configs/novena.h +1 -1
@@ -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" \
include/configs/npi_imx6ull.h +1 -1
@@ -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" \
include/configs/nsa310s.h +1 -1
@@ -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" \
include/configs/o4-imx6ull-nano.h +1 -1
@@ -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" \
include/configs/octeontx2_common.h +1 -1
@@ -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"
include/configs/octeontx_common.h +2 -2
@@ -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"
include/configs/odroid.h +1 -1
@@ -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} " \
include/configs/odroid_xu3.h +2 -2
@@ -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 \
include/configs/omap3_beagle.h +1 -1
@@ -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" \
include/configs/omap3_evm.h +1 -1
@@ -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 \
include/configs/omap3_igep00x0.h +1 -1
@@ -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 \
include/configs/omap3_logic.h +1 -1
@@ -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" \
include/configs/omapl138_lcdk.h +1 -1
@@ -137,7 +137,7 @@#include <environment/ti/mmc.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ "bootpart=0:2\0" \
include/configs/openpiton-riscv64.h +1 -1
@@ -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" \
include/configs/openrd.h +1 -1
@@ -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" \
include/configs/origen.h +1 -1
@@ -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" \
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -393,7 +393,7 @@#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" \
include/configs/pcl063.h +1 -1
@@ -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" \
include/configs/pcl063_ull.h +1 -1
@@ -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" \
include/configs/pcm052.h +1 -1
@@ -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" \
include/configs/pcm058.h +1 -1
@@ -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 \
include/configs/pdu001.h +1 -1
@@ -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" \
include/configs/phycore_am335x_r2.h +1 -1
@@ -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" \
include/configs/phycore_imx8mm.h +1 -1
@@ -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" \
include/configs/phycore_imx8mp.h +1 -1
@@ -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" \
include/configs/pic32mzdask.h +1 -1
@@ -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
include/configs/pico-imx6.h +1 -1
@@ -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 \
include/configs/pico-imx6ul.h +1 -1
@@ -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" \
include/configs/pico-imx7d.h +1 -1
@@ -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" \
include/configs/pico-imx8mq.h +1 -1
@@ -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" \
include/configs/pm9261.h +1 -1
@@ -144,7 +144,7 @@/* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00500000 -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
include/configs/pm9263.h +1 -1
@@ -163,7 +163,7 @@/* USB */ #define CFG_SYS_USB_OHCI_REGS_BASE 0x00a00000/* AT91SAM9263_UHP_BASE */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "partition=nand0,0\0" \ "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
include/configs/pogo_e02.h +1 -1
@@ -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"
include/configs/pogo_v4.h +1 -1
@@ -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" \
include/configs/poleg.h +1 -1
@@ -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" \
include/configs/pomelo.h +1 -1
@@ -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" \
include/configs/poplar.h +1 -1
@@ -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" \
include/configs/porter.h +1 -1
@@ -31,7 +31,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"/* SPL support */
include/configs/presidio_asic.h +1 -1
@@ -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
include/configs/px30_common.h +1 -1
@@ -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 \
include/configs/pxm2.h +1 -1
@@ -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" \
include/configs/qcs404-evb.h +1 -1
@@ -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"
include/configs/qemu-arm.h +1 -1
@@ -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" \
include/configs/qemu-riscv.h +1 -1
@@ -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" \
include/configs/rastaban.h +1 -1
@@ -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" \
include/configs/rcar-gen3-common.h +1 -1
@@ -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 */
include/configs/rk3036_common.h +1 -1
@@ -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 \
include/configs/rk3066_common.h +1 -1
@@ -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 \
include/configs/rk3128_common.h +1 -1
@@ -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 \
include/configs/rk3188_common.h +1 -1
@@ -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" \
include/configs/rk322x_common.h +1 -1
@@ -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 \
include/configs/rk3288_common.h +1 -1
@@ -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" \
include/configs/rk3308_common.h +1 -1
@@ -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 \
include/configs/rk3328_common.h +1 -1
@@ -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 \
include/configs/rk3368_common.h +1 -1
@@ -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
include/configs/rk3399_common.h +1 -1
@@ -34,7 +34,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 \
include/configs/rk3568_common.h +1 -1
@@ -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 \
include/configs/rpi.h +1 -1
@@ -157,7 +157,7 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \
include/configs/rut.h +1 -1
@@ -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" \
include/configs/rv1108_common.h +1 -1
@@ -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 \
include/configs/s5p4418_nanopi2.h +1 -1
@@ -140,7 +140,7 @@#define EXTRA_ENV_BOOT_LOGO EXTRA_ENV_DTB_RESERVE#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "rootdev=" __stringify(CONFIG_ROOT_DEV) "\0" \
include/configs/s5p_goni.h +1 -1
@@ -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" \
include/configs/s5pc210_universal.h +1 -1
@@ -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" \
include/configs/sdm845.h +1 -1
@@ -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" \
include/configs/sheevaplug.h +1 -1
@@ -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" \
include/configs/sifive-unleashed.h +1 -1
@@ -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" \
include/configs/sifive-unmatched.h +1 -1
@@ -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" \
include/configs/silk.h +1 -1
@@ -31,7 +31,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"/* SPL support */
include/configs/sipeed-maix.h +2 -2
@@ -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" \
include/configs/slimbootloader.h +3 -3
@@ -14,10 +14,10 @@"stderr=serial\0" /* -* Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h +* Override CFG_EXTRA_ENV_SETTINGS in x86-common.h */ -#undef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#undef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \
include/configs/smartweb.h +1 -1
@@ -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" \ \
include/configs/smdkc100.h +1 -1
@@ -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" \
include/configs/smegw01.h +1 -1
@@ -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" \
include/configs/snapper9g45.h +1 -1
@@ -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" \
include/configs/sniper.h +1 -1
@@ -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" \
include/configs/socfpga_arria5_secu1.h +1 -1
@@ -52,7 +52,7 @@"develop=" \"tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \FPGA_RMTU_ENV \CONFIG_KM_DEF_ENV_BOOTTARGETS \CONFIG_KM_NEW_ENV \
include/configs/socfpga_chameleonv3.h +1 -1
@@ -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" \
include/configs/socfpga_common.h +2 -2
@@ -144,8 +144,8 @@#include <config_distro_bootcmd.h> -#ifndef CONFIG_EXTRA_ENV_SETTINGS -#define CONFIG_EXTRA_ENV_SETTINGS \ +#ifndef CFG_EXTRA_ENV_SETTINGS +#define CFG_EXTRA_ENV_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "bootm_size=0xa000000\0" \ "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
include/configs/socfpga_dbm_soc1.h +1 -1
@@ -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" \
include/configs/socfpga_mcvevk.h +1 -1
@@ -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" \
include/configs/socfpga_n5x_socdk.h +2 -2
@@ -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" \
include/configs/socfpga_soc64_common.h +1 -1
@@ -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" \
include/configs/socfpga_vining_fpga.h +1 -1
@@ -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" \
include/configs/socrates.h +1 -1
@@ -111,7 +111,7 @@#define CFG_SYS_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "consdev=ttyS0\0" \ "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \
include/configs/somlabs_visionsom_6ull.h +1 -1
@@ -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" \
include/configs/stemmy.h +1 -1
@@ -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 \
include/configs/stih410-b2260.h +1 -1
@@ -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" \
include/configs/stm32f429-discovery.h +1 -1
@@ -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"
include/configs/stm32f429-evaluation.h +1 -1
@@ -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" \
include/configs/stm32f469-discovery.h +1 -1
@@ -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" \
include/configs/stm32f746-disco.h +1 -1
@@ -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" \
include/configs/stm32h743-disco.h +1 -1
@@ -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" \
include/configs/stm32h743-eval.h +1 -1
@@ -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" \
include/configs/stm32h750-art-pi.h +1 -1
@@ -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" \
include/configs/stm32mp13_common.h +1 -1
@@ -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 \
include/configs/stm32mp15_common.h +1 -1
@@ -135,7 +135,7 @@"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R"\0" \"ramdisk_addr_r=" __RAMDISK_ADDR_R"\0" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \STM32MP_MEM_LAYOUT \STM32MP_BOOTCMD \STM32MP_PARTS_DEFAULT \
include/configs/stm32mp15_dh_dhsom.h +1 -1
@@ -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"
include/configs/stm32mp15_st_common.h +3 -3
@@ -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 \
include/configs/stmark2.h +1 -1
@@ -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" \
include/configs/stout.h +1 -1
@@ -35,7 +35,7 @@/* Board Clock */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "bootm_size=0x10000000\0"/* SPL support */
include/configs/sunxi-common.h +1 -1
@@ -318,7 +318,7 @@#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"#endif -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_EXTRA_SETTINGS \
include/configs/synquacer.h +1 -1
@@ -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" \
include/configs/syzygy_hub.h +1 -1
@@ -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" \
include/configs/taurus.h +1 -1
@@ -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" \
include/configs/tbs2910.h +1 -1
@@ -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 " \
include/configs/tegra-common-post.h +1 -1
@@ -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" \
include/configs/ten64.h +2 -2
@@ -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" \
include/configs/theadorable-x86-common.h +2 -2
@@ -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" \
include/configs/theadorable.h +1 -1
@@ -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"
include/configs/thuban.h +1 -1
@@ -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" \
include/configs/thunderx_88xx.h +1 -1
@@ -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"
include/configs/ti816x_evm.h +1 -1
@@ -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 */
include/configs/ti_armv7_keystone2.h +1 -1
@@ -106,7 +106,7 @@"rproc load ${dev_pmmc} ${loadaddr} 0x${filesize}; " \"rproc start ${dev_pmmc}\0" \ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \DEFAULT_LINUX_BOOT_ENV \ENV_KS2_BOARD_SETTINGS \DFUARGS \
include/configs/ti_omap4_common.h +1 -1
@@ -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 \
include/configs/ti_omap5_common.h +1 -1
@@ -247,7 +247,7 @@#include <config_distro_bootcmd.h> -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ DEFAULT_FIT_TI_ARGS \
include/configs/topic_miami.h +2 -2
@@ -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" \
include/configs/total_compute.h +1 -1
@@ -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" \
include/configs/tqma6.h +1 -1
@@ -197,7 +197,7 @@/* set to a resonable value, changeable by user */ #define TQMA6_CMA_SIZE 160M -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "board=tqma6\0" \ "uimage=uImage\0" \ "zimage=zImage\0" \
include/configs/trats.h +1 -1
@@ -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 " \
include/configs/trats2.h +1 -1
@@ -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;" \
Lines of this file are not shown. View the raw message.
include/configs/xilinx_versal_net_mini.h +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
PATCH 26/149 global: Migrate CONFIG_FB_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FB_ADDR to CFG_FB_ADDR
--- drivers/video/nexell_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/nexell_display.c +1 -1
@@ -560,7 +560,7 @@ static int nx_display_bind(struct udevice *dev)/* Datasheet S5p4418: * Resolution up to 2048 x 1280, up to 12 Bit per color (HDMI) * Actual (max.) size is 0x1000000 because in U-Boot nanopi2-2016.01 -* "#define CONFIG_FB_ADDR 0x77000000" and next address is +* "#define CFG_FB_ADDR 0x77000000" and next address is * "#define BMP_LOAD_ADDR 0x78000000" */ plat->size =0x1000000 ;
Signature · 1 line
2.25.1
PATCH 27/149 global: Migrate CONFIG_FEC_ENET_DEV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FEC_ENET_DEV to CFG_FEC_ENET_DEV
--- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/seeed/npi_imx6ull/npi_imx6ull.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/mx6ul_14x14_evk.h | 6 +++--- include/configs/mx6ullevk.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/xpress.h | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-)
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +1 -1
@@ -281,7 +281,7 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#ifdef CONFIG_FEC_MXC -setup_fec (CONFIG_FEC_ENET_DEV ); +setup_fec (CFG_FEC_ENET_DEV );#endif #ifdef CONFIG_USB_EHCI_MX6
board/freescale/mx6ullevk/mx6ullevk.c +1 -1
@@ -110,7 +110,7 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#ifdef CONFIG_FEC_MXC -setup_fec (CONFIG_FEC_ENET_DEV ); +setup_fec (CFG_FEC_ENET_DEV );#endif return 0 ;
board/seeed/npi_imx6ull/npi_imx6ull.c +1 -1
@@ -100,7 +100,7 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#ifdef CONFIG_FEC_MXC -setup_fec (CONFIG_FEC_ENET_DEV ); +setup_fec (CFG_FEC_ENET_DEV );#endif return 0 ;
board/variscite/dart_6ul/dart_6ul.c +1 -1
@@ -147,7 +147,7 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ;#ifdef CONFIG_FEC_MXC -setup_fec (CONFIG_FEC_ENET_DEV ); +setup_fec (CFG_FEC_ENET_DEV );#endif #ifdef CONFIG_NAND_MXS
include/configs/capricorn-common.h +1 -1
@@ -19,7 +19,7 @@#endif /* CONFIG_SPL_BUILD */ /* ENET1 connects to base board and MUX with ESAI */ -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1#define CONFIG_FEC_MXC_PHYADDR 0x0/* EEPROM */
include/configs/dart_6ul.h +1 -1
@@ -18,7 +18,7 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0#endif /* Environment settings */
include/configs/liteboard.h +1 -1
@@ -100,7 +100,7 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0#define CONFIG_FEC_MXC_PHYADDR 0x0#endif
include/configs/mx6ul_14x14_evk.h +3 -3
@@ -121,11 +121,11 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1 -#if (CONFIG_FEC_ENET_DEV ==0 ) +#if (CFG_FEC_ENET_DEV ==0 )#define CONFIG_FEC_MXC_PHYADDR 0x2 -#elif (CONFIG_FEC_ENET_DEV ==1 ) +#elif (CFG_FEC_ENET_DEV ==1 )#define CONFIG_FEC_MXC_PHYADDR 0x1#endif #endif
include/configs/mx6ullevk.h +1 -1
@@ -109,7 +109,7 @@/* environment organization */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1#endif #endif
include/configs/npi_imx6ull.h +1 -1
@@ -36,7 +36,7 @@#define CONFIG_FEC_MXC_PHYADDR 0x1#endif -#define CONFIG_FEC_ENET_DEV 1 +#define CFG_FEC_ENET_DEV 1#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200n8\0" \
include/configs/xpress.h +1 -1
@@ -31,7 +31,7 @@#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_FEC_ENET_DEV 0 +#define CFG_FEC_ENET_DEV 0#define CONFIG_FEC_MXC_PHYADDR 0x0#define CFG_EXTRA_ENV_SETTINGS \
Signature · 1 line
2.25.1
PATCH 28/149 global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FEC_MXC_PHYADDR to CFG_FEC_MXC_PHYADDR
--- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- doc/README.fec_mxc | 2 +- drivers/net/fec_mxc.c | 4 ++-- include/configs/aristainetos2.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 4 ++-- include/configs/nitrogen6x.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/xpress.h | 2 +- 38 files changed, 40 insertions(+), 40 deletions(-)
board/compulab/cl-som-imx7/cl-som-imx7.c +1 -1
@@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis)gpio_set_value (CL_SOM_IMX7_ETH1_PHY_NRST ,1 );/* MAC initialization */ return fecmxc_initialize_multi (bis,CL_SOM_IMX7_FEC_DEV_ID_PRI , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); +CFG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); }/*
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +1 -1
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)setup_fec (); ret =fecmxc_initialize_multi (bis,1 , -CONFIG_FEC_MXC_PHYADDR ,IMX_FEC_BASE ); +CFG_FEC_MXC_PHYADDR ,IMX_FEC_BASE );if (ret)printf ("FEC%d MXC: %s:failed\n" ,1 , __func__);
doc/README.fec_mxc +1 -1
@@ -18,7 +18,7 @@ CONFIG_PHYLIB CONFIG_FEC_MXC_NO_ANEG Relevant only if PHYLIB not used. Skips auto-negotiation restart. -CONFIG_FEC_MXC_PHYADDR +CFG_FEC_MXC_PHYADDR Optional, selects the exact phy address that should be connected and function fecmxc_initialize will try to initialize it.
drivers/net/fec_mxc.c +2 -2
@@ -1086,8 +1086,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)int addr; addr =device_get_phy_addr (priv, dev); -#ifdef CONFIG_FEC_MXC_PHYADDR - addr =CONFIG_FEC_MXC_PHYADDR ; +#ifdef CFG_FEC_MXC_PHYADDR + addr =CFG_FEC_MXC_PHYADDR ;#endif phydev =phy_connect (priv->bus, addr, dev, priv->interface);
include/configs/aristainetos2.h +1 -1
@@ -26,7 +26,7 @@/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#ifdef CONFIG_IMX_HAB #define HAB_EXTRA_SETTINGS \
include/configs/capricorn-common.h +1 -1
@@ -20,7 +20,7 @@/* ENET1 connects to base board and MUX with ESAI */ #define CFG_FEC_ENET_DEV 1 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0/* EEPROM */ #define EEPROM_I2C_BUS 0/* I2C0 */
include/configs/cgtqmx8.h +1 -1
@@ -118,6 +118,6 @@#define PHYS_SDRAM_2_SIZE 0x100000000/* 4 GB */ /* Networking */ -#define CONFIG_FEC_MXC_PHYADDR -1 +#define CFG_FEC_MXC_PHYADDR -1#endif /* __CGTQMX8_H */
include/configs/cl-som-imx7.h +1 -1
@@ -13,7 +13,7 @@#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR/* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0/* ENET1 */ #define IMX_FEC_BASE ENET_IPS_BASE_ADDR
include/configs/cm_fx6.h +1 -1
@@ -132,7 +132,7 @@/* APBH DMA is required for NAND support */ /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/imx6_logic.h +1 -1
@@ -19,7 +19,7 @@/* Ethernet Configs */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
include/configs/imx6dl-mamoj.h +1 -1
@@ -40,7 +40,7 @@/* MMC */ /* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1/* USB */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/imx8mm-cl-iot-gate.h +1 -1
@@ -136,7 +136,7 @@#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/imx8mm_evk.h +1 -1
@@ -61,6 +61,6 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x80000000/* 2GB DDR */ -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#endif
include/configs/imx8mp_evk.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)#if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#define PHY_ANEG_TIMEOUT 20000
include/configs/imx8mp_icore_mx8mp.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)#if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#define DWC_NET_PHYADDR 1
include/configs/imx8mp_rsb3720.h +1 -1
@@ -39,7 +39,7 @@/* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 4 +#define CFG_FEC_MXC_PHYADDR 4#define PHY_ANEG_TIMEOUT 20000
include/configs/imx8mq_evk.h +1 -1
@@ -24,7 +24,7 @@/* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#endif #define BOOT_TARGET_DEVICES (func) \
include/configs/imx8mq_phanbell.h +1 -1
@@ -21,7 +21,7 @@/* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#endif #define CONFIG_MFG_ENV_SETTINGS \
include/configs/imx8ulp_evk.h +1 -1
@@ -21,7 +21,7 @@#if defined(CONFIG_FEC_MXC )#define PHY_ANEG_TIMEOUT 20000 -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#endif #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/kontron_pitx_imx8m.h +1 -1
@@ -25,7 +25,7 @@/* ENET1 Config */ #if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0#define PHY_ANEG_TIMEOUT 20000
include/configs/liteboard.h +1 -1
@@ -102,7 +102,7 @@#ifdef CONFIG_CMD_NET #define CFG_FEC_ENET_DEV 0 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0#endif #endif
include/configs/m53menlo.h +1 -1
@@ -54,7 +54,7 @@* Ethernet on SOC (FEC) */ #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0#endif #define CFG_SYS_RTC_BUS_NUM 1/* I2C2 */
include/configs/mccmon6.h +1 -1
@@ -31,7 +31,7 @@#define CFG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) }/* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#define CFG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200 quiet\0" \
include/configs/msc_sm2s_imx8mp.h +1 -1
@@ -17,7 +17,7 @@#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)#if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#define PHY_ANEG_TIMEOUT 20000#endif
include/configs/mx6sxsabreauto.h +1 -1
@@ -93,7 +93,7 @@/* Network */ #define IMX_FEC_BASE ENET2_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/mx6sxsabresd.h +1 -1
@@ -115,7 +115,7 @@/* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1#ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/mx6ul_14x14_evk.h +2 -2
@@ -124,9 +124,9 @@#define CFG_FEC_ENET_DEV 1#if (CFG_FEC_ENET_DEV ==0 ) -#define CONFIG_FEC_MXC_PHYADDR 0x2 +#define CFG_FEC_MXC_PHYADDR 0x2#elif (CFG_FEC_ENET_DEV ==1 ) -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1#endif #endif
include/configs/nitrogen6x.h +1 -1
@@ -18,7 +18,7 @@#define CFG_SYS_FSL_USDHC_NUM 2#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_MXC_PHYADDR 6 +#define CFG_FEC_MXC_PHYADDR 6/* USB Configs */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/npi_imx6ull.h +1 -1
@@ -33,7 +33,7 @@#define CONFIG_MXC_USB_FLAGS 0#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1#endif #define CFG_FEC_ENET_DEV 1
include/configs/pico-imx6.h +1 -1
@@ -98,6 +98,6 @@/* Environment organization */ /* Ethernet Configuration */ -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#endif /* __CONFIG_H * */
include/configs/pico-imx6ul.h +1 -1
@@ -15,7 +15,7 @@/* Network support */ -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR
include/configs/pico-imx8mq.h +1 -1
@@ -21,7 +21,7 @@/* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET ) -#define CONFIG_FEC_MXC_PHYADDR 1 +#define CFG_FEC_MXC_PHYADDR 1#endif /* Initial environment variables */
include/configs/somlabs_visionsom_6ull.h +1 -1
@@ -66,7 +66,7 @@#endif #ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC_PHYADDR 0x1 +#define CFG_FEC_MXC_PHYADDR 0x1#endif #endif
include/configs/tqma6_mba6.h +1 -1
@@ -9,7 +9,7 @@#ifndef __CONFIG_TQMA6_MBA6_H#define __CONFIG_TQMA6_MBA6_H -#define CONFIG_FEC_MXC_PHYADDR 0x03 +#define CFG_FEC_MXC_PHYADDR 0x03#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1"
include/configs/tqma6_wru4.h +1 -1
@@ -7,7 +7,7 @@#define __CONFIG_TQMA6_WRU4_H/* Ethernet */ -#define CONFIG_FEC_MXC_PHYADDR 0x01 +#define CFG_FEC_MXC_PHYADDR 0x01/* UART */ #define CONFIG_MXC_UART_BASE UART4_BASE
include/configs/vf610twr.h +1 -1
@@ -21,7 +21,7 @@#define CFG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_FEC_MXC_PHYADDR 0 +#define CFG_FEC_MXC_PHYADDR 0/* I2C Configs */
include/configs/vining_2000.h +1 -1
@@ -34,7 +34,7 @@#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08/* Network */ -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0
include/configs/xpress.h +1 -1
@@ -32,7 +32,7 @@#define CONFIG_MXC_USB_FLAGS 0#define CFG_FEC_ENET_DEV 0 -#define CONFIG_FEC_MXC_PHYADDR 0x0 +#define CFG_FEC_MXC_PHYADDR 0x0#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
Signature · 1 line
2.25.1
PATCH 29/149 global: Migrate CONFIG_FLASH_BR_PRELIM to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FLASH_BR_PRELIM to CFG_FLASH_BR_PRELIM
--- include/configs/p1_p2_rdb_pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -188,7 +188,7 @@#define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE#endif -#define CONFIG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ +#define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ | BR_PS_16 | BR_V)#define CONFIG_FLASH_OR_PRELIM 0xfc000ff7
Signature · 1 line
2.25.1
PATCH 30/149 global: Migrate CONFIG_FLASH_OR_PRELIM to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FLASH_OR_PRELIM to CFG_FLASH_OR_PRELIM
--- include/configs/p1_p2_rdb_pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/p1_p2_rdb_pc.h +1 -1
@@ -191,7 +191,7 @@#define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \ | BR_PS_16 | BR_V) -#define CONFIG_FLASH_OR_PRELIM 0xfc000ff7 +#define CFG_FLASH_OR_PRELIM 0xfc000ff7#define CFG_SYS_FLASH_BANKS_LIST {CFG_SYS_FLASH_BASE_PHYS}
Signature · 1 line
2.25.1
PATCH 31/149 global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FM_PLAT_CLK_DIV to CFG_FM_PLAT_CLK_DIV
--- arch/powerpc/cpu/mpc85xx/speed.c | 6 +++--- arch/powerpc/include/asm/config_mpc85xx.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
@@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info) [14] = 4, /* CC4 PPL / 4 */ };uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS ]; -#if !defined(CONFIG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV ) +#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV )uint rcw_tmp;#endif uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS ];
@@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)#define FM1_CLK_SEL 0x1c000000#define FM1_CLK_SHIFT 26#endif -#if !defined(CONFIG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV ) +#if !defined(CFG_FM_PLAT_CLK_DIV ) || !defined(CONFIG_PME_PLAT_CLK_DIV )#if defined(CONFIG_ARCH_T1024 ) rcw_tmp =in_be32 (&gur->rcwsr[15 ]) -4 ;#else
@@ -377,7 +377,7 @@ void get_sys_info(sys_info_t *sys_info)#endif #ifdef CONFIG_SYS_DPAA_FMAN -#ifndef CONFIG_FM_PLAT_CLK_DIV +#ifndef CFG_FM_PLAT_CLK_DIV switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) { case 1: sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK];
arch/powerpc/include/asm/config_mpc85xx.h +2 -2
@@ -147,8 +147,8 @@#define CONFIG_PME_PLAT_CLK_DIV 2#define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 -#define CONFIG_FM_PLAT_CLK_DIV 1 -#define CFG_SYS_FM1_CLK CONFIG_FM_PLAT_CLK_DIV +#define CFG_FM_PLAT_CLK_DIV 1 +#define CFG_SYS_FM1_CLK CFG_FM_PLAT_CLK_DIV#define CFG_SYS_FM_MURAM_SIZE 0x30000#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define QE_MURAM_SIZE 0x6000UL
Signature · 1 line
2.25.1
PATCH 32/149 global: Migrate CONFIG_FPGA_DELAY to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FPGA_DELAY to CFG_FPGA_DELAY
--- README | 2 +- drivers/fpga/ACEX1K.c | 22 ++++++++++----------- drivers/fpga/cyclon2.c | 12 ++++++------ drivers/fpga/spartan2.c | 42 ++++++++++++++++++++--------------------- drivers/fpga/spartan3.c | 42 ++++++++++++++++++++--------------------- drivers/fpga/virtex2.c | 24 +++++++++++------------ 6 files changed, 72 insertions(+), 72 deletions(-)
README +1 -1
@@ -1018,7 +1018,7 @@ The following options need to be configured: will require a board or device specific function to be written. - CONFIG_FPGA_DELAY + CFG_FPGA_DELAY If defined, a function that provides delays in the FPGA configuration driver.
drivers/fpga/ACEX1K.c +11 -11
@@ -17,11 +17,11 @@/* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). -* If there is a need to operate slower, define CONFIG_FPGA_DELAY in +* If there is a need to operate slower, define CFG_FPGA_DELAY in * the board config file to slow things down. */ -#ifndef CONFIG_FPGA_DELAY -#define CONFIG_FPGA_DELAY () +#ifndef CFG_FPGA_DELAY +#define CFG_FPGA_DELAY ()#endif #ifndef CFG_SYS_FPGA_WAIT
@@ -137,7 +137,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)/* Wait for nSTATUS to be released (i.e. deasserted) */ ts =get_timer (0 );/* get current time */ do { - CONFIG_FPGA_DELAY (); + CFG_FPGA_DELAY (); if (get_timer (ts) > CFG_SYS_FPGA_WAIT) { /* check the time */ puts ("** Timeout waiting for STATUS to go high.\n"); (*fn->abort) (cookie);
@@ -147,7 +147,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize) }while ((*fn->status) (cookie));/* Get ready for the burn */ -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();/* Load the data */ while (bytecount < bsize) {
@@ -172,13 +172,13 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)do {/* Deassert the clock */ (*fn->clk) (false, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();/* Write data */ (*fn->data) ((val &0x01 ), true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();/* Assert the clock */ (*fn->clk) (true, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); val >>=1 ; i --; }while (i >0 );
@@ -189,7 +189,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)#endif } -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK putc (' ' );/* terminate the dotted line */
@@ -210,9 +210,9 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)*/ for (i =0 ; i <12 ; i++) { -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk) (true, true, cookie);/* Assert the clock pin */ -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk) (false, true, cookie);/* Deassert the clock pin */ }
drivers/fpga/cyclon2.c +6 -6
@@ -15,11 +15,11 @@/* Note: The assumption is that we cannot possibly run fast enough to * overrun the device (the Slave Parallel mode can free run at 50MHz). -* If there is a need to operate slower, define CONFIG_FPGA_DELAY in +* If there is a need to operate slower, define CFG_FPGA_DELAY in * the board config file to slow things down. */ -#ifndef CONFIG_FPGA_DELAY -#define CONFIG_FPGA_DELAY () +#ifndef CFG_FPGA_DELAY +#define CFG_FPGA_DELAY ()#endif #ifndef CFG_SYS_FPGA_WAIT
@@ -129,7 +129,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)/* Wait for nSTATUS to be asserted */ ts =get_timer (0 );/* get current time */ do { - CONFIG_FPGA_DELAY(); + CFG_FPGA_DELAY(); if (get_timer(ts) > CFG_SYS_FPGA_WAIT) { /* check the time */ puts("** Timeout waiting for STATUS to go high.\n");
@@ -139,7 +139,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize) }while (!(*fn->status) (cookie));/* Get ready for the burn */ -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); ret = (*fn->write) (buf, bsize, true, cookie);if (ret) {
@@ -151,7 +151,7 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)puts (" OK? ..." );#endif -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK putc (' ' );/* terminate the dotted line */
drivers/fpga/spartan2.c +21 -21
128 lines not on this page · raw message
drivers/fpga/spartan3.c +21 -21
128 lines not on this page · raw message
drivers/fpga/virtex2.c +12 -12
@@ -22,13 +22,13 @@/* * If the SelectMap interface can be overrun by the processor, enable -* CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board +* CONFIG_SYS_FPGA_CHECK_BUSY and/or define CFG_FPGA_DELAY in the board * configuration file and add board-specific support for checking BUSY status. * By default, assume that the SelectMap interface cannot be overrun. */ -#ifndef CONFIG_FPGA_DELAY -#define CONFIG_FPGA_DELAY () +#ifndef CFG_FPGA_DELAY +#define CFG_FPGA_DELAY ()#endif /*
@@ -196,7 +196,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie) }while (!(*fn->init)(cookie)); (*fn->pgm)(false, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();if (fn->clk) (*fn->clk)(true, true, cookie);
@@ -205,7 +205,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)*/ ts =get_timer (0 ); do { - CONFIG_FPGA_DELAY(); + CFG_FPGA_DELAY(); if (get_timer(ts) > CFG_SYS_FPGA_WAIT_INIT) { printf("%s:%d: ** Timeout after %d ticks waiting for INIT to deassert.\n", __func__, __LINE__, CFG_SYS_FPGA_WAIT_INIT);
@@ -233,7 +233,7 @@ static int virtex2_slave_post(xilinx_virtex2_slave_fns *fn,/* * Finished writing the data; deassert FPGA CS_B and WRITE_B signals. */ -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();if (fn->cs) (*fn->cs)(false, true, cookie);if (fn->wr)
@@ -269,9 +269,9 @@ static int virtex2_slave_post(xilinx_virtex2_slave_fns *fn, (*fn->wbulkdata)(&dummy,1 , true, cookie); }else { (*fn->wdata)(0xff , true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk)(false, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk)(true, true, cookie); } }
@@ -335,13 +335,13 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)#endif (*fn->wdata)(data[bytecount++], true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY ();/* * Cycle the clock pin */ (*fn->clk)(false, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk)(true, true, cookie);#ifdef CONFIG_SYS_FPGA_CHECK_BUSY
@@ -472,9 +472,9 @@ static int virtex2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)for (bit =7 ; bit >=0 ; --bit) {unsigned char curr_bit = (curr_data >> bit) &1 ; (*fn->wdata)(curr_bit, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk)(false, true, cookie); -CONFIG_FPGA_DELAY (); +CFG_FPGA_DELAY (); (*fn->clk)(true, true, cookie); }
Signature · 1 line
2.25.1
PATCH 33/149 global: Migrate CONFIG_FSL_PMIC_BITLEN to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_PMIC_BITLEN to CFG_FSL_PMIC_BITLEN
--- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/power_fsl.c +1 -1
@@ -42,7 +42,7 @@ int pmic_init(unsigned char bus) p->hw.spi.cs =CONFIG_FSL_PMIC_CS ; p->hw.spi.clk =CONFIG_FSL_PMIC_CLK ; p->hw.spi.mode =CONFIG_FSL_PMIC_MODE ; - p->hw.spi.bitlen =CONFIG_FSL_PMIC_BITLEN ; + p->hw.spi.bitlen =CFG_FSL_PMIC_BITLEN ; p->hw.spi.flags =SPI_XFER_BEGIN |SPI_XFER_END ; p->hw.spi.prepare_tx = pmic_spi_prepare_tx;#elif defined(CONFIG_POWER_I2C )
include/configs/mx51evk.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 2500000#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) -#define CONFIG_FSL_PMIC_BITLEN 32 +#define CFG_FSL_PMIC_BITLEN 32/* * MMC Configs
Signature · 1 line
2.25.1
PATCH 34/149 global: Migrate CONFIG_FSL_PMIC_BUS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_PMIC_BUS to CFG_FSL_PMIC_BUS
--- board/freescale/mx51evk/mx51evk.c | 2 +- include/configs/mx51evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
board/freescale/mx51evk/mx51evk.c +1 -1
@@ -86,7 +86,7 @@ static void power_init(void)struct pmic *p;int ret; - ret =pmic_init (CONFIG_FSL_PMIC_BUS ); + ret =pmic_init (CFG_FSL_PMIC_BUS );if (ret)return ;
include/configs/mx51evk.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_MXC_UART_BASE UART1_BASE/* PMIC Controller */ -#define CONFIG_FSL_PMIC_BUS 0 +#define CFG_FSL_PMIC_BUS 0#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 2500000#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
Signature · 1 line
2.25.1
PATCH 35/149 global: Migrate CONFIG_FSL_PMIC_CLK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_PMIC_CLK to CFG_FSL_PMIC_CLK
--- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/power_fsl.c +1 -1
@@ -40,7 +40,7 @@ int pmic_init(unsigned char bus)#if defined(CONFIG_POWER_SPI ) p->interface =PMIC_SPI ; p->hw.spi.cs =CONFIG_FSL_PMIC_CS ; - p->hw.spi.clk =CONFIG_FSL_PMIC_CLK ; + p->hw.spi.clk =CFG_FSL_PMIC_CLK ; p->hw.spi.mode =CONFIG_FSL_PMIC_MODE ; p->hw.spi.bitlen =CFG_FSL_PMIC_BITLEN ; p->hw.spi.flags =SPI_XFER_BEGIN |SPI_XFER_END ;
include/configs/mx51evk.h +1 -1
@@ -23,7 +23,7 @@/* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0#define CONFIG_FSL_PMIC_CS 0 -#define CONFIG_FSL_PMIC_CLK 2500000 +#define CFG_FSL_PMIC_CLK 2500000#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CFG_FSL_PMIC_BITLEN 32
Signature · 1 line
2.25.1
PATCH 36/149 global: Migrate CONFIG_FSL_PMIC_CS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_PMIC_CS to CFG_FSL_PMIC_CS
--- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/power_fsl.c +1 -1
@@ -39,7 +39,7 @@ int pmic_init(unsigned char bus)#if defined(CONFIG_POWER_SPI ) p->interface =PMIC_SPI ; - p->hw.spi.cs =CONFIG_FSL_PMIC_CS ; + p->hw.spi.cs =CFG_FSL_PMIC_CS ; p->hw.spi.clk =CFG_FSL_PMIC_CLK ; p->hw.spi.mode =CONFIG_FSL_PMIC_MODE ; p->hw.spi.bitlen =CFG_FSL_PMIC_BITLEN ;
include/configs/mx51evk.h +1 -1
@@ -22,7 +22,7 @@/* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0 -#define CONFIG_FSL_PMIC_CS 0 +#define CFG_FSL_PMIC_CS 0#define CFG_FSL_PMIC_CLK 2500000#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CFG_FSL_PMIC_BITLEN 32
Signature · 1 line
2.25.1
PATCH 37/149 global: Migrate CONFIG_FSL_PMIC_MODE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_PMIC_MODE to CFG_FSL_PMIC_MODE
--- drivers/power/power_fsl.c | 2 +- include/configs/mx51evk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/power_fsl.c +1 -1
@@ -41,7 +41,7 @@ int pmic_init(unsigned char bus) p->interface =PMIC_SPI ; p->hw.spi.cs =CFG_FSL_PMIC_CS ; p->hw.spi.clk =CFG_FSL_PMIC_CLK ; - p->hw.spi.mode =CONFIG_FSL_PMIC_MODE ; + p->hw.spi.mode =CFG_FSL_PMIC_MODE ; p->hw.spi.bitlen =CFG_FSL_PMIC_BITLEN ; p->hw.spi.flags =SPI_XFER_BEGIN |SPI_XFER_END ; p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
include/configs/mx51evk.h +1 -1
@@ -24,7 +24,7 @@#define CFG_FSL_PMIC_BUS 0#define CFG_FSL_PMIC_CS 0#define CFG_FSL_PMIC_CLK 2500000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH) +#define CFG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CFG_FSL_PMIC_BITLEN 32/*
Signature · 1 line
2.25.1
PATCH 38/149 global: Migrate CONFIG_FSL_SERDES1 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_SERDES1 to CFG_FSL_SERDES1
--- board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++-- include/configs/MPC837XERDB.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
board/freescale/mpc837xerdb/mpc837xerdb.c +2 -2
@@ -146,7 +146,7 @@ int board_early_init_f(void)/* we check only part num, and don't look for CPU revisions */ switch (PARTID_NO_E (spridr)) {case SPR_8377 : -fsl_setup_serdes (CONFIG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA , +fsl_setup_serdes (CFG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );fsl_setup_serdes (CONFIG_FSL_SERDES2 ,FSL_SERDES_PROTO_PEX ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );
@@ -156,7 +156,7 @@ int board_early_init_f(void) FSL_SERDES_CLK_100, FSL_SERDES_VDD_1V);break ;case SPR_8379 : -fsl_setup_serdes (CONFIG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA , +fsl_setup_serdes (CFG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );fsl_setup_serdes (CONFIG_FSL_SERDES2 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );
include/configs/MPC837XERDB.h +1 -1
@@ -149,7 +149,7 @@#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)/* SERDES */ -#define CONFIG_FSL_SERDES1 0xe3000 +#define CFG_FSL_SERDES1 0xe3000#define CONFIG_FSL_SERDES2 0xe3100/* I2C */
Signature · 1 line
2.25.1
PATCH 39/149 global: Migrate CONFIG_FSL_SERDES2 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FSL_SERDES2 to CFG_FSL_SERDES2
--- board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++--- include/configs/MPC837XERDB.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
board/freescale/mpc837xerdb/mpc837xerdb.c +3 -3
@@ -148,17 +148,17 @@ int board_early_init_f(void)case SPR_8377 :fsl_setup_serdes (CFG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V ); -fsl_setup_serdes (CONFIG_FSL_SERDES2 ,FSL_SERDES_PROTO_PEX , +fsl_setup_serdes (CFG_FSL_SERDES2 ,FSL_SERDES_PROTO_PEX ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );break ;case SPR_8378 : -fsl_setup_serdes (CONFIG_FSL_SERDES2 ,FSL_SERDES_PROTO_PEX , +fsl_setup_serdes (CFG_FSL_SERDES2 ,FSL_SERDES_PROTO_PEX ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );break ;case SPR_8379 :fsl_setup_serdes (CFG_FSL_SERDES1 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V ); -fsl_setup_serdes (CONFIG_FSL_SERDES2 ,FSL_SERDES_PROTO_SATA , +fsl_setup_serdes (CFG_FSL_SERDES2 ,FSL_SERDES_PROTO_SATA ,FSL_SERDES_CLK_100 ,FSL_SERDES_VDD_1V );break ;default :
include/configs/MPC837XERDB.h +1 -1
@@ -150,7 +150,7 @@/* SERDES */ #define CFG_FSL_SERDES1 0xe3000 -#define CONFIG_FSL_SERDES2 0xe3100 +#define CFG_FSL_SERDES2 0xe3100/* I2C */ #define CFG_SYS_I2C_NOPROBES { {0, 0x51} }
Signature · 1 line
2.25.1
PATCH 40/149 global: Migrate CONFIG_FTRTC010_EXTCLK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FTRTC010_EXTCLK to CFG_FTRTC010_EXTCLK
--- drivers/rtc/ftrtc010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/ftrtc010.c +1 -1
@@ -82,7 +82,7 @@ int rtc_get(struct rtc_time *tmp)#ifdef CONFIG_FTRTC010_PCLK now = (ftrtc010_time () +readl (&rtc->record)) /RTC_DIV_COUNT ; -#else /* CONFIG_FTRTC010_EXTCLK */ +#else /* CFG_FTRTC010_EXTCLK */ now =ftrtc010_time () +readl (&rtc->record);#endif
Signature · 1 line
2.25.1
PATCH 41/149 global: Migrate CONFIG_FTRTC010_PCLK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_FTRTC010_PCLK to CFG_FTRTC010_PCLK
--- drivers/rtc/ftrtc010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/ftrtc010.c +1 -1
@@ -80,7 +80,7 @@ int rtc_get(struct rtc_time *tmp)debug ("%s(): record register: %x\n" , __func__,readl (&rtc->record)); -#ifdef CONFIG_FTRTC010_PCLK +#ifdef CFG_FTRTC010_PCLK now = (ftrtc010_time () +readl (&rtc->record)) /RTC_DIV_COUNT ;#else /* CFG_FTRTC010_EXTCLK */ now =ftrtc010_time () +readl (&rtc->record);
Signature · 1 line
2.25.1
PATCH 42/149 global: Migrate CONFIG_HW_ENV_SETTINGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_HW_ENV_SETTINGS to CFG_HW_ENV_SETTINGS
--- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +2 -2
@@ -214,7 +214,7 @@"protect on " __stringify(ENV_DEL_ADDR ) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" -#define CONFIG_HW_ENV_SETTINGS \ +#define CFG_HW_ENV_SETTINGS \"hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \"asrc,spdif,lpuart1,ftm1\0"
@@ -222,7 +222,7 @@#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ CONFIG_KM_DEF_ENV \ - CONFIG_HW_ENV_SETTINGS \ + CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "ethrotate=no\0" \ ""
include/configs/kmcent2.h +2 -2
@@ -421,7 +421,7 @@ int get_scl(void);"fpgacfg=true\0" \ "" -#define CONFIG_HW_ENV_SETTINGS \ +#define CFG_HW_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \ "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0"
@@ -443,7 +443,7 @@ int get_scl(void);CONFIG_KM_DEF_ENV \ CONFIG_KM_DEF_ARCH \CONFIG_KM_NEW_ENV \ - CONFIG_HW_ENV_SETTINGS \ + CFG_HW_ENV_SETTINGS \"EEprom_ivm=pca9547:70:9\0" \""
Signature · 1 line
2.25.1
PATCH 43/149 global: Migrate CONFIG_I2C_MULTI_BUS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_I2C_MULTI_BUS to CFG_I2C_MULTI_BUS
--- README | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/sniper.h | 2 +- include/configs/tqma6.h | 2 +- include/i2c.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
README +1 -1
@@ -955,7 +955,7 @@ The following options need to be configured: You should define these to the GPIO value as given directly to the generic GPIO functions. - CONFIG_I2C_MULTI_BUS + CFG_I2C_MULTI_BUS This option allows the use of multiple I2C buses, each of which must have a controller. At any point in time, only one bus is
include/configs/omap3_beagle.h +1 -1
@@ -29,7 +29,7 @@#endif /* CONFIG_MTD_RAW_NAND */ /* Enable Multi Bus support for I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* DSS Support */
include/configs/sniper.h +1 -1
@@ -38,7 +38,7 @@* I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* * Input
include/configs/tqma6.h +1 -1
@@ -28,7 +28,7 @@#define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K/* I2C Configs */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS #if !defined(CONFIG_DM_PMIC )#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
include/i2c.h +1 -1
@@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void);* only for backwardcompatibility, should go away if we switched * completely to new multibus support. */ -#if CONFIG_IS_ENABLED (SYS_I2C_LEGACY ) || defined(CONFIG_I2C_MULTI_BUS ) +#if CONFIG_IS_ENABLED (SYS_I2C_LEGACY ) || defined(CFG_I2C_MULTI_BUS )# if !defined(CFG_SYS_MAX_I2C_BUS )# define CFG_SYS_MAX_I2C_BUS 2# endif
Signature · 1 line
2.25.1
PATCH 44/149 global: Migrate CONFIG_I2C_MVTWSI_BASE0 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_I2C_MVTWSI_BASE0 to CFG_I2C_MVTWSI_BASE0
--- arch/arm/include/asm/arch-sunxi/i2c.h | 2 +- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- drivers/i2c/mvtwsi.c | 6 +++--- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/theadorable.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/include/asm/arch-sunxi/i2c.h +1 -1
@@ -8,7 +8,7 @@#include <asm/arch/cpu.h> #ifdef CONFIG_I2C0_ENABLE -#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE +#define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE#endif #ifdef CONFIG_I2C1_ENABLE #define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE
arch/arm/mach-kirkwood/include/mach/config.h +1 -1
@@ -24,7 +24,7 @@#include <asm/arch/soc.h> -#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 KW_TWSI_BASE#define MV_UART_CONSOLE_BASE KW_UART0_BASE#define MV_SATA_BASE KW_SATA_BASE#define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET
drivers/i2c/mvtwsi.c +3 -3
@@ -197,9 +197,9 @@ inline uint calc_tick(uint speed)static struct mvtwsi_registers *twsi_get_base (struct i2c_adapter *adap) {switch (adap->hwadapnr) { -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 case 0 : -return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0 ; +return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0 ;#endif #ifdef CONFIG_I2C_MVTWSI_BASE1 case 1 :
@@ -737,7 +737,7 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr, 10000); } -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed,
include/configs/db-88f6720.h +1 -1
@@ -17,7 +17,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */
include/configs/db-88f6820-gp.h +1 -1
@@ -11,7 +11,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* Environment in SPI NOR flash */
include/configs/db-mv784mp-gp.h +1 -1
@@ -13,7 +13,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */
include/configs/ds414.h +1 -1
@@ -17,7 +17,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* * mv-common.h should be defined after CMD configs since it used them
include/configs/maxbcm.h +1 -1
@@ -19,7 +19,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* SPI NOR flash default params, used by sf commands */
include/configs/theadorable.h +1 -1
@@ -25,7 +25,7 @@*/ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE/* USB/EHCI configuration */
Signature · 1 line
2.25.1
PATCH 45/149 global: Migrate CONFIG_I2C_MVTWSI_BASE1 to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_I2C_MVTWSI_BASE1 to CFG_I2C_MVTWSI_BASE1
--- arch/arm/include/asm/arch-sunxi/i2c.h | 2 +- drivers/i2c/mvtwsi.c | 6 +++--- include/configs/theadorable.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/include/asm/arch-sunxi/i2c.h +1 -1
@@ -11,7 +11,7 @@#define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE#endif #ifdef CONFIG_I2C1_ENABLE -#define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE +#define CFG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE#endif #ifdef CONFIG_R_I2C_ENABLE #define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
drivers/i2c/mvtwsi.c +3 -3
@@ -201,9 +201,9 @@ static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)case 0 :return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0 ;#endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 case 1 : -return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1 ; +return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1 ;#endif #ifdef CONFIG_I2C_MVTWSI_BASE2 case 2 :
@@ -743,7 +743,7 @@ U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_set_bus_speed, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)#endif -#ifdef CONFIG_I2C_MVTWSI_BASE1 +#ifdef CFG_I2C_MVTWSI_BASE1 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed,
include/configs/theadorable.h +1 -1
@@ -26,7 +26,7 @@/* I2C */ #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE +#define CFG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE/* USB/EHCI configuration */
Signature · 1 line
2.25.1
PATCH 46/149 global: Migrate CONFIG_ICS307_REFCLK_HZ to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_ICS307_REFCLK_HZ to CFG_ICS307_REFCLK_HZ
--- board/freescale/common/ics307_clk.c | 4 ++-- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
board/freescale/common/ics307_clk.c +2 -2
@@ -50,7 +50,7 @@ static u8 ics307_s_to_od[] = {*/ unsigned long ics307_sysclk_calculator (unsigned long out_freq) { -const unsigned long input_freq =CONFIG_ICS307_REFCLK_HZ ; +const unsigned long input_freq =CFG_ICS307_REFCLK_HZ ;unsigned long vdw, rdw, odp, s_vdw =0 , s_rdw =0 , s_odp =0 , od;unsigned long tmp_out, diff, result =0 ;int found =0 ;
@@ -101,7 +101,7 @@ unsigned long ics307_sysclk_calculator(unsigned long out_freq)*/ static unsigned long ics307_clk_freq (u8 cw0,u8 cw1,u8 cw2) { -const unsigned long input_freq =CONFIG_ICS307_REFCLK_HZ ; +const unsigned long input_freq =CFG_ICS307_REFCLK_HZ ;unsigned long vdw = ((cw1 <<1 ) &0x1FE ) + ((cw2 >>7 ) &1 );unsigned long rdw = cw2 &0x7F ;unsigned long od = ics307_s_to_od[cw0 &0x7 ];
include/configs/T208xQDS.h +1 -1
@@ -13,7 +13,7 @@#include <linux/stringify.h> -#define CONFIG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ /* High Level Configuration Options */
include/configs/T208xRDB.h +1 -1
@@ -13,7 +13,7 @@#include <linux/stringify.h> -#define CONFIG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ /* High Level Configuration Options */
include/configs/T4240RDB.h +1 -1
@@ -12,7 +12,7 @@#include <linux/stringify.h> -#define CONFIG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ +#define CFG_ICS307_REFCLK_HZ 25000000/* ICS307 ref clk freq */ #ifdef CONFIG_RAMBOOT_PBL #ifndef CONFIG_SDCARD
Signature · 1 line
2.25.1
PATCH 47/149 global: Migrate CONFIG_IMX6_PWM_PER_CLK to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_IMX6_PWM_PER_CLK to CFG_IMX6_PWM_PER_CLK
--- drivers/pwm/pwm-imx.c | 2 +- include/configs/vining_2000.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-imx.c +1 -1
@@ -76,7 +76,7 @@ int pwm_imx_get_parms(int period_ns, int duty_ns, unsigned long *period_c,* value here as a define. Replace it when we have the clock * framework. */ - c =CONFIG_IMX6_PWM_PER_CLK ; + c =CFG_IMX6_PWM_PER_CLK ; c = c * period_ns;do_div (c,1000000000 ); *period_c = c;
include/configs/vining_2000.h +1 -1
@@ -43,7 +43,7 @@#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)#endif -#define CONFIG_IMX6_PWM_PER_CLK 66000000 +#define CFG_IMX6_PWM_PER_CLK 66000000#ifdef CONFIG_ENV_IS_IN_MMC /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */
Signature · 1 line
2.25.1
PATCH 48/149 global: Migrate CONFIG_IRAM_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_IRAM_BASE to CFG_IRAM_BASE
--- arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +- include/configs/px30_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rv1108_common.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/include/asm/arch-rockchip/bootrom.h +1 -1
@@ -57,6 +57,6 @@ extern const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1];/** * Locations of the boot-device identifier in SRAM */ -#define BROM_BOOTSOURCE_ID_ADDR (CONFIG_IRAM_BASE + 0x10) +#define BROM_BOOTSOURCE_ID_ADDR (CFG_IRAM_BASE + 0x10)#endif
include/configs/px30_common.h +1 -1
@@ -9,7 +9,7 @@#include "rockchip-common.h" /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */ -#define CONFIG_IRAM_BASE 0xff020000 +#define CFG_IRAM_BASE 0xff020000#define GICD_BASE 0xff131000#define GICC_BASE 0xff132000
include/configs/rk3066_common.h +1 -1
@@ -9,7 +9,7 @@#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000#define CFG_SYS_SDRAM_BASE 0x60000000#define SDRAM_BANK_SIZE (1024UL << 20UL)
include/configs/rk3128_common.h +1 -1
@@ -10,7 +10,7 @@#define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000/* RAW SD card / eMMC locations. */
include/configs/rk3188_common.h +1 -1
@@ -9,7 +9,7 @@#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000/* spl size 32kb sram - 2kb bootrom */
include/configs/rk322x_common.h +1 -1
@@ -10,7 +10,7 @@#define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000#define CFG_SYS_SDRAM_BASE 0x60000000#define SDRAM_BANK_SIZE (512UL << 20UL)
include/configs/rk3288_common.h +1 -1
@@ -11,7 +11,7 @@#define CFG_SYS_HZ_CLOCK 24000000 -#define CONFIG_IRAM_BASE 0xff700000 +#define CFG_IRAM_BASE 0xff700000/* RAW SD card / eMMC locations. */
include/configs/rk3308_common.h +1 -1
@@ -8,7 +8,7 @@#include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xfff80000 +#define CFG_IRAM_BASE 0xfff80000#define CFG_SYS_SDRAM_BASE 0#define SDRAM_MAX_SIZE 0xff000000
include/configs/rk3328_common.h +1 -1
@@ -8,7 +8,7 @@#include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xff090000 +#define CFG_IRAM_BASE 0xff090000/* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0
include/configs/rk3368_common.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_SDRAM_BASE 0#define SDRAM_MAX_SIZE 0xff000000 -#define CONFIG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000#define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \
include/configs/rk3399_common.h +1 -1
@@ -8,7 +8,7 @@#include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xff8c0000 +#define CFG_IRAM_BASE 0xff8c0000/* FAT sd card locations. */ #define CFG_SYS_SDRAM_BASE 0
include/configs/rk3568_common.h +1 -1
@@ -8,7 +8,7 @@#include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0xfdcc0000 +#define CFG_IRAM_BASE 0xfdcc0000#define CFG_SYS_SDRAM_BASE 0#define SDRAM_MAX_SIZE 0xf0000000
include/configs/rv1108_common.h +1 -1
@@ -8,7 +8,7 @@#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" -#define CONFIG_IRAM_BASE 0x10080000 +#define CFG_IRAM_BASE 0x10080000#define CFG_SYS_TIMER_RATE (24 * 1000 * 1000)/* TIMER1,initialized by ddr initialize code */
Signature · 1 line
2.25.1
PATCH 49/149 global: Migrate CONFIG_IRAM_TOP to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_IRAM_TOP to CFG_IRAM_TOP
--- arch/arm/mach-exynos/lowlevel_init.c | 2 +- arch/arm/mach-exynos/sec_boot.S | 2 +- include/configs/exynos5420-common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +1 -1
@@ -51,7 +51,7 @@ enum {#ifdef CONFIG_EXYNOS5420 /* Address for relocating helper code (Last 4 KB of IRAM) */ -#define EXYNOS_RELOCATE_CODE_BASE (CONFIG_IRAM_TOP - 0x1000) +#define EXYNOS_RELOCATE_CODE_BASE (CFG_IRAM_TOP - 0x1000)/* * Power up secondary CPUs.
arch/arm/mach-exynos/sec_boot.S +1 -1
@@ -21,7 +21,7 @@ relocate_wait_code: .ltorg /* * Secondary core waits here until Primary wake it up. - * Below code is copied to (CONFIG_IRAM_TOP - 0x1000) + * Below code is copied to (CFG_IRAM_TOP - 0x1000) * This is a workaround code which is supposed to act as a * substitute/supplement to the iROM code. *
include/configs/exynos5420-common.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_EXYNOS5420_H#define __CONFIG_EXYNOS5420_H -#define CONFIG_IRAM_TOP 0x02074000 +#define CFG_IRAM_TOP 0x02074000#define CONFIG_PHY_IRAM_BASE 0x02020000
Signature · 1 line
2.25.1
PATCH 50/149 global: Migrate CONFIG_KM_DEF_ARCH to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_DEF_ARCH to CFG_KM_DEF_ARCH
--- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
include/configs/km/km-mpc83xx.h +3 -3
@@ -78,13 +78,13 @@#define CONFIG_KM_DEF_ENV "km-common=empty\0"#endif -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0"#endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \
include/configs/kmcent2.h +3 -3
@@ -435,13 +435,13 @@ int get_scl(void); " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0"#endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \
Signature · 1 line
2.25.1
PATCH 51/149 global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG_KM_DEF_BOOT_ARGS_CPU
--- include/configs/km/keymile-common.h | 2 +- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
include/configs/km/keymile-common.h +1 -1
@@ -98,7 +98,7 @@CONFIG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\" " CONFIG_KM_UBI_LINUX_MTD " " \ -CONFIG_KM_DEF_BOOT_ARGS_CPU \ +CFG_KM_DEF_BOOT_ARGS_CPU \"\0" \"addpanic=" \"setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \
include/configs/km/km-powerpc.h +1 -1
@@ -28,7 +28,7 @@#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)/* architecture specific default bootargs */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#define CFG_KM_DEF_BOOT_ARGS_CPU ""#define CONFIG_KM_DEF_ENV_CPU \ "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \
include/configs/km/pg-wcom-ls102xa.h +2 -2
@@ -176,8 +176,8 @@#define CONFIG_KM_DEF_ENV #endif -#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#ifndef CFG_KM_DEF_BOOT_ARGS_CPU +#define CFG_KM_DEF_BOOT_ARGS_CPU ""#endif #define CONFIG_KM_DEF_ENV_CPU \
include/configs/kmcent2.h +1 -1
@@ -15,7 +15,7 @@* than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot * parameters */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" +#define CFG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558"#include "km/keymile-common.h"
Signature · 1 line
2.25.1
PATCH 52/149 global: Migrate CONFIG_KM_DEF_ENV et al to CFG
In reply to Tom RiniPerform simple renames of:
CONFIG_KM_DEF_ENV to CFG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS to CFG_KM_DEF_ENV_BOOTARGS CONFIG_KM_DEF_ENV_BOOTPARAMS to CFG_KM_DEF_ENV_BOOTPARAMS CONFIG_KM_DEF_ENV_BOOTTARGETS to CFG_KM_DEF_ENV_BOOTTARGETS CONFIG_KM_DEF_ENV_CONSTANTS to CFG_KM_DEF_ENV_CONSTANTS CONFIG_KM_DEF_ENV_CPU to CFG_KM_DEF_ENV_CPU CONFIG_KM_DEF_ENV_FLASH_BOOT to CFG_KM_DEF_ENV_FLASH_BOOT CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG_KM_DEV_ENV_FLASH_BOOT_UBI
--- include/configs/km/keymile-common.h | 36 +++++++++++++------------- include/configs/km/km-mpc83xx.h | 6 ++--- include/configs/km/km-powerpc.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 8 +++--- include/configs/kmcent2.h | 8 +++--- include/configs/socfpga_arria5_secu1.h | 4 +-- 6 files changed, 32 insertions(+), 32 deletions(-)
include/configs/km/keymile-common.h +18 -18
@@ -15,8 +15,8 @@#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS -#define CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV_BOOTPARAMS +#define CFG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0"#endif
@@ -34,7 +34,7 @@# define CONFIG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */
@@ -44,7 +44,7 @@"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \CONFIG_KM_UBI_PART_BOOT_OPTS " " \"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ +# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \"ubiattach=if test ${boot_bank} -eq 0; then; " \"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
@@ -65,7 +65,7 @@* available targets: * - 'release': for a standalone system kernel/rootfs from flash */ -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \ "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ "set_fdthigh cramfsloadkernel flashargs add_default " \ "addpanic boot\0" \
@@ -88,7 +88,7 @@* - 'flashargs': defaults arguments for flash base boot * */ -#define CONFIG_KM_DEF_ENV_BOOTARGS \ +#define CFG_KM_DEF_ENV_BOOTARGS \ "add_default=" \ "setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
@@ -120,12 +120,12 @@* processor specific settings * - 'cramfsloadfdt': copy fdt from a cramfs to ram */ -#define CONFIG_KM_DEF_ENV_FLASH_BOOT \ +#define CFG_KM_DEF_ENV_FLASH_BOOT \ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI + CFG_KM_DEV_ENV_FLASH_BOOT_UBI/* * constants
@@ -133,7 +133,7 @@* * - 'default': setup default environment */ -#define CONFIG_KM_DEF_ENV_CONSTANTS \ +#define CFG_KM_DEF_ENV_CONSTANTS \ "backup_bank=0\0" \ "release=run newenv; reset\0" \ "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \
@@ -142,15 +142,15 @@"env_version=1\0" \ "" -#ifndef CONFIG_KM_DEF_ENV -#define CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ENV_BOOTPARAMS \ +#ifndef CFG_KM_DEF_ENV +#define CFG_KM_DEF_ENV \ + CFG_KM_DEF_ENV_BOOTPARAMS \ "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \ - CONFIG_KM_DEF_ENV_CPU \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_DEF_ENV_BOOTARGS \ - CONFIG_KM_DEF_ENV_FLASH_BOOT \ - CONFIG_KM_DEF_ENV_CONSTANTS \ + CFG_KM_DEF_ENV_CPU \ + CFG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTARGS \ + CFG_KM_DEF_ENV_FLASH_BOOT \ + CFG_KM_DEF_ENV_CONSTANTS \ "altbootcmd=run bootcmd\0" \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "bootcmd=km_checkbidhwk && " \
@@ -169,6 +169,6 @@ "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \"load=tftpboot ${load_addr_r} ${u-boot}\0" \ "" -#endif /* CONFIG_KM_DEF_ENV */ +#endif /* CFG_KM_DEF_ENV */ #endif /* __CONFIG_KEYMILE_H */
include/configs/km/km-mpc83xx.h +3 -3
@@ -74,8 +74,8 @@/* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV "km-common=empty\0" +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV "km-common=empty\0"#endif #ifndef CFG_KM_DEF_ARCH
@@ -83,7 +83,7 @@#endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \
include/configs/km/km-powerpc.h +1 -1
@@ -30,7 +30,7 @@/* architecture specific default bootargs */ #define CFG_KM_DEF_BOOT_ARGS_CPU "" -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \ "update=" \ "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
include/configs/km/pg-wcom-ls102xa.h +4 -4
@@ -172,15 +172,15 @@#define CFG_ENV_TOTAL_SIZE 0x40000#define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND/* direct for newenv */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #ifndef CFG_KM_DEF_BOOT_ARGS_CPU #define CFG_KM_DEF_BOOT_ARGS_CPU ""#endif -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \
@@ -221,7 +221,7 @@#define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_NEW_ENV \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "ethrotate=no\0" \
include/configs/kmcent2.h +4 -4
@@ -388,13 +388,13 @@ int get_scl(void);/* * Environment Configuration */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV +#ifndef CFG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CFG_KM_DEF_ENV #endif #define __USB_PHY_TYPE utmi -#define CONFIG_KM_DEF_ENV_CPU \ +#define CFG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \
@@ -440,7 +440,7 @@ int get_scl(void);#endif #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ + CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \
include/configs/socfpga_arria5_secu1.h +2 -2
@@ -46,7 +46,7 @@"newenv=" \"nand erase 0x100000 0x40000\0" -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ +#define CFG_KM_DEF_ENV_BOOTTARGETS \"release=" \"run newenv; reset\0" \"develop=" \
@@ -54,7 +54,7 @@#define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ + CFG_KM_DEF_ENV_BOOTTARGETS \ CONFIG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \
Signature · 1 line
2.25.1
PATCH 53/149 global: Migrate CONFIG_KM_ECC_MODE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_ECC_MODE to CFG_KM_ECC_MODE
--- include/configs/km/keymile-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/km/keymile-common.h +3 -3
@@ -52,10 +52,10 @@#ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" -#define CONFIG_KM_ECC_MODE " eccmode=bch" +#define CFG_KM_ECC_MODE " eccmode=bch"#else #define CONFIG_KM_UIMAGE_NAME "uImage\0" -#define CONFIG_KM_ECC_MODE +#define CFG_KM_ECC_MODE #endif /*
@@ -95,7 +95,7 @@":${hostname}:${netdev}:off:" \" console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \" mem=${kernelmem} init=${init}" \ -CONFIG_KM_ECC_MODE \ +CFG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\" " CONFIG_KM_UBI_LINUX_MTD " " \CFG_KM_DEF_BOOT_ARGS_CPU \
Signature · 1 line
2.25.1
PATCH 54/149 global: Migrate CONFIG_KM_NEW_ENV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_NEW_ENV to CFG_KM_NEW_ENV
--- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- include/configs/socfpga_arria5_secu1.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +2 -2
@@ -206,7 +206,7 @@"checkfdt=true\0" \ "" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \
@@ -220,7 +220,7 @@"asrc,spdif,lpuart1,ftm1\0" #define CFG_EXTRA_ENV_SETTINGS \ -CONFIG_KM_NEW_ENV \ +CFG_KM_NEW_ENV \CFG_KM_DEF_ENV \CFG_HW_ENV_SETTINGS \"EEprom_ivm=pca9547:70:9\0" \
include/configs/kmcent2.h +2 -2
@@ -426,7 +426,7 @@ int get_scl(void); "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \
@@ -442,7 +442,7 @@ int get_scl(void);#define CFG_EXTRA_ENV_SETTINGS \ CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ ""
include/configs/socfpga_arria5_secu1.h +2 -2
@@ -42,7 +42,7 @@"_fpga_loadsafe=echo Loading FPGA SAFE image..." \" && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \"newenv=" \"nand erase 0x100000 0x40000\0"
@@ -55,7 +55,7 @@#define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CFG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ "bootlimit=6\0" \
Signature · 1 line
2.25.1
PATCH 55/149 global: Migrate CONFIG_KM_UBI_LINUX_MTD to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_UBI_LINUX_MTD to CFG_KM_UBI_LINUX_MTD
--- include/configs/km/keymile-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/km/keymile-common.h +3 -3
@@ -31,7 +31,7 @@#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -# define CONFIG_KM_UBI_LINUX_MTD \ +# define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \
@@ -40,7 +40,7 @@/* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ /* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ -# define CONFIG_KM_UBI_LINUX_MTD \ +# define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
@@ -97,7 +97,7 @@" mem=${kernelmem} init=${init}" \CFG_KM_ECC_MODE \ " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ -" " CONFIG_KM_UBI_LINUX_MTD " " \ +" " CFG_KM_UBI_LINUX_MTD " " \CFG_KM_DEF_BOOT_ARGS_CPU \"\0" \"addpanic=" \
Signature · 1 line
2.25.1
PATCH 56/149 global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_APP to CFG_KM_UBI_PARTITION_NAME_APP
--- include/configs/km/keymile-common.h | 12 ++++++------ include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
include/configs/km/keymile-common.h +6 -6
@@ -28,7 +28,7 @@#define CONFIG_KM_UBI_PART_BOOT_OPTS ""#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ -#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP +#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \
@@ -36,19 +36,19 @@ CONFIG_KM_UBI_PART_BOOT_OPTS# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" -#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ +#else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ +/* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ + "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0" +#endif /* CFG_KM_UBI_PARTITION_NAME_APP */ #ifdef CONFIG_NAND_ECC_BCH #define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0"
include/configs/kmcoge5ne.h +1 -1
@@ -12,7 +12,7 @@#define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE/* PRIO_BASE_ADDRESS */ #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* include common defines/options for all Keymile boards */ #include "km/keymile-common.h"
include/configs/pg-wcom-expu1.h +1 -1
@@ -9,7 +9,7 @@#define WCOM_EXPU1 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* CLIPS FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00)
include/configs/pg-wcom-seli8.h +1 -1
@@ -7,7 +7,7 @@#define __CONFIG_PG_WCOM_SELI8_H#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" +#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* PAXK FPGA Definitions */ #define CFG_SYS_CSPR3_EXT (0x00)
Signature · 1 line
2.25.1
PATCH 57/149 global: Migrate CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_UBI_PARTITION_NAME_BOOT to CFG_KM_UBI_PARTITION_NAME_BOOT
--- include/configs/km/keymile-common.h | 18 +++++++++--------- include/configs/kmcoge5ne.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
include/configs/km/keymile-common.h +9 -9
@@ -20,9 +20,9 @@ "actual_bank=0\0"#endif -#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +#ifndef CFG_KM_UBI_PARTITION_NAME_BOOT +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */ #ifndef CONFIG_KM_UBI_PART_BOOT_OPTS #define CONFIG_KM_UBI_PART_BOOT_OPTS ""
@@ -30,23 +30,23 @@#ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" + "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"#else /* CFG_KM_UBI_PARTITION_NAME_APP */ /* two flash chips called boot and app */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ +/* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ /* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ + "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ CONFIG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ + "ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ "ubi part " CFG_KM_UBI_PARTITION_NAME_APP "; fi\0"#endif /* CFG_KM_UBI_PARTITION_NAME_APP */
include/configs/kmcoge5ne.h +1 -1
@@ -11,7 +11,7 @@#define NAND_MAX_CHIPS 1#define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE/* PRIO_BASE_ADDRESS */ -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0"#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* include common defines/options for all Keymile boards */
include/configs/pg-wcom-expu1.h +1 -1
@@ -8,7 +8,7 @@#define WCOM_EXPU1 -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0"#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* CLIPS FPGA Definitions */
include/configs/pg-wcom-seli8.h +1 -1
@@ -6,7 +6,7 @@#ifndef __CONFIG_PG_WCOM_SELI8_H#define __CONFIG_PG_WCOM_SELI8_H -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0"#define CFG_KM_UBI_PARTITION_NAME_APP "ubi1"/* PAXK FPGA Definitions */
Signature · 1 line
2.25.1
PATCH 58/149 global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_UBI_PART_BOOT_OPTS to CFG_KM_UBI_PART_BOOT_OPTS
--- include/configs/km/keymile-common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/configs/km/keymile-common.h +5 -5
@@ -24,16 +24,16 @@#define CFG_KM_UBI_PARTITION_NAME_BOOT "ubi0"#endif /* CFG_KM_UBI_PARTITION_NAME_BOOT */ -#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS -#define CONFIG_KM_UBI_PART_BOOT_OPTS "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ +#ifndef CFG_KM_UBI_PART_BOOT_OPTS +#define CFG_KM_UBI_PART_BOOT_OPTS "" +#endif /* CFG_KM_UBI_PART_BOOT_OPTS */ #ifndef CFG_KM_UBI_PARTITION_NAME_APP /* one flash chip only called boot */ /* boot: CFG_KM_UBI_PARTITION_NAME_BOOT */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS + CFG_KM_UBI_PART_BOOT_OPTS# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=ubi part " CFG_KM_UBI_PARTITION_NAME_BOOT "\0"#else /* CFG_KM_UBI_PARTITION_NAME_APP */
@@ -42,7 +42,7 @@/* app: CFG_KM_UBI_PARTITION_NAME_APP */ # define CFG_KM_UBI_LINUX_MTD \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ + CFG_KM_UBI_PART_BOOT_OPTS " " \ "ubi.mtd=" CFG_KM_UBI_PARTITION_NAME_APP# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI \ "ubiattach=if test ${boot_bank} -eq 0; then; " \
Signature · 1 line
2.25.1
PATCH 59/149 global: Migrate CONFIG_KM_UIMAGE_NAME to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KM_UIMAGE_NAME to CFG_KM_UIMAGE_NAME
--- include/configs/km/keymile-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/km/keymile-common.h +3 -3
@@ -51,10 +51,10 @@#endif /* CFG_KM_UBI_PARTITION_NAME_APP */ #ifdef CONFIG_NAND_ECC_BCH -#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" +#define CFG_KM_UIMAGE_NAME "ecc_bch_uImage\0"#define CFG_KM_ECC_MODE " eccmode=bch"#else -#define CONFIG_KM_UIMAGE_NAME "uImage\0" +#define CFG_KM_UIMAGE_NAME "uImage\0"#define CFG_KM_ECC_MODE #endif
@@ -124,7 +124,7 @@ "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ -"uimage=" CONFIG_KM_UIMAGE_NAME \ +"uimage=" CFG_KM_UIMAGE_NAME \CFG_KM_DEV_ENV_FLASH_BOOT_UBI /*
Signature · 1 line
2.25.1
PATCH 60/149 global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_CPSW_NUM_PORTS to CFG_KSNET_CPSW_NUM_PORTS
--- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +1 -1
@@ -117,7 +117,7 @@ struct mac_sl_cfg {#define CPSW_CTL_VLAN_AWARE BIT(1)#define CPSW_CTL_FIFO_LOOPBACK BIT(0) -#define DEVICE_CPSW_NUM_PORTS CONFIG_KSNET_CPSW_NUM_PORTS +#define DEVICE_CPSW_NUM_PORTS CFG_KSNET_CPSW_NUM_PORTS#define DEVICE_N_GMACSL_PORTS (DEVICE_CPSW_NUM_PORTS - 1)#ifdef CONFIG_KSNET_NETCP_V1_0
include/configs/k2e_evm.h +1 -1
@@ -37,6 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_CPSW_NUM_PORTS 9 +#define CFG_KSNET_CPSW_NUM_PORTS 9#endif /* __CONFIG_K2E_EVM_H */
include/configs/k2g_evm.h +1 -1
@@ -51,7 +51,7 @@"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0" /* Network */ -#define CONFIG_KSNET_CPSW_NUM_PORTS 2 +#define CFG_KSNET_CPSW_NUM_PORTS 2#define PHY_ANEG_TIMEOUT 10000/* PHY needs longer aneg time */ #define SPI_MTD_PARTS KEYSTONE_SPI1_MTD_PARTS
include/configs/k2hk_evm.h +1 -1
@@ -37,6 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5#endif /* __CONFIG_K2HK_EVM_H */
include/configs/k2l_evm.h +1 -1
@@ -37,6 +37,6 @@#define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS/* Network */ -#define CONFIG_KSNET_CPSW_NUM_PORTS 5 +#define CFG_KSNET_CPSW_NUM_PORTS 5#endif /* __CONFIG_K2L_EVM_H */
Signature · 1 line
2.25.1
PATCH 61/149 global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_MAC_ID_BASE to CFG_KSNET_MAC_ID_BASE
--- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +1 -1
@@ -49,7 +49,7 @@#define KEYSTONE2_EMAC_GIG_ENABLE -#define MAC_ID_BASE_ADDR CONFIG_KSNET_MAC_ID_BASE +#define MAC_ID_BASE_ADDR CFG_KSNET_MAC_ID_BASE/* MDIO module input frequency */ #ifdef CONFIG_SOC_K2G
include/configs/ti_armv7_keystone2.h +1 -1
@@ -47,7 +47,7 @@#define CFG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6)/* Keystone net */ -#define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR +#define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR#define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE
Signature · 1 line
2.25.1
PATCH 62/149 global: Migrate CONFIG_KSNET_NETCP_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_NETCP_BASE to CFG_KSNET_NETCP_BASE
--- arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++---- include/configs/ti_armv7_keystone2.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +4 -4
@@ -18,7 +18,7 @@/* EMAC */ #ifdef CONFIG_KSNET_NETCP_V1_0 -#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00090000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00090000)#define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x900)#define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x300)#define EMAC_SGMII_BASE_ADDR (GBETH_BASE + 0x100)
@@ -32,7 +32,7 @@#elif definedCONFIG_KSNET_NETCP_V1_5 -#define GBETH_BASE (CONFIG_KSNET_NETCP_BASE + 0x00200000) +#define GBETH_BASE (CFG_KSNET_NETCP_BASE + 0x00200000)#define CPGMACSL_REG_RX_PRI_MAP 0x020#define EMAC_EMACSL_BASE_ADDR (GBETH_BASE + 0x22000)#define EMAC_MDIO_BASE_ADDR (GBETH_BASE + 0x00f00)
@@ -190,14 +190,14 @@ struct mac_sl_cfg {/* PSS */ #ifdef CONFIG_KSNET_NETCP_V1_0 -#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x604) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x604)#define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x06060606#define hw_config_streaming_switch ()\ writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);#elif definedCONFIG_KSNET_NETCP_V1_5 -#define DEVICE_PSTREAM_CFG_REG_ADDR (CONFIG_KSNET_NETCP_BASE + 0x500) +#define DEVICE_PSTREAM_CFG_REG_ADDR (CFG_KSNET_NETCP_BASE + 0x500)#define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI 0x0#define hw_config_streaming_switch ()\
include/configs/ti_armv7_keystone2.h +1 -1
@@ -48,7 +48,7 @@/* Keystone net */ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR -#define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE +#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE#define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES
Signature · 1 line
2.25.1
PATCH 63/149 global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG_KSNET_SERDES_LANES_PER_SGMII
--- drivers/net/ti/keystone_net.c | 4 ++-- include/configs/ti_armv7_keystone2.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ti/keystone_net.c +2 -2
@@ -372,12 +372,12 @@ static void keystone2_net_serdes_setup(void) {ks2_serdes_init (CONFIG_KSNET_SERDES_SGMII_BASE , &ks2_serdes_sgmii_156p25mhz, -CONFIG_KSNET_SERDES_LANES_PER_SGMII ); +CFG_KSNET_SERDES_LANES_PER_SGMII );#if defined(CONFIG_SOC_K2E ) || defined(CONFIG_SOC_K2L )ks2_serdes_init (CONFIG_KSNET_SERDES_SGMII2_BASE , &ks2_serdes_sgmii_156p25mhz, -CONFIG_KSNET_SERDES_LANES_PER_SGMII ); +CFG_KSNET_SERDES_LANES_PER_SGMII );#endif /* wait till setup */
include/configs/ti_armv7_keystone2.h +1 -1
@@ -51,7 +51,7 @@#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE -#define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES +#define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES/* EEPROM definitions */
Signature · 1 line
2.25.1
PATCH 64/149 global: Migrate CONFIG_KSNET_SERDES_SGMII2_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_SERDES_SGMII2_BASE to CFG_KSNET_SERDES_SGMII2_BASE
--- drivers/net/ti/keystone_net.c | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ti/keystone_net.c +1 -1
@@ -375,7 +375,7 @@ static void keystone2_net_serdes_setup(void) CFG_KSNET_SERDES_LANES_PER_SGMII);#if defined(CONFIG_SOC_K2E ) || defined(CONFIG_SOC_K2L ) -ks2_serdes_init (CONFIG_KSNET_SERDES_SGMII2_BASE , +ks2_serdes_init (CFG_KSNET_SERDES_SGMII2_BASE , &ks2_serdes_sgmii_156p25mhz,CFG_KSNET_SERDES_LANES_PER_SGMII );#endif
include/configs/ti_armv7_keystone2.h +1 -1
@@ -50,7 +50,7 @@#define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE -#define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE +#define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE#define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES/* EEPROM definitions */
Signature · 1 line
2.25.1
PATCH 65/149 global: Migrate CONFIG_KSNET_SERDES_SGMII_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_KSNET_SERDES_SGMII_BASE to CFG_KSNET_SERDES_SGMII_BASE
--- drivers/net/ti/keystone_net.c | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ti/keystone_net.c +1 -1
@@ -370,7 +370,7 @@ struct ks2_serdes ks2_serdes_sgmii_156p25mhz = {#ifndef CONFIG_SOC_K2G static void keystone2_net_serdes_setup (void ) { -ks2_serdes_init (CONFIG_KSNET_SERDES_SGMII_BASE , +ks2_serdes_init (CFG_KSNET_SERDES_SGMII_BASE , &ks2_serdes_sgmii_156p25mhz,CFG_KSNET_SERDES_LANES_PER_SGMII );
include/configs/ti_armv7_keystone2.h +1 -1
@@ -49,7 +49,7 @@/* Keystone net */ #define CFG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR#define CFG_KSNET_NETCP_BASE KS2_NETCP_BASE -#define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE +#define CFG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE#define CFG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE#define CFG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES
Signature · 1 line
2.25.1
PATCH 66/149 global: Migrate CONFIG_LEGACY_BOOTCMD_ENV to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LEGACY_BOOTCMD_ENV to CFG_LEGACY_BOOTCMD_ENV
--- include/configs/pic32mzdask.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/pic32mzdask.h +2 -2
@@ -52,7 +52,7 @@"fdt_addr_r=0x89d00000\0" \"scriptaddr=0x88300000\0" \ -#define CONFIG_LEGACY_BOOTCMD_ENV \ +#define CFG_LEGACY_BOOTCMD_ENV \"legacy_bootcmd= " \"if load mmc 0 ${scriptaddr} uEnv.txt; then " \"env import -tr ${scriptaddr} ${filesize}; " \
@@ -71,7 +71,7 @@#define CFG_EXTRA_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - CONFIG_LEGACY_BOOTCMD_ENV \ + CFG_LEGACY_BOOTCMD_ENV \ BOOTENV#endif /* __PIC32MZDASK_CONFIG_H */
Signature · 1 line
2.25.1
PATCH 67/149 global: Migrate CONFIG_LOWPOWER_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LOWPOWER_ADDR to CFG_LOWPOWER_ADDR
--- arch/arm/mach-exynos/lowlevel_init.c | 2 +- include/configs/exynos5420-common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +1 -1
@@ -161,7 +161,7 @@ static void secondary_cores_configure(void)/* set lowpower flag and address */ writel (CPU_RST_FLAG_VAL ,CONFIG_LOWPOWER_FLAG ); -writel ((uint32_t )&low_power_start,CONFIG_LOWPOWER_ADDR ); +writel ((uint32_t )&low_power_start,CFG_LOWPOWER_ADDR );writel (CPU_RST_FLAG_VAL ,EXYNOS5420_SPARE_BASE );/* Store jump address for power down */ writel ((uint32_t )&power_down_core,CONFIG_PHY_IRAM_BASE +0x4 );
include/configs/exynos5420-common.h +1 -1
@@ -16,6 +16,6 @@* Low Power settings */ #define CONFIG_LOWPOWER_FLAG 0x02020028 -#define CONFIG_LOWPOWER_ADDR 0x0202002C +#define CFG_LOWPOWER_ADDR 0x0202002C#endif /* __CONFIG_EXYNOS5420_H */
Signature · 1 line
2.25.1
PATCH 68/149 global: Migrate CONFIG_LOWPOWER_FLAG to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LOWPOWER_FLAG to CFG_LOWPOWER_FLAG
--- arch/arm/mach-exynos/lowlevel_init.c | 4 ++-- include/configs/exynos5420-common.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +2 -2
@@ -73,7 +73,7 @@ static void low_power_start(void) reg_val =readl (EXYNOS5420_SPARE_BASE );if (reg_val !=CPU_RST_FLAG_VAL ) { -writel (0x0 ,CONFIG_LOWPOWER_FLAG ); +writel (0x0 ,CFG_LOWPOWER_FLAG );branch_bx (0x0 ); }
@@ -160,7 +160,7 @@ static void secondary_cores_configure(void)writel (0x0 , (EXYNOS_RELOCATE_CODE_BASE +0x1C ));/* set lowpower flag and address */ -writel (CPU_RST_FLAG_VAL ,CONFIG_LOWPOWER_FLAG ); +writel (CPU_RST_FLAG_VAL ,CFG_LOWPOWER_FLAG );writel ((uint32_t )&low_power_start,CFG_LOWPOWER_ADDR );writel (CPU_RST_FLAG_VAL ,EXYNOS5420_SPARE_BASE );/* Store jump address for power down */
include/configs/exynos5420-common.h +1 -1
@@ -15,7 +15,7 @@/* * Low Power settings */ -#define CONFIG_LOWPOWER_FLAG 0x02020028 +#define CFG_LOWPOWER_FLAG 0x02020028#define CFG_LOWPOWER_ADDR 0x0202002C#endif /* __CONFIG_EXYNOS5420_H */
Signature · 1 line
2.25.1
PATCH 69/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY to CFG_LPC32XX_NAND_MLC_BUSY_DELAY
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -142,7 +142,7 @@ static void lpc32xx_nand_init(void) writel( clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | + clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) |
include/configs/work_92105.h +1 -1
@@ -28,7 +28,7 @@*/ #define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 -#define CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 +#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000#define CONFIG_LPC32XX_NAND_MLC_NAND_TA 18181818#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545
Signature · 1 line
2.25.1
PATCH 70/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_NAND_TA to CFG_LPC32XX_NAND_MLC_NAND_TA
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -143,7 +143,7 @@ static void lpc32xx_nand_init(void) writel( clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | - clkdiv(CONFIG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | + clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) | clkdiv(CONFIG_LPC32XX_NAND_MLC_RD_LOW, 0x0F, 8) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_HIGH, 0x0F, 4) |
include/configs/work_92105.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000 -#define CONFIG_LPC32XX_NAND_MLC_NAND_TA 18181818 +#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000
Signature · 1 line
2.25.1
PATCH 71/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_RD_HIGH to CFG_LPC32XX_NAND_MLC_RD_HIGH
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -144,7 +144,7 @@ static void lpc32xx_nand_init(void)clkdiv (CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY ,0x03 ,24 ) |clkdiv (CFG_LPC32XX_NAND_MLC_BUSY_DELAY ,0x1F ,19 ) |clkdiv (CFG_LPC32XX_NAND_MLC_NAND_TA ,0x07 ,16 ) | -clkdiv (CONFIG_LPC32XX_NAND_MLC_RD_HIGH ,0x0F ,12 ) | +clkdiv (CFG_LPC32XX_NAND_MLC_RD_HIGH ,0x0F ,12 ) |clkdiv (CONFIG_LPC32XX_NAND_MLC_RD_LOW ,0x0F ,8 ) |clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_HIGH ,0x0F ,4 ) | clkdiv(CONFIG_LPC32XX_NAND_MLC_WR_LOW, 0x0F, 0),
include/configs/work_92105.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818 -#define CONFIG_LPC32XX_NAND_MLC_RD_HIGH 31250000 +#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000#define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333
Signature · 1 line
2.25.1
PATCH 72/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_RD_LOW to CFG_LPC32XX_NAND_MLC_RD_LOW
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -145,7 +145,7 @@ static void lpc32xx_nand_init(void)clkdiv (CFG_LPC32XX_NAND_MLC_BUSY_DELAY ,0x1F ,19 ) |clkdiv (CFG_LPC32XX_NAND_MLC_NAND_TA ,0x07 ,16 ) |clkdiv (CFG_LPC32XX_NAND_MLC_RD_HIGH ,0x0F ,12 ) | -clkdiv (CONFIG_LPC32XX_NAND_MLC_RD_LOW ,0x0F ,8 ) | +clkdiv (CFG_LPC32XX_NAND_MLC_RD_LOW ,0x0F ,8 ) |clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_HIGH ,0x0F ,4 ) |clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_LOW ,0x0F ,0 ), &lpc32xx_nand_mlc_registers->time_reg);
include/configs/work_92105.h +1 -1
@@ -31,7 +31,7 @@#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000 -#define CONFIG_LPC32XX_NAND_MLC_RD_LOW 45454545 +#define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000#define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333
Signature · 1 line
2.25.1
PATCH 73/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY to CFG_LPC32XX_NAND_MLC_TCEA_DELAY
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -141,7 +141,7 @@ static void lpc32xx_nand_init(void) clk =get_hclk_clk_rate (); writel( - clkdiv(CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | + clkdiv(CFG_LPC32XX_NAND_MLC_TCEA_DELAY, 0x03, 24) | clkdiv(CFG_LPC32XX_NAND_MLC_BUSY_DELAY, 0x1F, 19) | clkdiv(CFG_LPC32XX_NAND_MLC_NAND_TA, 0x07, 16) | clkdiv(CFG_LPC32XX_NAND_MLC_RD_HIGH, 0x0F, 12) |
include/configs/work_92105.h +1 -1
@@ -27,7 +27,7 @@* NAND chip timings for FIXME: which one? */ -#define CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333 +#define CFG_LPC32XX_NAND_MLC_TCEA_DELAY 333333333#define CFG_LPC32XX_NAND_MLC_BUSY_DELAY 10000000#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000
Signature · 1 line
2.25.1
PATCH 74/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_WR_HIGH to CFG_LPC32XX_NAND_MLC_WR_HIGH
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -146,7 +146,7 @@ static void lpc32xx_nand_init(void)clkdiv (CFG_LPC32XX_NAND_MLC_NAND_TA ,0x07 ,16 ) |clkdiv (CFG_LPC32XX_NAND_MLC_RD_HIGH ,0x0F ,12 ) |clkdiv (CFG_LPC32XX_NAND_MLC_RD_LOW ,0x0F ,8 ) | -clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_HIGH ,0x0F ,4 ) | +clkdiv (CFG_LPC32XX_NAND_MLC_WR_HIGH ,0x0F ,4 ) |clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_LOW ,0x0F ,0 ), &lpc32xx_nand_mlc_registers->time_reg); }
include/configs/work_92105.h +1 -1
@@ -32,7 +32,7 @@#define CFG_LPC32XX_NAND_MLC_NAND_TA 18181818#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000#define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545 -#define CONFIG_LPC32XX_NAND_MLC_WR_HIGH 40000000 +#define CFG_LPC32XX_NAND_MLC_WR_HIGH 40000000#define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333/*
Signature · 1 line
2.25.1
PATCH 75/149 global: Migrate CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_MLC_WR_LOW to CFG_LPC32XX_NAND_MLC_WR_LOW
--- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- include/configs/work_92105.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +1 -1
@@ -147,7 +147,7 @@ static void lpc32xx_nand_init(void)clkdiv (CFG_LPC32XX_NAND_MLC_RD_HIGH ,0x0F ,12 ) |clkdiv (CFG_LPC32XX_NAND_MLC_RD_LOW ,0x0F ,8 ) |clkdiv (CFG_LPC32XX_NAND_MLC_WR_HIGH ,0x0F ,4 ) | -clkdiv (CONFIG_LPC32XX_NAND_MLC_WR_LOW ,0x0F ,0 ), +clkdiv (CFG_LPC32XX_NAND_MLC_WR_LOW ,0x0F ,0 ), &lpc32xx_nand_mlc_registers->time_reg); }
include/configs/work_92105.h +1 -1
@@ -33,7 +33,7 @@#define CFG_LPC32XX_NAND_MLC_RD_HIGH 31250000#define CFG_LPC32XX_NAND_MLC_RD_LOW 45454545#define CFG_LPC32XX_NAND_MLC_WR_HIGH 40000000 -#define CONFIG_LPC32XX_NAND_MLC_WR_LOW 83333333 +#define CFG_LPC32XX_NAND_MLC_WR_LOW 83333333/* * NAND
Signature · 1 line
2.25.1
PATCH 76/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_RDR_CLKS to CFG_LPC32XX_NAND_SLC_RDR_CLKS
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -130,7 +130,7 @@ static void lpc32xx_nand_init(void)TAC_W_WIDTH (hclk /CONFIG_LPC32XX_NAND_SLC_WWIDTH ) |TAC_W_HOLD (hclk /CONFIG_LPC32XX_NAND_SLC_WHOLD ) |TAC_W_SETUP (hclk /CONFIG_LPC32XX_NAND_SLC_WSETUP ) | -TAC_R_RDY (CONFIG_LPC32XX_NAND_SLC_RDR_CLKS ) | +TAC_R_RDY (CFG_LPC32XX_NAND_SLC_RDR_CLKS ) |TAC_R_WIDTH (hclk /CONFIG_LPC32XX_NAND_SLC_RWIDTH ) |TAC_R_HOLD (hclk /CONFIG_LPC32XX_NAND_SLC_RHOLD ) | TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP),
include/configs/devkit3250.h +1 -1
@@ -45,7 +45,7 @@#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 -#define CONFIG_LPC32XX_NAND_SLC_RDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666#define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000
Signature · 1 line
2.25.1
PATCH 77/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_RHOLD to CFG_LPC32XX_NAND_SLC_RHOLD
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void)TAC_W_SETUP (hclk /CONFIG_LPC32XX_NAND_SLC_WSETUP ) |TAC_R_RDY (CFG_LPC32XX_NAND_SLC_RDR_CLKS ) |TAC_R_WIDTH (hclk /CONFIG_LPC32XX_NAND_SLC_RWIDTH ) | -TAC_R_HOLD (hclk /CONFIG_LPC32XX_NAND_SLC_RHOLD ) | +TAC_R_HOLD (hclk /CFG_LPC32XX_NAND_SLC_RHOLD ) |TAC_R_SETUP (hclk /CONFIG_LPC32XX_NAND_SLC_RSETUP ), &lpc32xx_nand_slc_regs->tac); }
include/configs/devkit3250.h +1 -1
@@ -47,7 +47,7 @@#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 -#define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000 +#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000/*
Signature · 1 line
2.25.1
PATCH 78/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_RSETUP to CFG_LPC32XX_NAND_SLC_RSETUP
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -133,7 +133,7 @@ static void lpc32xx_nand_init(void)TAC_R_RDY (CFG_LPC32XX_NAND_SLC_RDR_CLKS ) |TAC_R_WIDTH (hclk /CONFIG_LPC32XX_NAND_SLC_RWIDTH ) |TAC_R_HOLD (hclk /CFG_LPC32XX_NAND_SLC_RHOLD ) | -TAC_R_SETUP (hclk /CONFIG_LPC32XX_NAND_SLC_RSETUP ), +TAC_R_SETUP (hclk /CFG_LPC32XX_NAND_SLC_RSETUP ), &lpc32xx_nand_slc_regs->tac); }
include/configs/devkit3250.h +1 -1
@@ -48,7 +48,7 @@#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_RSETUP 50000000/* * USB
Signature · 1 line
2.25.1
PATCH 79/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_RWIDTH to CFG_LPC32XX_NAND_SLC_RWIDTH
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -131,7 +131,7 @@ static void lpc32xx_nand_init(void)TAC_W_HOLD (hclk /CONFIG_LPC32XX_NAND_SLC_WHOLD ) |TAC_W_SETUP (hclk /CONFIG_LPC32XX_NAND_SLC_WSETUP ) |TAC_R_RDY (CFG_LPC32XX_NAND_SLC_RDR_CLKS ) | -TAC_R_WIDTH (hclk /CONFIG_LPC32XX_NAND_SLC_RWIDTH ) | +TAC_R_WIDTH (hclk /CFG_LPC32XX_NAND_SLC_RWIDTH ) |TAC_R_HOLD (hclk /CFG_LPC32XX_NAND_SLC_RHOLD ) |TAC_R_SETUP (hclk /CFG_LPC32XX_NAND_SLC_RSETUP ), &lpc32xx_nand_slc_regs->tac);
include/configs/devkit3250.h +1 -1
@@ -46,7 +46,7 @@#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 -#define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 +#define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000#define CFG_LPC32XX_NAND_SLC_RSETUP 50000000
Signature · 1 line
2.25.1
PATCH 80/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_WDR_CLKS to CFG_LPC32XX_NAND_SLC_WDR_CLKS
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -126,7 +126,7 @@ static void lpc32xx_nand_init(void) &lpc32xx_nand_slc_regs->icr);/* Configure NAND flash timings */ - writel(TAC_W_RDY(CONFIG_LPC32XX_NAND_SLC_WDR_CLKS) | + writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
include/configs/devkit3250.h +1 -1
@@ -41,7 +41,7 @@/* * NAND chip timings */ -#define CONFIG_LPC32XX_NAND_SLC_WDR_CLKS 14 +#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000
Signature · 1 line
2.25.1
PATCH 81/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG_LPC32XX_NAND_SLC_WHOLD
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -128,7 +128,7 @@ static void lpc32xx_nand_init(void)/* Configure NAND flash timings */ writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | - TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) | + TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
include/configs/devkit3250.h +1 -1
@@ -43,7 +43,7 @@*/ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 -#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000 +#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14#define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666
Signature · 1 line
2.25.1
PATCH 82/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_WSETUP to CFG_LPC32XX_NAND_SLC_WSETUP
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -129,7 +129,7 @@ static void lpc32xx_nand_init(void) writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | - TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | + TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) | TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) |
include/configs/devkit3250.h +1 -1
@@ -44,7 +44,7 @@#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000 -#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 +#define CFG_LPC32XX_NAND_SLC_WSETUP 50000000#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14#define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000
Signature · 1 line
2.25.1
PATCH 83/149 global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG_LPC32XX_NAND_SLC_WWIDTH
--- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/lpc32xx_nand_slc.c +1 -1
@@ -127,7 +127,7 @@ static void lpc32xx_nand_init(void)/* Configure NAND flash timings */ writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) | - TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) | + TAC_W_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) | TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) | TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
include/configs/devkit3250.h +1 -1
@@ -42,7 +42,7 @@* NAND chip timings */ #define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14 -#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666 +#define CFG_LPC32XX_NAND_SLC_WWIDTH 66666666#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000#define CFG_LPC32XX_NAND_SLC_WSETUP 50000000#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14
Signature · 1 line
2.25.1
PATCH 84/149 global: Migrate CONFIG_MALLOC_F_ADDR to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MALLOC_F_ADDR to CFG_MALLOC_F_ADDR
--- arch/sandbox/cpu/start.c | 2 +- common/init/board_init.c | 2 +- common/spl/spl.c | 4 ++-- doc/arch/sandbox/sandbox.rst | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/phycore_imx8mm.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/sandbox.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/verdin-imx8mp.h | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-)
arch/sandbox/cpu/start.c +1 -1
@@ -535,7 +535,7 @@ int sandbox_main(int argc, char *argv[]) }#if CONFIG_VAL (SYS_MALLOC_F_LEN ) - gd->malloc_base =CONFIG_MALLOC_F_ADDR ; + gd->malloc_base =CFG_MALLOC_F_ADDR ;#endif #if CONFIG_IS_ENABLED (LOG ) gd->default_log_level = state->default_log_level;
common/init/board_init.c +1 -1
@@ -78,7 +78,7 @@ __weak void board_init_f_init_stack_protection(void)ulong board_init_f_alloc_reserve (ulong top) {/* Reserve early malloc arena */ -#ifndef CONFIG_MALLOC_F_ADDR +#ifndef CFG_MALLOC_F_ADDR #if CONFIG_VAL (SYS_MALLOC_F_LEN ) top -=CONFIG_VAL (SYS_MALLOC_F_LEN );#endif
common/spl/spl.c +2 -2
@@ -527,8 +527,8 @@ static int spl_common_init(bool setup_malloc)#if CONFIG_VAL (SYS_MALLOC_F_LEN )if (setup_malloc) { -#ifdef CONFIG_MALLOC_F_ADDR - gd->malloc_base =CONFIG_MALLOC_F_ADDR ; +#ifdef CFG_MALLOC_F_ADDR + gd->malloc_base =CFG_MALLOC_F_ADDR ;#endif gd->malloc_limit =CONFIG_VAL (SYS_MALLOC_F_LEN ); gd->malloc_ptr =0 ;
doc/arch/sandbox/sandbox.rst +1 -1
@@ -615,7 +615,7 @@ Addr Config Usage ======= ======================== =============================== 0 CONFIG_SYS_FDT_LOAD_ADDR Device tree c000 CONFIG_BLOBLIST_ADDR Blob list - 10000 CONFIG_MALLOC_F_ADDR Early memory allocation + 10000 CFG_MALLOC_F_ADDR Early memory allocation f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used as the SPL load buffer in spl_test_load().
include/configs/capricorn-common.h +1 -1
@@ -14,7 +14,7 @@/* SPL config */ #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000#endif /* CONFIG_SPL_BUILD */
include/configs/cgtqmx8.h +1 -1
@@ -13,7 +13,7 @@#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/imx8mm-cl-iot-gate.h +1 -1
@@ -16,7 +16,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x912000 +#define CFG_MALLOC_F_ADDR 0x912000/* For RAW image gives a error info not panic */ #endif
include/configs/imx8mm_beacon.h +1 -1
@@ -14,7 +14,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */ #endif
include/configs/imx8mm_data_modul_edm_sbc.h +1 -1
@@ -11,7 +11,7 @@#include <asm/arch/imx-regs.h> #ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */
include/configs/imx8mm_evk.h +1 -1
@@ -24,7 +24,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */ #endif
include/configs/imx8mm_icore_mx8mm.h +1 -1
@@ -15,7 +15,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -# define CONFIG_MALLOC_F_ADDR 0x930000 +# define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */ #endif /* CONFIG_SPL_BUILD */
include/configs/imx8mm_venice.h +1 -1
@@ -14,7 +14,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000#endif /* Enable Distro Boot */
include/configs/imx8mp_rsb3720.h +1 -1
@@ -24,7 +24,7 @@ 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9)#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x184000/* malloc f used before \ +#define CFG_MALLOC_F_ADDR 0x184000/* malloc f used before \ * GD_FLG_FULL_MALLOC_INIT \ * set \ */
include/configs/imx8mq_cm.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */ #endif
include/configs/imx8mq_evk.h +1 -1
@@ -15,7 +15,7 @@#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
include/configs/imx8mq_phanbell.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */ #endif
include/configs/imx8qm_mek.h +1 -1
@@ -12,7 +12,7 @@#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/imx8qxp_mek.h +1 -1
@@ -12,7 +12,7 @@#ifdef CONFIG_SPL_BUILD #define CONFIG_SERIAL_LPUART_BASE 0x5a060000 -#define CONFIG_MALLOC_F_ADDR 0x00120000 +#define CFG_MALLOC_F_ADDR 0x00120000#endif
include/configs/imx8ulp_evk.h +1 -1
@@ -12,7 +12,7 @@#define CFG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x22040000 +#define CFG_MALLOC_F_ADDR 0x22040000#endif
include/configs/imx93_evk.h +1 -1
@@ -14,7 +14,7 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)#ifdef CONFIG_SPL_BUILD -#define CONFIG_MALLOC_F_ADDR 0x204D0000 +#define CFG_MALLOC_F_ADDR 0x204D0000#endif #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/kontron-sl-mx8mm.h +1 -1
@@ -46,7 +46,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000#endif #define CFG_EXTRA_ENV_SETTINGS BOOTENV
include/configs/kontron_pitx_imx8m.h +1 -1
@@ -16,7 +16,7 @@#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */
include/configs/kontron_sl28.h +1 -1
@@ -28,7 +28,7 @@/* generic timer */ /* early heap for SPL DM */ -#define CONFIG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE +#define CFG_MALLOC_F_ADDR CFG_SYS_FSL_OCRAM_BASE/* serial port */ #define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2)
include/configs/phycore_imx8mm.h +1 -1
@@ -16,7 +16,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */ #endif
include/configs/pico-imx8mq.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 +#define CFG_MALLOC_F_ADDR 0x182000/* For RAW image gives a error info not panic */ #endif
include/configs/sandbox.h +1 -1
@@ -6,7 +6,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_MALLOC_F_ADDR 0x0010000 +#define CFG_MALLOC_F_ADDR 0x0010000/* Size of our emulated memory */ #define SB_CONCAT (x, y) x ## y
include/configs/verdin-imx8mm.h +1 -1
@@ -14,7 +14,7 @@#ifdef CONFIG_SPL_BUILD /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 +#define CFG_MALLOC_F_ADDR 0x930000/* For RAW image gives a error info not panic */ #endif
include/configs/verdin-imx8mp.h +1 -1
@@ -16,7 +16,7 @@/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x184000 +#define CFG_MALLOC_F_ADDR 0x184000/* For RAW image gives a error info not panic */ #endif /* CONFIG_SPL_BUILD */
Signature · 1 line
2.25.1
PATCH 85/149 global: Migrate CONFIG_MAX_MEM_MAPPED to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MAX_MEM_MAPPED to CFG_MAX_MEM_MAPPED
--- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 +++--- arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +++++++------- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 14 +++++++------- arch/powerpc/cpu/mpc85xx/mp.c | 4 ++-- arch/powerpc/cpu/mpc85xx/tlb.c | 8 ++++---- arch/powerpc/cpu/mpc8xxx/pamu_table.c | 2 +- arch/powerpc/include/asm/config.h | 6 +++--- arch/xtensa/include/asm/config.h | 2 +- board/ti/dra7xx/evm.c | 14 +++++++------- common/memsize.c | 6 +++--- drivers/ddr/fsl/util.c | 6 +++--- include/configs/dra7xx_evm.h | 2 +- include/configs/mt7621.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/synquacer.h | 2 +- include/configs/xtfpga.h | 8 ++++---- 17 files changed, 50 insertions(+), 50 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +3 -3
@@ -1308,13 +1308,13 @@ phys_size_t get_effective_memsize(void)* allocated from first region. If the memory extends to the second * region (or the third region if applicable), Management Complex (MC) * memory should be put into the highest region, i.e. the end of DDR -* memory. CONFIG_MAX_MEM_MAPPED is set to the size of first region so +* memory. CFG_MAX_MEM_MAPPED is set to the size of first region so * U-Boot doesn't relocate itself into higher address. Should DDR be * configured to skip the first region, this function needs to be * adjusted. */ -if (gd->ram_size >CONFIG_MAX_MEM_MAPPED ) { - ea_size =CONFIG_MAX_MEM_MAPPED ; +if (gd->ram_size >CFG_MAX_MEM_MAPPED ) { + ea_size =CFG_MAX_MEM_MAPPED ; rem = gd->ram_size - ea_size; }else { ea_size = gd->ram_size;
arch/arm/include/asm/arch-fsl-layerscape/config.h +7 -7
@@ -36,7 +36,7 @@/* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE/* Generic Interrupt Controller Definitions */ #define GICD_BASE 0x06000000
@@ -121,7 +121,7 @@/* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE/* DCFG - GUR */ #define CFG_SYS_FSL_OCRAM_BASE 0x18000000/* initial RAM */
@@ -147,7 +147,7 @@/* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE/* Generic Interrupt Controller Definitions */ #define GICD_BASE 0x06000000
@@ -191,7 +191,7 @@/* DDR */ #define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE/* SEC */
@@ -211,7 +211,7 @@#define CFG_SYS_NUM_FM1_DTSEC 7#define CFG_SYS_NUM_FM1_10GEC 1#define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE#define QE_MURAM_SIZE 0x6000UL#define MAX_QE_RISC 1
@@ -250,14 +250,14 @@#define GICD_BASE 0x01401000#define GICC_BASE 0x01402000#define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE#elif defined(CONFIG_ARCH_LS1046A )#define CFG_SYS_NUM_FMAN 1#define CFG_SYS_NUM_FM1_DTSEC 8#define CFG_SYS_NUM_FM1_10GEC 2#define CFG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) -#define CONFIG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE +#define CFG_MAX_MEM_MAPPED CFG_SYS_DDR_BLOCK1_SIZE/* SMMU Defintions */ #define SMMU_BASE 0x09000000
arch/arm/include/asm/arch-ls102xa/config.h +1 -1
@@ -70,7 +70,7 @@/* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000)#ifdef CONFIG_DDR_SPD -#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) +#define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)#endif #define DCU_LAYER_MAX_NUM 16
arch/powerpc/cpu/mpc85xx/cpu.c +7 -7
@@ -616,12 +616,12 @@ static int reset_tlb(phys_addr_t p_addr, u32 size, phys_addr_t *phys_offset)/* * slide the testing window up to test another area * for 32_bit system, the maximum testable memory is limited to -* CONFIG_MAX_MEM_MAPPED +* CFG_MAX_MEM_MAPPED */ int arch_memory_test_advance (u32 *vstart,u32 *size,phys_addr_t *phys_offset) {phys_addr_t test_cap, p_addr; -phys_size_t p_size =min (gd->ram_size,CONFIG_MAX_MEM_MAPPED ); +phys_size_t p_size =min (gd->ram_size,CFG_MAX_MEM_MAPPED ); #if !defined(CONFIG_PHYS_64BIT) || \ !defined(CFG_SYS_INIT_RAM_ADDR_PHYS) || \
@@ -632,7 +632,7 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)#endif p_addr = (*vstart) + (*size) + (*phys_offset);if (p_addr < test_cap -1 ) { - p_size =min (test_cap - p_addr,CONFIG_MAX_MEM_MAPPED ); + p_size =min (test_cap - p_addr,CFG_MAX_MEM_MAPPED );if (reset_tlb (p_addr, p_size, phys_offset) ==-1 )return -1 ; *vstart =CFG_SYS_DDR_SDRAM_BASE ;
@@ -649,18 +649,18 @@ int arch_memory_test_advance(u32 *vstart, u32 *size, phys_addr_t *phys_offset)/* initialization for testing area */ int arch_memory_test_prepare (u32 *vstart,u32 *size,phys_addr_t *phys_offset) { -phys_size_t p_size =min (gd->ram_size,CONFIG_MAX_MEM_MAPPED ); +phys_size_t p_size =min (gd->ram_size,CFG_MAX_MEM_MAPPED ); *vstart =CFG_SYS_DDR_SDRAM_BASE ; - *size = (u32 ) p_size;/* CONFIG_MAX_MEM_MAPPED < 4G */ + *size = (u32 ) p_size;/* CFG_MAX_MEM_MAPPED < 4G */ *phys_offset =0 ;#if !defined(CONFIG_PHYS_64BIT ) || \ !defined(CFG_SYS_INIT_RAM_ADDR_PHYS ) || \ (CFG_SYS_INIT_RAM_ADDR_PHYS <0x100000000ull ) -if (gd->ram_size >CONFIG_MAX_MEM_MAPPED ) { +if (gd->ram_size >CFG_MAX_MEM_MAPPED ) {puts ("Cannot test more than " ); -print_size (CONFIG_MAX_MEM_MAPPED , +print_size (CFG_MAX_MEM_MAPPED ," without proper 36BIT support.\n" ); }#endif
arch/powerpc/cpu/mpc85xx/mp.c +2 -2
@@ -193,8 +193,8 @@ u32 determine_mp_bootpg(unsigned int *pagesize)/* use last 4K of mapped memory */ - bootpg = ((gd->ram_size >CONFIG_MAX_MEM_MAPPED ) ? -CONFIG_MAX_MEM_MAPPED : gd->ram_size) + + bootpg = ((gd->ram_size >CFG_MAX_MEM_MAPPED ) ? +CFG_MAX_MEM_MAPPED : gd->ram_size) +CFG_SYS_SDRAM_BASE -4096 ;if (pagesize) *pagesize =4096 ;
arch/powerpc/cpu/mpc85xx/tlb.c +4 -4
@@ -306,12 +306,12 @@ unsigned int setup_ddr_tlbs_phys(phys_addr_t p_addr,u64 memsize = (u64 )memsize_in_meg <<20 ;u64 size; - size =min (memsize, (u64 )CONFIG_MAX_MEM_MAPPED ); + size =min (memsize, (u64 )CFG_MAX_MEM_MAPPED ); size =tlb_map_range (ram_tlb_address, p_addr, size,TLB_MAP_RAM ); -if (size || memsize >CONFIG_MAX_MEM_MAPPED ) { -print_size (memsize >CONFIG_MAX_MEM_MAPPED ? - memsize -CONFIG_MAX_MEM_MAPPED + size : size, +if (size || memsize >CFG_MAX_MEM_MAPPED ) { +print_size (memsize >CFG_MAX_MEM_MAPPED ? + memsize -CFG_MAX_MEM_MAPPED + size : size," of DDR memory left unmapped in U-Boot\n" );#ifndef CONFIG_SPL_BUILD puts (" " );
arch/powerpc/cpu/mpc8xxx/pamu_table.c +1 -1
@@ -17,7 +17,7 @@ void construct_pamu_addr_table(struct pamu_addr_tbl *tbl, int *num_entries) tbl->start_addr[i] = (uint64_t )virt_to_phys ((void *)CFG_SYS_SDRAM_BASE ); - tbl->size[i] = (phys_size_t)(min (gd->ram_size,CONFIG_MAX_MEM_MAPPED )); + tbl->size[i] = (phys_size_t)(min (gd->ram_size,CFG_MAX_MEM_MAPPED )); tbl->end_addr[i] = tbl->start_addr[i] + tbl->size[i] -1 ; i++;
arch/powerpc/include/asm/config.h +3 -3
@@ -14,13 +14,13 @@#define HWCONFIG_BUFFER_SIZE 256#endif -#ifndef CONFIG_MAX_MEM_MAPPED +#ifndef CFG_MAX_MEM_MAPPED #if defined(CONFIG_E500 ) || \ defined(CONFIG_MPC86xx) || \ defined(CONFIG_E300 ) -#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) +#define CFG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)#else -#define CONFIG_MAX_MEM_MAPPED (256 << 20) +#define CFG_MAX_MEM_MAPPED (256 << 20)#endif #endif
arch/xtensa/include/asm/config.h +1 -1
@@ -14,7 +14,7 @@* restricting used physical memory to the first 128MB. */ #if XCHAL_HAVE_PTP_MMU -#define CONFIG_MAX_MEM_MAPPED (128 << 20) +#define CFG_MAX_MEM_MAPPED (128 << 20)#endif #endif
board/ti/dra7xx/evm.c +7 -7
@@ -279,13 +279,13 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)case DRA752_ES2_0 :switch (emif_nr) {case 1 : -if (ram_size >CONFIG_MAX_MEM_MAPPED ) +if (ram_size >CFG_MAX_MEM_MAPPED ) *regs = &emif1_ddr3_532_mhz_1cs_2G;else *regs = &emif1_ddr3_532_mhz_1cs;break ;case 2 : -if (ram_size >CONFIG_MAX_MEM_MAPPED ) +if (ram_size >CFG_MAX_MEM_MAPPED ) *regs = &emif2_ddr3_532_mhz_1cs_2G;else *regs = &emif2_ddr3_532_mhz_1cs;
@@ -303,7 +303,7 @@ void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs)case DRA722_ES1_0 :case DRA722_ES2_0 :case DRA722_ES2_1 : -if (ram_size <CONFIG_MAX_MEM_MAPPED ) +if (ram_size <CFG_MAX_MEM_MAPPED ) *regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es1;else *regs = &emif_1_regs_ddr3_666_mhz_1cs_dra_es2;
@@ -362,7 +362,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)case DRA752_ES1_0 :case DRA752_ES1_1 :case DRA752_ES2_0 : -if (ram_size >CONFIG_MAX_MEM_MAPPED ) +if (ram_size >CFG_MAX_MEM_MAPPED ) *dmm_lisa_regs = &lisa_map_dra7_2GB;else *dmm_lisa_regs = &lisa_map_dra7_1536MB;
@@ -371,7 +371,7 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs)case DRA722_ES2_0 :case DRA722_ES2_1 :default : -if (ram_size <CONFIG_MAX_MEM_MAPPED ) +if (ram_size <CFG_MAX_MEM_MAPPED ) *dmm_lisa_regs = &lisa_map_2G_x_2;else *dmm_lisa_regs = &lisa_map_2G_x_4;
@@ -646,9 +646,9 @@ int dram_init_banksize(void) gd->bd->bi_dram[0 ].start =CFG_SYS_SDRAM_BASE ; gd->bd->bi_dram[0 ].size =get_effective_memsize (); -if (ram_size >CONFIG_MAX_MEM_MAPPED ) { +if (ram_size >CFG_MAX_MEM_MAPPED ) { gd->bd->bi_dram[1 ].start =0x200000000 ; - gd->bd->bi_dram[1 ].size = ram_size -CONFIG_MAX_MEM_MAPPED ; + gd->bd->bi_dram[1 ].size = ram_size -CFG_MAX_MEM_MAPPED ; }return 0 ;
common/memsize.c +3 -3
@@ -106,11 +106,11 @@ phys_size_t __weak get_effective_memsize(void)if (gd->ram_base + ram_size < gd->ram_base) ram_size = ((phys_size_t )~0xfffULL ) - gd->ram_base; -#ifndef CONFIG_MAX_MEM_MAPPED +#ifndef CFG_MAX_MEM_MAPPED return ram_size;#else /* limit stack to what we can reasonable map */ -return ((ram_size >CONFIG_MAX_MEM_MAPPED ) ? -CONFIG_MAX_MEM_MAPPED : ram_size); +return ((ram_size >CFG_MAX_MEM_MAPPED ) ? +CFG_MAX_MEM_MAPPED : ram_size);#endif }
drivers/ddr/fsl/util.c +3 -3
@@ -139,10 +139,10 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params, }#if !defined(CONFIG_PHYS_64BIT ) -if (base >=CONFIG_MAX_MEM_MAPPED ) +if (base >=CFG_MAX_MEM_MAPPED )return ; -if ((base + size) >=CONFIG_MAX_MEM_MAPPED ) - size =CONFIG_MAX_MEM_MAPPED - base; +if ((base + size) >=CFG_MAX_MEM_MAPPED ) + size =CFG_MAX_MEM_MAPPED - base;#endif if (set_ddr_laws (base, size, law_memctl) <0 ) { printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
include/configs/dra7xx_evm.h +1 -1
@@ -13,7 +13,7 @@#include <environment/ti/dfu.h> -#define CONFIG_MAX_MEM_MAPPED 0x80000000 +#define CFG_MAX_MEM_MAPPED 0x80000000#ifndef CONFIG_QSPI_BOOT /* MMC ENV related defines */
include/configs/mt7621.h +1 -1
@@ -10,7 +10,7 @@#define CFG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_MAX_MEM_MAPPED 0x1c000000 +#define CFG_MAX_MEM_MAPPED 0x1c000000#define CFG_SYS_INIT_SP_OFFSET 0x800000
include/configs/rcar-gen3-common.h +1 -1
@@ -28,7 +28,7 @@#define DRAM_RSV_SIZE 0x08000000#define CFG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE)#define CFG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) +#define CFG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE)/* ENV setting */
include/configs/synquacer.h +1 -1
@@ -14,7 +14,7 @@#define CFG_SYS_SDRAM_BASE (0x80000000)/* Start address of DDR3 */ #define PHYS_SDRAM_SIZE (0x7c000000)/* Default size (2GB - Secure memory) */ -#define CONFIG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE +#define CFG_MAX_MEM_MAPPED PHYS_SDRAM_SIZE#define SQ_DRAMINFO_BASE (0x2e00ffc0)/* DRAM info from TF-A */
include/configs/xtfpga.h +4 -4
@@ -27,7 +27,7 @@#else #define CFG_SYS_MEMORY_BASE 0x60000000#define CFG_SYS_IO_BASE 0x90000000 -#define CONFIG_MAX_MEM_MAPPED 0x10000000 +#define CFG_MAX_MEM_MAPPED 0x10000000#endif /* Onboard RAM sizes:
@@ -53,10 +53,10 @@/* Memory test is destructive so default must not overlap vectors or U-Boot*/ -#if defined(CONFIG_MAX_MEM_MAPPED ) && \ -CONFIG_MAX_MEM_MAPPED <CFG_SYS_SDRAM_SIZE +#if defined(CFG_MAX_MEM_MAPPED ) && \ +CFG_MAX_MEM_MAPPED <CFG_SYS_SDRAM_SIZE #define XTENSA_SYS_TEXT_ADDR \ - (MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN) + (MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)#else #define XTENSA_SYS_TEXT_ADDR \ (MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
Signature · 1 line
2.25.1
PATCH 86/149 global: Migrate CONFIG_MAX_RAM_BANK_SIZE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MAX_RAM_BANK_SIZE to CFG_MAX_RAM_BANK_SIZE
--- arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-omap2/am33xx/board.c | 4 ++-- arch/arm/mach-omap2/sec-common.c | 2 +- arch/arm/mach-orion5x/dram.c | 4 ++-- arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +- board/phytec/phycore_am335x_r2/board.c | 2 +- board/ti/ks2_evm/board.c | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/draco.h | 2 +- include/configs/etamin.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rut.h | 2 +- include/configs/thuban.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-)
arch/arm/mach-davinci/misc.c +1 -1
@@ -27,7 +27,7 @@ int dram_init(void)/* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size =get_ram_size ( (void *)CFG_SYS_SDRAM_BASE , -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE );return 0 ; }
arch/arm/mach-omap2/am33xx/board.c +2 -2
@@ -73,7 +73,7 @@ int dram_init(void)/* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size =get_ram_size ( (void *)CFG_SYS_SDRAM_BASE , -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE );return 0 ; }
@@ -521,7 +521,7 @@ void board_init_f(ulong dummy)/* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size =get_ram_size ( (void *)CFG_SYS_SDRAM_BASE , - CONFIG_MAX_RAM_BANK_SIZE); + CFG_MAX_RAM_BANK_SIZE); }#endif
arch/arm/mach-omap2/sec-common.c +1 -1
@@ -203,7 +203,7 @@ u32 get_sec_mem_start(void) omap_sdram_size()#else get_ram_size ((void *)CFG_SYS_SDRAM_BASE , -CONFIG_MAX_RAM_BANK_SIZE ) +CFG_MAX_RAM_BANK_SIZE ) #endif - sec_mem_size));return sec_mem_start;
arch/arm/mach-orion5x/dram.c +2 -2
@@ -39,7 +39,7 @@ int dram_init (void)/* dram_init must store complete ramsize in gd->ram_size */ gd->ram_size =get_ram_size ( (long *)orion5x_sdram_bar (0 ), -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE );return 0 ; }
@@ -51,7 +51,7 @@ int dram_init_banksize(void) gd->bd->bi_dram[i].start =orion5x_sdram_bar (i); gd->bd->bi_dram[i].size =get_ram_size ( (long *) (gd->bd->bi_dram[i].start), -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE ); }return 0 ;
arch/arm/mach-orion5x/include/mach/orion5x.h +1 -1
@@ -53,7 +53,7 @@#define MVCPU_WIN_ENABLE ORION5X_WIN_ENABLE#define MVCPU_WIN_DISABLE ORION5X_WIN_DISABLE -#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024) +#define CFG_MAX_RAM_BANK_SIZE (64*1024*1024)/* include here SoC variants. 5181, 5281, 6183 should go here when adding support for them, and this comment should then be updated. */
board/phytec/phycore_am335x_r2/board.c +1 -1
@@ -167,7 +167,7 @@ void sdram_init(void)/* Detect memory physically present */ gd->ram_size =get_ram_size ((void *)CFG_SYS_SDRAM_BASE , -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE );/* Reconfigure memory for actual detected size */ switch (gd->ram_size) {
board/ti/ks2_evm/board.c +1 -1
@@ -47,7 +47,7 @@ int dram_init(void) ddr3_size =ddr3_init (); gd->ram_size =get_ram_size ((long *)CFG_SYS_SDRAM_BASE , -CONFIG_MAX_RAM_BANK_SIZE ); +CFG_MAX_RAM_BANK_SIZE );#if defined(CONFIG_TI_AEMIF )if (!(board_is_k2g_ice () ||board_is_k2g_i1 ()))aemif_init (ARRAY_SIZE (aemif_configs), aemif_configs);
include/configs/am43xx_evm.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_AM43XX_EVM_H#define __CONFIG_AM43XX_EVM_H -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 21)/* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 21)/* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000/* Use Timer2 */ #include <asm/arch/omap.h>
include/configs/bur_am335x_common.h +1 -1
@@ -19,7 +19,7 @@#endif /* CONFIG_DM */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ /* Timer information */ #define CFG_SYS_TIMERBASE 0x48040000/* Use Timer2 */
include/configs/cm_t43.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_CM_T43_H#define __CONFIG_CM_T43_H -#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20)/* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20)/* 2GB */ #define CFG_SYS_TIMERBASE 0x48040000/* Use Timer2 */ #include <asm/arch/omap.h>
include/configs/da850evm.h +1 -1
@@ -31,7 +31,7 @@*/ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE/* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20)/* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ /* memtest start addr */ /* memtest will be run on 16MB */
include/configs/draco.h +1 -1
@@ -25,7 +25,7 @@"led1=64,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ /* Default env settings */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/etamin.h +1 -1
@@ -67,7 +67,7 @@"led5=63,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ #define EEPROM_ADDR_DDR3 0x90#define EEPROM_ADDR_CHIP 0x120
include/configs/legoev3.h +1 -1
@@ -27,7 +27,7 @@*/ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE/* DDR Start */ #define PHYS_SDRAM_1_SIZE (64 << 20)/* SDRAM size 64MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ /* memtest start addr */
include/configs/omapl138_lcdk.h +1 -1
@@ -26,7 +26,7 @@*/ #define PHYS_SDRAM_1 DAVINCI_DDR_EMIF_DATA_BASE/* DDR Start */ #define PHYS_SDRAM_1_SIZE (128 << 20)/* SDRAM size 128MB */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20)/* max size from SPRS586*/ /* memtest start addr */
include/configs/pxm2.h +1 -1
@@ -23,7 +23,7 @@"led0=117,0,1\0" \/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (512 << 20) /* 1GB *//* Use common default */
include/configs/rastaban.h +1 -1
@@ -32,7 +32,7 @@"led5=63,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ #define EEPROM_ADDR_DDR3 0x90#define EEPROM_ADDR_CHIP 0x120
include/configs/rut.h +1 -1
@@ -19,7 +19,7 @@#define DDR_PLL_FREQ 303/* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (256 << 20)/* 256 MiB */ +#define CFG_MAX_RAM_BANK_SIZE (256 << 20)/* 256 MiB */ /* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14
include/configs/thuban.h +1 -1
@@ -25,7 +25,7 @@"led1=64,0,1\0" /* Physical Memory Map */ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ #define EEPROM_ADDR_DDR3 0x90#define EEPROM_ADDR_CHIP 0x120
include/configs/ti816x_evm.h +1 -1
@@ -19,7 +19,7 @@#define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20)/* 2048MB */ +#define CFG_MAX_RAM_BANK_SIZE (2048 << 20)/* 2048MB */ #define CFG_SYS_SDRAM_BASE 0x80000000/**
include/configs/ti_am335x_common.h +1 -1
@@ -11,7 +11,7 @@#ifndef __CONFIG_TI_AM335X_COMMON_H__#define __CONFIG_TI_AM335X_COMMON_H__ -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ +#define CFG_MAX_RAM_BANK_SIZE (1024 << 20)/* 1GB */ #define CFG_SYS_TIMERBASE 0x48040000/* Use Timer2 */ #include <asm/arch/omap.h>
include/configs/ti_armv7_keystone2.h +1 -1
@@ -15,7 +15,7 @@/* Memory Configuration */ #define CFG_SYS_LPAE_SDRAM_BASE 0x800000000 -#define CONFIG_MAX_RAM_BANK_SIZE (2 << 30)/* 2GB */ +#define CFG_MAX_RAM_BANK_SIZE (2 << 30)/* 2GB */ #ifdef CONFIG_SYS_MALLOC_F_LEN #define SPL_MALLOC_F_SIZE CONFIG_SYS_MALLOC_F_LEN
Signature · 1 line
2.25.1
PATCH 87/149 global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS
--- include/configs/capricorn-common.h | 4 ++-- include/configs/cgtqmx8.h | 4 ++-- include/configs/colibri-imx8x.h | 4 ++-- include/configs/imx8mq_phanbell.h | 4 ++-- include/configs/imx8qm_rom7720.h | 4 ++-- include/configs/mx7dsabresd.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-)
include/configs/capricorn-common.h +2 -2
@@ -60,7 +60,7 @@"${loadaddr} ${m4_0_image}\0" \"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \MFG_ENV_SETTINGS_DEFAULT \"initrd_addr=0x83100000\0" \"initrd_high=0xffffffffffffffff\0" \
@@ -68,7 +68,7 @@/* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ AHAB_ENV \ ENV_COMMON \
include/configs/cgtqmx8.h +2 -2
@@ -42,7 +42,7 @@#define FEC0_RESET IMX_GPIO_NR(2, 5)#define FEC0_PDOMAIN "conn_enet0" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -56,7 +56,7 @@/* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \
include/configs/colibri-imx8x.h +2 -2
@@ -43,7 +43,7 @@#undef BOOTENV_RUN_NET_USB_START#define BOOTENV_RUN_NET_USB_START "" -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs ${consoleargs} " \ "rdinit=/linuxrc g_mass_storage.stall=0 " \ "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
@@ -59,7 +59,7 @@#define CFG_EXTRA_ENV_SETTINGS \ AHAB_ENV \ BOOTENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \
include/configs/imx8mq_phanbell.h +2 -2
@@ -24,13 +24,13 @@#define CFG_FEC_MXC_PHYADDR 0#endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffff\0" \/* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200\0" \
include/configs/imx8qm_rom7720.h +2 -2
@@ -33,7 +33,7 @@#define MFG_NAND_PARTITION ""#endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -48,7 +48,7 @@/* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \
include/configs/mx7dsabresd.h +2 -2
@@ -32,7 +32,7 @@#define UPDATE_M4_ENV ""#endif -#define CONFIG_MFG_ENV_SETTINGS \ +#define CFG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -52,7 +52,7 @@#define CFG_EXTRA_ENV_SETTINGS \ UPDATE_M4_ENV \ - CONFIG_MFG_ENV_SETTINGS \ + CFG_MFG_ENV_SETTINGS \ CFG_DFU_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \
Signature · 1 line
2.25.1
PATCH 88/149 global: Migrate CONFIG_MXC_NAND_IP_REGS_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MXC_NAND_IP_REGS_BASE to CFG_MXC_NAND_IP_REGS_BASE
--- drivers/mtd/nand/raw/mxc_nand.c | 2 +- include/configs/m53menlo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/mxc_nand.c +1 -1
@@ -1175,7 +1175,7 @@ int board_nand_init(struct nand_chip *this) host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE ;#ifdef MXC_NFC_V3_2 host->ip_regs = - (struct mxc_nand_ip_regs __iomem *)CONFIG_MXC_NAND_IP_REGS_BASE ; + (struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE ;#endif host->clk_act =1 ;
include/configs/m53menlo.h +1 -1
@@ -46,7 +46,7 @@#ifdef CONFIG_CMD_NAND #define CFG_SYS_NAND_BASE NFC_BASE_ADDR_AXI#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI -#define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR +#define CFG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR#define CFG_SYS_NAND_LARGEPAGE #endif
Signature · 1 line
2.25.1
PATCH 89/149 global: Migrate CONFIG_MXC_NAND_REGS_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MXC_NAND_REGS_BASE to CFG_MXC_NAND_REGS_BASE
--- drivers/mtd/nand/raw/mxc_nand.c | 2 +- include/configs/m53menlo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/mxc_nand.c +1 -1
@@ -1172,7 +1172,7 @@ int board_nand_init(struct nand_chip *this) this->write_buf = mxc_nand_write_buf; this->read_buf = mxc_nand_read_buf; - host->regs = (struct mxc_nand_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE ; + host->regs = (struct mxc_nand_regs __iomem *)CFG_MXC_NAND_REGS_BASE ;#ifdef MXC_NFC_V3_2 host->ip_regs = (struct mxc_nand_ip_regs __iomem *)CFG_MXC_NAND_IP_REGS_BASE ;
include/configs/m53menlo.h +1 -1
@@ -45,7 +45,7 @@*/ #ifdef CONFIG_CMD_NAND #define CFG_SYS_NAND_BASE NFC_BASE_ADDR_AXI -#define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI +#define CFG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI#define CFG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR#define CFG_SYS_NAND_LARGEPAGE #endif
Signature · 1 line
2.25.1
PATCH 90/149 global: Migrate CONFIG_MXC_UART_BASE to CFG
In reply to Tom RiniPerform a simple rename of CONFIG_MXC_UART_BASE to CFG_MXC_UART_BASE
--- board/ge/b1x5v2/spl.c | 4 ++-- drivers/serial/serial_mxc.c | 6 +++--- include/configs/apalis_imx6.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_b1x5v2.h | 4 ++-- include/configs/gw_ventana.h | 2 +- include/configs/imx6-engicam.h | 4 ++-- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/librem5.h | 10 +++++----- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 6 +++--- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- 62 files changed, 73 insertions(+), 73 deletions(-)
board/ge/b1x5v2/spl.c +2 -2
@@ -565,9 +565,9 @@ void board_init_f(ulong dummy)timer_init ();/* iomux */ -if (CONFIG_MXC_UART_BASE ==UART2_BASE ) +if (CFG_MXC_UART_BASE ==UART2_BASE )SETUP_IOMUX_PADS (uart2_pads); -else if (CONFIG_MXC_UART_BASE ==UART3_BASE ) +else if (CFG_MXC_UART_BASE ==UART3_BASE )SETUP_IOMUX_PADS (uart3_pads);/* UART clocks enabled and gd valid - init serial console */
drivers/serial/serial_mxc.c +3 -3
@@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,#if !CONFIG_IS_ENABLED (DM_SERIAL ) -#ifndef CONFIG_MXC_UART_BASE -#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver" +#ifndef CFG_MXC_UART_BASE +#error "define CFG_MXC_UART_BASE to use the MXC UART driver"#endif -#define mxc_base ((struct mxc_uart *)CONFIG_MXC_UART_BASE) +#define mxc_base ((struct mxc_uart *)CFG_MXC_UART_BASE)static void mxc_serial_setbrg (void ) {
include/configs/apalis_imx6.h +1 -1
@@ -15,7 +15,7 @@#include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/cl-som-imx7.h +1 -1
@@ -10,7 +10,7 @@#include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR/* Network */ #define CFG_FEC_MXC_PHYADDR 0
include/configs/cm_fx6.h +1 -1
@@ -26,7 +26,7 @@#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE/* Serial console */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE/* Environment */
include/configs/colibri_imx6.h +1 -1
@@ -15,7 +15,7 @@#include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h> -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/dart_6ul.h +1 -1
@@ -28,7 +28,7 @@#define MMC_ROOTFS_PART 2/* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */
include/configs/dh_imx6.h +1 -1
@@ -28,7 +28,7 @@#define CFG_SYS_FSL_USDHC_NUM 3/* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* USB Configs */ #ifdef CONFIG_CMD_USB
include/configs/display5.h +1 -1
@@ -34,7 +34,7 @@#define CFG_SYS_SPI_ARGS_OFFS 0x140000#define CFG_SYS_SPI_ARGS_SIZE 0x10000 -#define CONFIG_MXC_UART_BASE UART5_BASE +#define CFG_MXC_UART_BASE UART5_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/el6x_common.h +1 -1
@@ -21,7 +21,7 @@/* Commands */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE#define CFG_EXTRA_ENV_SETTINGS \ "board=EL6Q\0" \
include/configs/embestmx6boards.h +1 -1
@@ -12,7 +12,7 @@#ifndef __RIOTBOARD_CONFIG_H#define __RIOTBOARD_CONFIG_H -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1"#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
include/configs/ge_b1x5v2.h +2 -2
@@ -13,9 +13,9 @@#include "mx6_common.h" /* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE +#define CFG_MXC_UART_BASE UART3_BASE -#if CONFIG_MXC_UART_BASE ==UART2_BASE +#if CFG_MXC_UART_BASE ==UART2_BASE /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */ #define CONSOLE_DEVICE "ttymxc1"/* System on Module debug connector */ #else
include/configs/gw_ventana.h +1 -1
@@ -16,7 +16,7 @@#include "mx6_common.h" /* Serial */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE/* NAND */
include/configs/imx6-engicam.h +2 -2
@@ -116,9 +116,9 @@/* UART */ #ifdef CONFIG_MXC_UART # ifdef CONFIG_MX6UL -# define CONFIG_MXC_UART_BASE UART1_BASE +# define CFG_MXC_UART_BASE UART1_BASE# else -# define CONFIG_MXC_UART_BASE UART4_BASE +# define CFG_MXC_UART_BASE UART4_BASE# endif #endif
include/configs/imx6_logic.h +1 -1
@@ -8,7 +8,7 @@#ifndef __IMX6LOGIC_CONFIG_H#define __IMX6LOGIC_CONFIG_H -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#define CONSOLE_DEV "ttymxc0"#include "mx6_common.h"
include/configs/imx6dl-mamoj.h +1 -1
@@ -35,7 +35,7 @@#include <config_distro_bootcmd.h> /* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE +#define CFG_MXC_UART_BASE UART3_BASE/* MMC */
include/configs/imx6ulz_smm_m2.h +1 -1
@@ -12,7 +12,7 @@#include <linux/sizes.h> #include <linux/stringify.h> -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE#ifndef CONFIG_SPL_BUILD
include/configs/imx7-cm.h +1 -1
@@ -10,7 +10,7 @@#include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR#undef CFG_EXTRA_ENV_SETTINGS
include/configs/imx8mm_data_modul_edm_sbc.h +1 -1
@@ -25,7 +25,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x40000000/* Minimum 1 GiB DDR */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR/* PHY needs a longer autonegotiation timeout after reset */ #define PHY_ANEG_TIMEOUT 20000
include/configs/imx8mp_dhcom_pdk2.h +1 -1
@@ -18,7 +18,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x20000000/* Minimum 512 MiB DDR */ -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR/* PHY needs a longer autonegotiation timeout after reset */ #define PHY_ANEG_TIMEOUT 20000
include/configs/imx8mp_rsb3720.h +1 -1
@@ -148,7 +148,7 @@#define PHYS_SDRAM_2_SIZE 0x80000000/* 2 GB */ #endif -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/imx8mq_cm.h +1 -1
@@ -54,7 +54,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x40000000/* 1 GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/imx8mq_evk.h +1 -1
@@ -59,7 +59,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0xC0000000/* 3GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/imx8mq_phanbell.h +1 -1
@@ -92,7 +92,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x40000000/* 1GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/kontron-sl-mx6ul.h +1 -1
@@ -22,7 +22,7 @@#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE/* Board and environment settings */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/kontron_pitx_imx8m.h +1 -1
@@ -67,7 +67,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0xC0000000/* 3GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(3)#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/librem5.h +5 -5
@@ -30,23 +30,23 @@#define CONSOLE_ON_UART1 #ifdef CONSOLE_ON_UART1 -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR#define CONSOLE_UART_CLK 0#define CONSOLE "ttymxc0"#elif defined(CONSOLE_ON_UART2 ) -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR +#define CFG_MXC_UART_BASE UART2_BASE_ADDR#define CONSOLE_UART_CLK 1#define CONSOLE "ttymxc1"#elif defined(CONSOLE_ON_UART3 ) -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR +#define CFG_MXC_UART_BASE UART3_BASE_ADDR#define CONSOLE_UART_CLK 2#define CONSOLE "ttymxc2"#elif defined(CONSOLE_ON_UART4 ) -#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR +#define CFG_MXC_UART_BASE UART4_BASE_ADDR#define CONSOLE_UART_CLK 3#define CONSOLE "ttymxc3"#else -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_BASE_ADDR#define CONSOLE_UART_CLK 0#define CONSOLE "ttymxc0"#endif
include/configs/liteboard.h +1 -1
@@ -13,7 +13,7 @@#include <linux/stringify.h> #include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #ifdef CONFIG_FSL_USDHC
include/configs/m53menlo.h +1 -1
@@ -31,7 +31,7 @@/* * Serial Driver */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* * MMC Driver
include/configs/mccmon6.h +1 -1
@@ -17,7 +17,7 @@* mode from SD card (SD2) */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configuration */ #define CFG_SYS_FSL_USDHC_NUM 2
include/configs/msc_sm2s_imx8mp.h +1 -1
@@ -55,7 +55,7 @@#define PHYS_SDRAM_2 0xc0000000#define PHYS_SDRAM_2_SIZE 0x0 -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR +#define CFG_MXC_UART_BASE UART2_BASE_ADDR#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/mx51evk.h +1 -1
@@ -18,7 +18,7 @@* Hardware drivers */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* PMIC Controller */ #define CFG_FSL_PMIC_BUS 0
include/configs/mx53cx9020.h +1 -1
@@ -14,7 +14,7 @@#include <asm/arch/imx-regs.h> -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/mx53loco.h +1 -1
@@ -11,7 +11,7 @@#include <asm/arch/imx-regs.h> -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/mx6cuboxi.h +1 -1
@@ -19,7 +19,7 @@/* Command definition */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#define CFG_EXTRA_ENV_SETTINGS \ "som_rev=undefined\0" \
include/configs/mx6memcal.h +3 -3
@@ -14,12 +14,12 @@#ifdef CONFIG_SERIAL_CONSOLE_UART1 #if defined(CONFIG_MX6SL ) -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR#else -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#endif #elif defined(CONFIG_SERIAL_CONSOLE_UART2 ) -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE#else #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)#endif
include/configs/mx6sabreauto.h +1 -1
@@ -8,7 +8,7 @@#ifndef __MX6SABREAUTO_CONFIG_H#define __MX6SABREAUTO_CONFIG_H -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE#define CONSOLE_DEV "ttymxc3"/* USB Configs */
include/configs/mx6sabresd.h +1 -1
@@ -8,7 +8,7 @@#ifndef __MX6SABRESD_CONFIG_H#define __MX6SABRESD_CONFIG_H -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#define CONSOLE_DEV "ttymxc0"#include "mx6sabre_common.h"
include/configs/mx6slevk.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART1_IPS_BASE_ADDR/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
include/configs/mx6sllevk.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#define CFG_EXTRA_ENV_SETTINGS \ "epdc_waveform=epdc_splash.bin\0" \
include/configs/mx6sxsabreauto.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#define CFG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \
include/configs/mx6sxsabresd.h +1 -1
@@ -12,7 +12,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#ifdef CONFIG_IMX_BOOTAUX
include/configs/mx6ul_14x14_evk.h +1 -1
@@ -15,7 +15,7 @@#define is_mx6ul_9x9_evk () CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #ifdef CONFIG_FSL_USDHC
include/configs/mx6ullevk.h +1 -1
@@ -16,7 +16,7 @@#define PHYS_SDRAM_SIZE SZ_512M -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #ifdef CONFIG_FSL_USDHC
include/configs/mys_6ulx.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_FSL_USDHC_NUM 1/* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
include/configs/nitrogen6x.h +1 -1
@@ -11,7 +11,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/novena.h +1 -1
@@ -49,7 +49,7 @@#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08/* UART */ -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE/* USB Configs */ #ifdef CONFIG_CMD_USB
include/configs/npi_imx6ull.h +1 -1
@@ -13,7 +13,7 @@#define CFG_SYS_FSL_USDHC_NUM 1/* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
include/configs/pcl063.h +1 -1
@@ -22,7 +22,7 @@#define CFG_SYS_FSL_USDHC_NUM 1/* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */
include/configs/pcl063_ull.h +1 -1
@@ -22,7 +22,7 @@#define MMC_ROOTFS_PART 2/* Console configs */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configs */
include/configs/pico-imx6.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR
include/configs/pico-imx6ul.h +1 -1
@@ -17,7 +17,7 @@#define CFG_FEC_MXC_PHYADDR 0x1 -#define CONFIG_MXC_UART_BASE UART6_BASE_ADDR +#define CFG_MXC_UART_BASE UART6_BASE_ADDR/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
include/configs/pico-imx7d.h +1 -1
@@ -10,7 +10,7 @@#include "mx7_common.h" -#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR +#define CFG_MXC_UART_BASE UART5_IPS_BASE_ADDR/* MMC Config */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/pico-imx8mq.h +1 -1
@@ -71,7 +71,7 @@#define PHYS_SDRAM 0x40000000#define PHYS_SDRAM_SIZE 0x80000000/* 2 GiB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) +#define CFG_MXC_UART_BASE UART_BASE_ADDR(1)#define CFG_SYS_FSL_USDHC_NUM 2#define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/tqma6_mba6.h +1 -1
@@ -11,7 +11,7 @@#define CFG_FEC_MXC_PHYADDR 0x03 -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1"#endif /* __CONFIG_TQMA6_MBA6_H */
include/configs/tqma6_wru4.h +1 -1
@@ -10,7 +10,7 @@#define CFG_FEC_MXC_PHYADDR 0x01/* UART */ -#define CONFIG_MXC_UART_BASE UART4_BASE +#define CFG_MXC_UART_BASE UART4_BASE#define CONSOLE_DEV "ttymxc3"/* Watchdog */
include/configs/udoo.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART2_BASE +#define CFG_MXC_UART_BASE UART2_BASE/* MMC Configuration */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/udoo_neo.h +1 -1
@@ -16,7 +16,7 @@#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR/* Command definition */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* Linux only */ #define CFG_EXTRA_ENV_SETTINGS \
include/configs/usbarmory.h +1 -1
@@ -17,7 +17,7 @@/* U-Boot general configurations */ /* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* SD/MMC */ #define CFG_SYS_FSL_ESDHC_ADDR 0
include/configs/vining_2000.h +1 -1
@@ -50,7 +50,7 @@#endif #ifdef CONFIG_SPL_BUILD -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE#endif #endif /* __CONFIG_H */
include/configs/wandboard.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" -#define CONFIG_MXC_UART_BASE UART1_BASE +#define CFG_MXC_UART_BASE UART1_BASE/* MMC Configuration */ #define CFG_SYS_FSL_USDHC_NUM 2
include/configs/xpress.h +1 -1
@@ -10,7 +10,7 @@#include "mx6_common.h" #include <asm/mach-imx/gpio.h> -#define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR +#define CFG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR/* MMC Configs */ #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
Signature · 1 line
2.25.1