Skip to contentSkip to conversation

power: pmic: Guard non-DM_PMIC drivers with a check for POWER_LEGACY

PATCH In review Tom Rini 7 participants 537 messages Nov 19, 2022 – Dec 24, 2022 1 message not in the archive Page 2 of 8

Subsystems (59)
lore
Share & tools
lore
author
#68 lore raw

PATCH 21/241 global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG

In reply to Tom Rini
---
 README                                      |  4 ++--
 doc/README.fsl-ddr                          |  4 ++--
 doc/README.link-local                       |  2 +-
 doc/arch/x86.rst                            |  4 ++--
 doc/develop/devicetree/control.rst          |  2 +-
 doc/develop/distro.rst                      |  2 +-
 doc/usage/environment.rst                   |  2 +-
 env/Kconfig                                 |  4 ++--
 include/configs/M5208EVBE.h                 |  2 +-
 include/configs/M5235EVB.h                  |  2 +-
 include/configs/M5253DEMO.h                 |  2 +-
 include/configs/M5272C3.h                   |  2 +-
 include/configs/M5275EVB.h                  |  2 +-
 include/configs/M5282EVB.h                  |  2 +-
 include/configs/M53017EVB.h                 |  2 +-
 include/configs/M5329EVB.h                  |  2 +-
 include/configs/M5373EVB.h                  |  2 +-
 include/configs/MCR3000.h                   |  2 +-
 include/configs/MPC837XERDB.h               |  2 +-
 include/configs/MPC8548CDS.h                |  2 +-
 include/configs/P1010RDB.h                  |  2 +-
 include/configs/P2041RDB.h                  |  2 +-
 include/configs/T102xRDB.h                  |  2 +-
 include/configs/T104xRDB.h                  |  2 +-
 include/configs/T208xQDS.h                  |  2 +-
 include/configs/T208xRDB.h                  |  2 +-
 include/configs/T4240RDB.h                  |  2 +-
 include/configs/alt.h                       |  2 +-
 include/configs/am335x_evm.h                |  2 +-
 include/configs/am335x_guardian.h           |  2 +-
 include/configs/am335x_igep003x.h           |  2 +-
 include/configs/am335x_shc.h                |  2 +-
 include/configs/am335x_sl50.h               |  2 +-
 include/configs/am3517_evm.h                |  2 +-
 include/configs/am43xx_evm.h                |  2 +-
 include/configs/am62x_evm.h                 |  2 +-
 include/configs/am64x_evm.h                 |  2 +-
 include/configs/am65x_evm.h                 |  2 +-
 include/configs/amcore.h                    |  2 +-
 include/configs/apalis-imx8.h               |  2 +-
 include/configs/apalis_imx6.h               |  2 +-
 include/configs/apple.h                     |  2 +-
 include/configs/arbel.h                     |  2 +-
 include/configs/aristainetos2.h             |  2 +-
 include/configs/astro_mcf5373l.h            |  2 +-
 include/configs/at91sam9263ek.h             |  2 +-
 include/configs/at91sam9n12ek.h             |  2 +-
 include/configs/ax25-ae350.h                |  2 +-
 include/configs/axs10x.h                    |  2 +-
 include/configs/baltos.h                    |  2 +-
 include/configs/bcm_ns3.h                   |  2 +-
 include/configs/bcmstb.h                    |  2 +-
 include/configs/beacon-rzg2m.h              |  4 ++--
 include/configs/bitmain_antminer_s9.h       |  2 +-
 include/configs/bk4r1.h                     |  2 +-
 include/configs/brppt1.h                    |  2 +-
 include/configs/brppt2.h                    |  2 +-
 include/configs/brsmarc1.h                  |  2 +-
 include/configs/brxre1.h                    |  2 +-
 include/configs/capricorn-common.h          |  2 +-
 include/configs/cgtqmx8.h                   |  2 +-
 include/configs/chiliboard.h                |  2 +-
 include/configs/cl-som-imx7.h               |  4 ++--
 include/configs/clearfog.h                  |  2 +-
 include/configs/cm_fx6.h                    |  2 +-
 include/configs/cm_t43.h                    |  2 +-
 include/configs/colibri-imx6ull.h           |  2 +-
 include/configs/colibri-imx8x.h             |  2 +-
 include/configs/colibri_imx6.h              |  2 +-
 include/configs/colibri_imx7.h              |  2 +-
 include/configs/colibri_vf.h                |  2 +-
 include/configs/conga-qeval20-qa3-e3845.h   |  4 ++--
 include/configs/controlcenterdc.h           |  2 +-
 include/configs/crs3xx-98dx3236.h           |  2 +-
 include/configs/da850evm.h                  |  2 +-
 include/configs/dart_6ul.h                  |  2 +-
 include/configs/db-88f6820-amc.h            |  2 +-
 include/configs/db-88f6820-gp.h             |  2 +-
 include/configs/db-xc3-24g4xg.h             |  2 +-
 include/configs/devkit3250.h                |  2 +-
 include/configs/devkit8000.h                |  2 +-
 include/configs/dfi-bt700.h                 |  4 ++--
 include/configs/dh_imx6.h                   |  2 +-
 include/configs/display5.h                  |  2 +-
 include/configs/dns325.h                    |  2 +-
 include/configs/dockstar.h                  |  2 +-
 include/configs/draco.h                     |  2 +-
 include/configs/dragonboard410c.h           |  2 +-
 include/configs/dragonboard820c.h           |  2 +-
 include/configs/dragonboard845c.h           |  2 +-
 include/configs/dreamplug.h                 |  2 +-
 include/configs/ds109.h                     |  2 +-
 include/configs/ds414.h                     |  2 +-
 include/configs/durian.h                    |  2 +-
 include/configs/el6x_common.h               |  2 +-
 include/configs/embestmx6boards.h           |  2 +-
 include/configs/emsdp.h                     |  2 +-
 include/configs/etamin.h                    |  2 +-
 include/configs/evb_ast2500.h               |  2 +-
 include/configs/evb_ast2600.h               |  2 +-
 include/configs/evb_rv1108.h                |  4 ++--
 include/configs/exynos5-common.h            |  2 +-
 include/configs/exynos7420-common.h         |  2 +-
 include/configs/exynos78x0-common.h         |  2 +-
 include/configs/gazerbeam.h                 |  2 +-
 include/configs/ge_b1x5v2.h                 |  2 +-
 include/configs/ge_bx50v3.h                 |  2 +-
 include/configs/goflexhome.h                |  2 +-
 include/configs/gose.h                      |  2 +-
 include/configs/guruplug.h                  |  2 +-
 include/configs/helios4.h                   |  2 +-
 include/configs/highbank.h                  |  2 +-
 include/configs/hikey.h                     |  2 +-
 include/configs/hikey960.h                  |  2 +-
 include/configs/hsdk-4xd.h                  |  2 +-
 include/configs/hsdk.h                      |  2 +-
 include/configs/ib62x0.h                    |  2 +-
 include/configs/iconnect.h                  |  2 +-
 include/configs/imx6-engicam.h              |  2 +-
 include/configs/imx6_logic.h                |  2 +-
 include/configs/imx6dl-mamoj.h              |  2 +-
 include/configs/imx6q-bosch-acc.h           |  2 +-
 include/configs/imx6ulz_smm_m2.h            |  2 +-
 include/configs/imx7-cm.h                   |  4 ++--
 include/configs/imx8mm-cl-iot-gate.h        |  2 +-
 include/configs/imx8mm-mx8menlo.h           |  4 ++--
 include/configs/imx8mm_beacon.h             |  2 +-
 include/configs/imx8mm_data_modul_edm_sbc.h |  2 +-
 include/configs/imx8mm_evk.h                |  2 +-
 include/configs/imx8mm_icore_mx8mm.h        |  2 +-
 include/configs/imx8mm_venice.h             |  2 +-
 include/configs/imx8mn_beacon.h             |  2 +-
 include/configs/imx8mn_bsh_smm_s2.h         |  2 +-
 include/configs/imx8mn_bsh_smm_s2pro.h      |  2 +-
 include/configs/imx8mn_evk.h                |  2 +-
 include/configs/imx8mn_var_som.h            |  2 +-
 include/configs/imx8mn_venice.h             |  2 +-
 include/configs/imx8mp_dhcom_pdk2.h         |  2 +-
 include/configs/imx8mp_evk.h                |  2 +-
 include/configs/imx8mp_icore_mx8mp.h        |  2 +-
 include/configs/imx8mp_rsb3720.h            |  2 +-
 include/configs/imx8mp_venice.h             |  2 +-
 include/configs/imx8mq_cm.h                 |  2 +-
 include/configs/imx8mq_evk.h                |  2 +-
 include/configs/imx8mq_phanbell.h           |  2 +-
 include/configs/imx8qm_mek.h                |  2 +-
 include/configs/imx8qm_rom7720.h            |  2 +-
 include/configs/imx8qxp_mek.h               |  2 +-
 include/configs/imx8ulp_evk.h               |  2 +-
 include/configs/imx93_evk.h                 |  2 +-
 include/configs/imxrt1050-evk.h             |  2 +-
 include/configs/iot2050.h                   |  2 +-
 include/configs/j721e_evm.h                 |  2 +-
 include/configs/j721s2_evm.h                |  2 +-
 include/configs/km/km-mpc83xx.h             |  2 +-
 include/configs/km/pg-wcom-ls102xa.h        |  2 +-
 include/configs/kmcent2.h                   |  2 +-
 include/configs/koelsch.h                   |  2 +-
 include/configs/kontron-sl-mx6ul.h          |  2 +-
 include/configs/kontron-sl-mx8mm.h          |  2 +-
 include/configs/kontron_pitx_imx8m.h        |  2 +-
 include/configs/kontron_sl28.h              |  2 +-
 include/configs/kp_imx53.h                  |  2 +-
 include/configs/kp_imx6q_tpc.h              |  2 +-
 include/configs/lacie_kw.h                  |  2 +-
 include/configs/lager.h                     |  2 +-
 include/configs/legoev3.h                   |  2 +-
 include/configs/librem5.h                   |  2 +-
 include/configs/liteboard.h                 |  2 +-
 include/configs/ls1012a2g5rdb.h             |  4 ++--
 include/configs/ls1012a_common.h            |  2 +-
 include/configs/ls1012afrdm.h               |  4 ++--
 include/configs/ls1012afrwy.h               |  4 ++--
 include/configs/ls1012aqds.h                |  4 ++--
 include/configs/ls1012ardb.h                |  4 ++--
 include/configs/ls1021aiot.h                |  2 +-
 include/configs/ls1021aqds.h                |  4 ++--
 include/configs/ls1021atsn.h                |  2 +-
 include/configs/ls1021atwr.h                |  4 ++--
 include/configs/ls1028aqds.h                |  4 ++--
 include/configs/ls1028ardb.h                |  4 ++--
 include/configs/ls1043a_common.h            |  2 +-
 include/configs/ls1046a_common.h            |  2 +-
 include/configs/ls1088a_common.h            |  2 +-
 include/configs/ls1088aqds.h                | 20 ++++++++++----------
 include/configs/ls1088ardb.h                |  6 +++---
 include/configs/ls2080a_common.h            |  2 +-
 include/configs/ls2080aqds.h                | 10 +++++-----
 include/configs/ls2080ardb.h                |  6 +++---
 include/configs/lsxl.h                      |  2 +-
 include/configs/lx2160aqds.h                |  2 +-
 include/configs/lx2160ardb.h                |  2 +-
 include/configs/lx2162aqds.h                |  2 +-
 include/configs/m53menlo.h                  |  2 +-
 include/configs/mccmon6.h                   |  2 +-
 include/configs/meson64.h                   |  4 ++--
 include/configs/meson64_android.h           |  2 +-
 include/configs/microblaze-generic.h        |  4 ++--
 include/configs/microchip_mpfs_icicle.h     |  2 +-
 include/configs/msc_sm2s_imx8mp.h           |  2 +-
 include/configs/mt7623.h                    |  2 +-
 include/configs/mt8183.h                    |  2 +-
 include/configs/mt8512.h                    |  2 +-
 include/configs/mt8516.h                    |  2 +-
 include/configs/mt8518.h                    |  2 +-
 include/configs/mvebu_alleycat-5.h          |  2 +-
 include/configs/mvebu_armada-37xx.h         |  2 +-
 include/configs/mvebu_armada-8k.h           |  2 +-
 include/configs/mx23_olinuxino.h            |  2 +-
 include/configs/mx23evk.h                   |  2 +-
 include/configs/mx28evk.h                   |  2 +-
 include/configs/mx51evk.h                   |  2 +-
 include/configs/mx53cx9020.h                |  2 +-
 include/configs/mx53loco.h                  |  2 +-
 include/configs/mx53ppd.h                   |  2 +-
 include/configs/mx6cuboxi.h                 |  2 +-
 include/configs/mx6sabre_common.h           |  2 +-
 include/configs/mx6slevk.h                  |  2 +-
 include/configs/mx6sllevk.h                 |  2 +-
 include/configs/mx6sxsabreauto.h            |  2 +-
 include/configs/mx6sxsabresd.h              |  2 +-
 include/configs/mx6ul_14x14_evk.h           |  2 +-
 include/configs/mx6ullevk.h                 |  2 +-
 include/configs/mx7dsabresd.h               |  2 +-
 include/configs/mx7ulp_com.h                |  2 +-
 include/configs/mx7ulp_evk.h                |  2 +-
 include/configs/mys_6ulx.h                  |  2 +-
 include/configs/nas220.h                    |  2 +-
 include/configs/nitrogen6x.h                |  2 +-
 include/configs/nokia_rx51.h                |  2 +-
 include/configs/novena.h                    |  2 +-
 include/configs/npi_imx6ull.h               |  2 +-
 include/configs/nsa310s.h                   |  2 +-
 include/configs/o4-imx6ull-nano.h           |  2 +-
 include/configs/octeontx2_common.h          |  2 +-
 include/configs/octeontx_common.h           |  4 ++--
 include/configs/odroid.h                    |  2 +-
 include/configs/odroid_xu3.h                |  4 ++--
 include/configs/omap3_beagle.h              |  2 +-
 include/configs/omap3_evm.h                 |  2 +-
 include/configs/omap3_igep00x0.h            |  2 +-
 include/configs/omap3_logic.h               |  2 +-
 include/configs/omapl138_lcdk.h             |  2 +-
 include/configs/openpiton-riscv64.h         |  2 +-
 include/configs/openrd.h                    |  2 +-
 include/configs/origen.h                    |  2 +-
 include/configs/p1_p2_rdb_pc.h              |  2 +-
 include/configs/pcl063.h                    |  2 +-
 include/configs/pcl063_ull.h                |  2 +-
 include/configs/pcm052.h                    |  2 +-
 include/configs/pcm058.h                    |  2 +-
 include/configs/pdu001.h                    |  2 +-
 include/configs/phycore_am335x_r2.h         |  2 +-
 include/configs/phycore_imx8mm.h            |  2 +-
 include/configs/phycore_imx8mp.h            |  2 +-
 include/configs/pic32mzdask.h               |  2 +-
 include/configs/pico-imx6.h                 |  2 +-
 include/configs/pico-imx6ul.h               |  2 +-
 include/configs/pico-imx7d.h                |  2 +-
 include/configs/pico-imx8mq.h               |  2 +-
 include/configs/pm9261.h                    |  2 +-
 include/configs/pm9263.h                    |  2 +-
 include/configs/pogo_e02.h                  |  2 +-
 include/configs/pogo_v4.h                   |  2 +-
 include/configs/poleg.h                     |  2 +-
 include/configs/pomelo.h                    |  2 +-
 include/configs/poplar.h                    |  2 +-
 include/configs/porter.h                    |  2 +-
 include/configs/presidio_asic.h             |  2 +-
 include/configs/px30_common.h               |  2 +-
 include/configs/pxm2.h                      |  2 +-
 include/configs/qcs404-evb.h                |  2 +-
 include/configs/qemu-arm.h                  |  2 +-
 include/configs/qemu-riscv.h                |  2 +-
 include/configs/rastaban.h                  |  2 +-
 include/configs/rcar-gen3-common.h          |  2 +-
 include/configs/rk3036_common.h             |  2 +-
 include/configs/rk3066_common.h             |  2 +-
 include/configs/rk3128_common.h             |  2 +-
 include/configs/rk3188_common.h             |  2 +-
 include/configs/rk322x_common.h             |  2 +-
 include/configs/rk3288_common.h             |  2 +-
 include/configs/rk3308_common.h             |  2 +-
 include/configs/rk3328_common.h             |  2 +-
 include/configs/rk3368_common.h             |  2 +-
 include/configs/rk3399_common.h             |  2 +-
 include/configs/rk3568_common.h             |  2 +-
 include/configs/rpi.h                       |  2 +-
 include/configs/rut.h                       |  2 +-
 include/configs/rv1108_common.h             |  2 +-
 include/configs/s5p4418_nanopi2.h           |  2 +-
 include/configs/s5p_goni.h                  |  2 +-
 include/configs/s5pc210_universal.h         |  2 +-
 include/configs/sdm845.h                    |  2 +-
 include/configs/sheevaplug.h                |  2 +-
 include/configs/sifive-unleashed.h          |  2 +-
 include/configs/sifive-unmatched.h          |  2 +-
 include/configs/silk.h                      |  2 +-
 include/configs/sipeed-maix.h               |  4 ++--
 include/configs/slimbootloader.h            |  6 +++---
 include/configs/smartweb.h                  |  2 +-
 include/configs/smdkc100.h                  |  2 +-
 include/configs/smegw01.h                   |  2 +-
 include/configs/snapper9g45.h               |  2 +-
 include/configs/sniper.h                    |  2 +-
 include/configs/socfpga_arria5_secu1.h      |  2 +-
 include/configs/socfpga_chameleonv3.h       |  2 +-
 include/configs/socfpga_common.h            |  4 ++--
 include/configs/socfpga_dbm_soc1.h          |  2 +-
 include/configs/socfpga_mcvevk.h            |  2 +-
 include/configs/socfpga_n5x_socdk.h         |  4 ++--
 include/configs/socfpga_soc64_common.h      |  2 +-
 include/configs/socfpga_vining_fpga.h       |  2 +-
 include/configs/socrates.h                  |  2 +-
 include/configs/somlabs_visionsom_6ull.h    |  2 +-
 include/configs/stemmy.h                    |  2 +-
 include/configs/stih410-b2260.h             |  2 +-
 include/configs/stm32f429-discovery.h       |  2 +-
 include/configs/stm32f429-evaluation.h      |  2 +-
 include/configs/stm32f469-discovery.h       |  2 +-
 include/configs/stm32f746-disco.h           |  2 +-
 include/configs/stm32h743-disco.h           |  2 +-
 include/configs/stm32h743-eval.h            |  2 +-
 include/configs/stm32h750-art-pi.h          |  2 +-
 include/configs/stm32mp13_common.h          |  2 +-
 include/configs/stm32mp15_common.h          |  2 +-
 include/configs/stm32mp15_dh_dhsom.h        |  2 +-
 include/configs/stm32mp15_st_common.h       |  6 +++---
 include/configs/stmark2.h                   |  2 +-
 include/configs/stout.h                     |  2 +-
 include/configs/sunxi-common.h              |  2 +-
 include/configs/synquacer.h                 |  2 +-
 include/configs/syzygy_hub.h                |  2 +-
 include/configs/taurus.h                    |  2 +-
 include/configs/tbs2910.h                   |  2 +-
 include/configs/tegra-common-post.h         |  2 +-
 include/configs/ten64.h                     |  4 ++--
 include/configs/theadorable-x86-common.h    |  4 ++--
 include/configs/theadorable.h               |  2 +-
 include/configs/thuban.h                    |  2 +-
 include/configs/thunderx_88xx.h             |  2 +-
 include/configs/ti814x_evm.h                |  2 +-
 include/configs/ti816x_evm.h                |  2 +-
 include/configs/ti_armv7_keystone2.h        |  2 +-
 include/configs/ti_omap4_common.h           |  2 +-
 include/configs/ti_omap5_common.h           |  2 +-
 include/configs/topic_miami.h               |  4 ++--
 include/configs/total_compute.h             |  2 +-
 include/configs/tqma6.h                     |  2 +-
 include/configs/trats.h                     |  2 +-
 include/configs/trats2.h                    |  2 +-
 include/configs/turris_mox.h                |  2 +-
 include/configs/turris_omnia.h              |  2 +-
 include/configs/udoo.h                      |  2 +-
 include/configs/udoo_neo.h                  |  2 +-
 include/configs/uniphier.h                  |  2 +-
 include/configs/usb_a9263.h                 |  2 +-
 include/configs/usbarmory.h                 |  2 +-
 include/configs/vcoreiii.h                  |  2 +-
 include/configs/verdin-imx8mm.h             |  2 +-
 include/configs/verdin-imx8mp.h             |  2 +-
 include/configs/vexpress_aemv8.h            |  2 +-
 include/configs/vexpress_common.h           |  2 +-
 include/configs/vf610twr.h                  |  2 +-
 include/configs/vinco.h                     |  2 +-
 include/configs/wandboard.h                 |  2 +-
 include/configs/warp7.h                     |  2 +-
 include/configs/x530.h                      |  2 +-
 include/configs/x86-common.h                |  2 +-
 include/configs/xea.h                       |  2 +-
 include/configs/xenguest_arm64.h            |  6 +++---
 include/configs/xilinx_versal.h             |  4 ++--
 include/configs/xilinx_versal_mini.h        |  4 ++--
 include/configs/xilinx_versal_net.h         |  4 ++--
 include/configs/xilinx_versal_net_mini.h    |  4 ++--
 include/configs/xilinx_zynqmp.h             |  8 ++++----
 include/configs/xilinx_zynqmp_mini.h        |  4 ++--
 include/configs/xilinx_zynqmp_r5.h          |  2 +-
 include/configs/xpress.h                    |  2 +-
 include/configs/zynq-common.h               |  4 ++--
 include/configs/zynq_cse.h                  |  2 +-
 include/env_default.h                       |  4 ++--
 scripts/config_whitelist.txt                |  2 +-
 383 files changed, 446 insertions(+), 446 deletions(-)
README +2 -2
index 71767e32d11b..52545b78a19b 100644
@@ -1190,7 +1190,7 @@ The following options need to be configured:
 		symbols.
 
 - Default Environment:
-		CONFIG_EXTRA_ENV_SETTINGS
+		CFG_EXTRA_ENV_SETTINGS
 
 		Define this to contain any number of null terminated
 		strings (variable = value pairs) that will be part of
@@ -1199,7 +1199,7 @@ The following options need to be configured:
 		For example, place something like this in your
 		board's config file:
 
-		#define CONFIG_EXTRA_ENV_SETTINGS \
+		#define CFG_EXTRA_ENV_SETTINGS \
 			"myvar1=value1\0" \
 			"myvar2=value2\0"
 
doc/README.fsl-ddr +2 -2
index 10e63f3be1d3..f44bb2aa25d4 100644
@@ -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
index 148b4987f27c..ec2ef940e4c8 100644
@@ -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
index 634387ac095c..725a1ae58639 100644
@@ -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
index c71570d64b47..0b3b32be1bb6 100644
@@ -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
index bc72aa951ef7..8016acad098a 100644
@@ -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
index 83f210d2d058..2c44e5da6aa0 100644
@@ -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
index 4e506ae262b5..5a7e2f299b06 100644
@@ -19,7 +19,7 @@ config ENV_SOURCE_FILE
 	  If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if
 	  the file board/<vendor>/<board>/<SYS_BOARD>.env exists. Otherwise the
 	  environment is assumed to come from the ad-hoc
-	  CONFIG_EXTRA_ENV_SETTINGS #define
+	  CFG_EXTRA_ENV_SETTINGS #define
 
 config SAVEENV
 	def_bool y if CMD_SAVEENV
@@ -655,7 +655,7 @@ config USE_DEFAULT_ENV_FILE
 	help
 	  Normally, the default environment is automatically generated
 	  based on the settings of various CONFIG_* options, as well
-	  as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
+	  as the CFG_EXTRA_ENV_SETTINGS. By selecting this option,
 	  you can instead define the entire default environment in an
 	  external file.
 
include/configs/M5208EVBE.h +1 -1
index b360238b332a..ef3837e137c7 100644
@@ -25,7 +25,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5208EVBe"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
include/configs/M5235EVB.h +1 -1
index ed45eccb62c9..a31d44177362 100644
@@ -34,7 +34,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5235EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
include/configs/M5253DEMO.h +1 -1
index 4be4d0f84512..a1cb1a8a7022 100644
@@ -28,7 +28,7 @@
 
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 
-#	define CONFIG_EXTRA_ENV_SETTINGS		\
+#	define CFG_EXTRA_ENV_SETTINGS		\
 		"netdev=eth0\0"				\
 		"inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"	\
 		"loadaddr=10000\0"			\
include/configs/M5272C3.h +1 -1
index a9339e505257..501785ac82e0 100644
@@ -37,7 +37,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5272C3"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
include/configs/M5275EVB.h +1 -1
index ff9f85358963..951209fbd750 100644
@@ -42,7 +42,7 @@
 #	define CONFIG_OVERWRITE_ETHADDR_ONCE
 #endif				/* FEC_ENET */
 
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"uboot=u-boot.bin\0"			\
include/configs/M5282EVB.h +1 -1
index bde9e770e52a..3912aae750d4 100644
@@ -37,7 +37,7 @@
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5282EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
 	"u-boot=u-boot.bin\0"			\
include/configs/M53017EVB.h +1 -1
index 42b74aeb9b5d..ad27766cf0f4 100644
@@ -38,7 +38,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M53017"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
 	"u-boot=u-boot.bin\0"			\
include/configs/M5329EVB.h +1 -1
index 72f0c63a1e21..f8aabe4944a4 100644
@@ -30,7 +30,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5329EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
 	"u-boot=u-boot.bin\0"	\
include/configs/M5373EVB.h +1 -1
index 4e8b54e01f4e..228fcde98dc3 100644
@@ -32,7 +32,7 @@
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5373EVB"
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
 	"u-boot=u-boot.bin\0"	\
include/configs/MCR3000.h +1 -1
index 232cf9e99845..6e7b6e81208f 100644
@@ -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
index 95a90199a429..2a71e0ad4dce 100644
@@ -231,7 +231,7 @@
 #define CONFIG_UBOOTPATH	"u-boot.bin"
 #define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=" CONFIG_NETDEV "\0"				\
 	"uboot=" CONFIG_UBOOTPATH "\0"					\
 	"tftpflash=tftp $loadaddr $uboot;"				\
include/configs/MPC8548CDS.h +1 -1
index 780ee5ae865a..515e88cf8206 100644
@@ -335,7 +335,7 @@
 #define CONFIG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK	 255.255.255.0
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:ecc=off\0"		\
 	"netdev=eth0\0"				\
 	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
include/configs/P1010RDB.h +1 -1
index b1d6b15811dd..bc24be79366c 100644
@@ -415,7 +415,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_UBOOTPATH	u-boot.bin/* U-Boot image on TFTP server */
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG)  "\0"	\
 	"netdev=eth0\0"						\
 	"uboot=" __stringify(CONFIG_UBOOTPATH) "\0"		\
include/configs/P2041RDB.h +1 -1
index 8b901ca47a0c..834400f1d601 100644
@@ -313,7 +313,7 @@
 
 #define __USB_PHY_TYPE	utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"bank_intlv=cs0_cs1\0"					\
 	"netdev=eth0\0"						\
include/configs/T102xRDB.h +1 -1
index 623d4cf5562d..f666683bcc4b 100644
@@ -439,7 +439,7 @@
 	"fdtfile=t1023rdb/t1023rdb.dtb\0"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	ARCH_EXTRA_ENV_SETTINGS					\
 	"hwconfig=fsl_ddr:ctlr_intlv=cacheline,"		\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"  \
include/configs/T104xRDB.h +1 -1
index b6938056bbe1..53bd8e85a627 100644
@@ -431,7 +431,7 @@
 #define FDTFILE		"t1042rdb/t1042d4rdb.dtb"
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:bank_intlv=cs0_cs1;"			\
 	"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
 	"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\
include/configs/T208xQDS.h +1 -1
index a93e05dd4d2d..5244c9d076f0 100644
@@ -426,7 +426,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
include/configs/T208xRDB.h +1 -1
index cf65a0da1883..022d483da763 100644
@@ -392,7 +392,7 @@
 
 #define __USB_PHY_TYPE		utmi
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
include/configs/T4240RDB.h +1 -1
index b51762264ade..6cf8b75c86c2 100644
@@ -382,7 +382,7 @@
 #define CTRL_INTLV_PREFERED cacheline
 #endif
 
-#define	CONFIG_EXTRA_ENV_SETTINGS				\
+#define	CFG_EXTRA_ENV_SETTINGS				\
 	"hwconfig=fsl_ddr:"					\
 	"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) ","	\
 	"bank_intlv=auto;"					\
include/configs/alt.h +1 -1
index fe303fda78a0..6d530f6d24bc 100644
@@ -33,7 +33,7 @@
 
 /* Board Clock */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"	\
 	"usb_pgood_delay=2000\0"
 
include/configs/am335x_evm.h +1 -1
index 755f7fae3e4f..1f473b5a1500 100644
@@ -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
index 7c5e7ce475ef..1de78e5a55dd 100644
@@ -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
index abd868c14538..e2beaf271859 100644
@@ -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
index 452887d6995c..c66650c8e8d1 100644
@@ -23,7 +23,7 @@
 #define CONFIG_HSMMC2_8BIT
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"kloadaddr=0x84000000\0" \
 	"fdtaddr=0x85000000\0" \
include/configs/am335x_sl50.h +1 -1
index 342a068c855f..f3d3d18c0551 100644
@@ -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
index c57a0ddc21dd..b75c64838831 100644
@@ -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
index 7659c1cc0619..3a6ffd9de0bb 100644
@@ -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
index 57f3f37908df..809d89119c42 100644
@@ -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
index 25c71f00a20f..26a7f2521ecc 100644
@@ -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
index 0307426e4aba..33dd6cfdfa45 100644
@@ -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
index ee0be972d243..78060d432a86 100644
@@ -12,7 +12,7 @@
 
 #define CFG_SYS_UART_PORT		0
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"upgrade_uboot=loady; "					\
 		"protect off 0xffc00000 0xffc1ffff; "		\
 		"erase 0xffc00000 0xffc1ffff; "			\
include/configs/apalis-imx8.h +1 -1
index cf23837863be..15bedc0afc29 100644
@@ -34,7 +34,7 @@
 #define BOOTENV_RUN_NET_USB_START ""
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"boot_file=Image\0" \
include/configs/apalis_imx6.h +1 -1
index a3c86545f077..4899dfb4dee1 100644
@@ -70,7 +70,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
include/configs/apple.h +1 -1
index b06660add4fa..fe7d11bcdb38 100644
@@ -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
index 60758b0ca02a..8e27fb52a1c3 100644
@@ -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
index e80166b3c467..b09e06ad4d85 100644
@@ -96,7 +96,7 @@
 	"done\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"disable_giga=yes\0" \
 	"usb_pgood_delay=2000\0" \
 	"nor_bootdelay=-2\0" \
include/configs/astro_mcf5373l.h +1 -1
index 62aa99342a0e..8f4419f402f7 100644
@@ -96,7 +96,7 @@
  * u-boot: 'set' command
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS			\
+#define CFG_EXTRA_ENV_SETTINGS			\
 	"loaderversion=11\0"				\
 	"card_id="__stringify(ASTRO_ID)"\0"			\
 	"alterafile=0\0"				\
include/configs/at91sam9263ek.h +1 -1
index afdb74785f8a..4101440ff5d5 100644
@@ -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
index 0f9e2cfb582d..c59d4bb38ca8 100644
@@ -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
index 03e04e6e6805..b743066ea7c3 100644
@@ -85,7 +85,7 @@
 	func(RAM, ram, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 				"kernel_addr_r=0x00080000\0" \
 				"pxefile_addr_r=0x01f00000\0" \
 				"scriptaddr=0x01f00000\0" \
include/configs/axs10x.h +1 -1
index 04dc50b1cb22..a82dfc902948 100644
@@ -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
index 6f6552e6dc34..e7946389eff3 100644
@@ -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
index b5469880fe2f..70dd2802686f 100644
@@ -795,7 +795,7 @@
 	QSPI_FLASH \
 	FLASH_IMAGES
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ARCH_ENV_SETTINGS
 
 #endif /* __BCM_NS3_H */
include/configs/bcmstb.h +1 -1
index 57360b60ca9c..d1de3561af63 100644
@@ -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
index 2713b158438e..65c01835cc6e 100644
@@ -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
index 556bfa08ebba..3662668c6a6b 100644
@@ -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
index 0842a4a8f543..5df8d03c7065 100644
@@ -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
index 2c5236aa58bb..236d720a55a8 100644
@@ -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
index d35c7c4a591e..7e4e8ee262bf 100644
@@ -26,7 +26,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
index f9908352b0dc..ffb4cd3027a1 100644
@@ -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
index 410b3e641c5c..9ca6d6f863d1 100644
@@ -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
index 474ad69d996c..a8273a7fcd8d 100644
@@ -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
index 6f3396bad4c8..263981860e86 100644
@@ -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
index 1e5154af0a15..850eb892db79 100644
@@ -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
index 5c9004cbd93a..2d56d37f06f8 100644
@@ -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
index 9c9e9506dc64..062d3d870269 100644
@@ -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
index 9df8baa8a969..c66cf721870c 100644
@@ -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
index fcc17fc6b7ce..06de4dbeb6d5 100644
@@ -43,7 +43,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x81200000\0" \
 	"bootm_size=0x8000000\0" \
include/configs/colibri-imx6ull.h +1 -1
index c0c3b4e0359a..a748d4f3169f 100644
@@ -83,7 +83,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
include/configs/colibri-imx8x.h +1 -1
index 6002d8d5c9f0..e4bb71d47d62 100644
@@ -60,7 +60,7 @@
 		"${fdt_addr};\0" \
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	AHAB_ENV \
 	BOOTENV \
 	CONFIG_MFG_ENV_SETTINGS \
include/configs/colibri_imx6.h +1 -1
index 60a3862a4d12..0486db6b51ed 100644
@@ -64,7 +64,7 @@
 	"ramdisk_addr_r=0x18400000\0" \
 	"scriptaddr=0x18280000\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"boot_file=zImage\0" \
 	"boot_script_dhcp=boot.scr\0" \
include/configs/colibri_imx7.h +1 -1
index 32a79b025545..99ed8183ef21 100644
@@ -123,7 +123,7 @@
 #endif
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MODULE_EXTRA_ENV_SETTINGS \
include/configs/colibri_vf.h +1 -1
index fa778ec9e2b7..122b599a6f21 100644
@@ -55,7 +55,7 @@
 
 #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	MEM_LAYOUT_ENV_SETTINGS \
 	UBI_BOOTCMD \
include/configs/conga-qeval20-qa3-e3845.h +2 -2
index 823d37fc38ca..31cfd2b12923 100644
@@ -19,8 +19,8 @@
 #define VIDEO_IO_OFFSET				0
 #define CONFIG_X86EMU_RAW_IO
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-22\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=tftp 100000 conga/u-boot.rom;"		\
include/configs/controlcenterdc.h +1 -1
index 5da2778b67be..8b31e14df31a 100644
@@ -24,7 +24,7 @@
 #define CONFIG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
-#define CONFIG_EXTRA_ENV_SETTINGS						\
+#define CFG_EXTRA_ENV_SETTINGS						\
 	"netdev=eth1\0"						\
 	"consoledev=ttyS1\0"							\
 	"u-boot=u-boot.bin\0"							\
include/configs/crs3xx-98dx3236.h +1 -1
index 25bcc2a6841c..6535730731a6 100644
@@ -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
index a818a4b39f83..cfc8330e35ae 100644
@@ -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
index 4b31bbf4e11a..323703ac5c90 100644
@@ -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
index b9d03d253d99..c4ae397e3e68 100644
@@ -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
index bba2b607aa86..6dbf582d733b 100644
@@ -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
index 84ea1baa9979..0ee914e91d08 100644
@@ -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
index 66aa6d5c3c45..ab10101f20a9 100644
@@ -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
index c8b176542d95..7993aa8af176 100644
@@ -33,7 +33,7 @@
 	DEFAULT_LINUX_BOOT_ENV
 
 /* Environment information */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"console=ttyO2,115200n8\0" \
 	"mmcdev=0\0" \
include/configs/dfi-bt700.h +2 -2
index 52f2d50118a4..1510f8df4378 100644
@@ -23,8 +23,8 @@
 #define VIDEO_IO_OFFSET				0
 #define CONFIG_X86EMU_RAW_IO
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kernel-ver=4.4.0-24\0"					\
 	"boot=zboot 03000000 0 04000000 ${filesize}\0"		\
 	"upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;"	\
include/configs/dh_imx6.h +1 -1
index f9b3d19480ed..56bb856a6dc2 100644
@@ -45,7 +45,7 @@
 #endif
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"console=ttymxc0,115200\0"	\
 	"fdt_addr=0x18000000\0"		\
 	"fdt_high=0xffffffff\0"		\
include/configs/display5.h +1 -1
index 7636d2869a9f..f95c1602e676 100644
@@ -167,7 +167,7 @@
 		"sf write ${loadaddr} 0x0 ${filesize};" \
 	"fi\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS	  \
+#define CFG_EXTRA_ENV_SETTINGS	  \
 	PARTS_DEFAULT \
 	"gpio_recovery=93\0" \
 	"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \
include/configs/dns325.h +1 -1
index 015bc78648f3..2a70db5e9382 100644
@@ -35,7 +35,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=serial\0" \
 	"stdout=serial\0" \
 	"stderr=serial\0" \
include/configs/dockstar.h +1 -1
index 33ae7d654b0b..07cec38b50d0 100644
@@ -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
index ab3cf10d7793..b56ba9132af2 100644
@@ -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
index daf7ecd7975b..73aec348458a 100644
@@ -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
index 31cd8536de4b..499708371113 100644
@@ -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
index bd88c42a3ba5..c1e590fae2a5 100644
@@ -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
index fbd83d629c02..733020d3e261 100644
@@ -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
index 8553ea0b95f2..ede21a4e2c57 100644
@@ -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
index 76d1713fdc68..e69883ba73bc 100644
@@ -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
index 001596c00a45..9f11e18d34ad 100644
@@ -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
index 89e071c0df66..a5e2dc063a74 100644
@@ -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
index 22e0fa5aabfd..4a929937b416 100644
@@ -76,7 +76,7 @@
 	CONSOLE_STDIN_SETTINGS \
 	CONSOLE_STDOUT_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	"fdtfile=" CONFIG_FDTFILE "\0" \
include/configs/emsdp.h +1 -1
index c2b921e7cb8b..83aaa09cdbb0 100644
@@ -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
index 9011940abe4b..32b45b1e5b8d 100644
@@ -138,7 +138,7 @@
 #define ETAMIN_NAND_GPMC_CONFIG6	0x16000f80
 
 /* Default env settings */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"hostname=etamin\0" \
 	"ubi_off=4096\0"\
 	"nand_img_size=0x400000\0" \
include/configs/evb_ast2500.h +1 -1
index bec1660cf485..f304929263e9 100644
@@ -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
index c9c988b93740..e1cce58fa933 100644
@@ -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
index 13e3cb2ffeb1..e7d866551a5f 100644
@@ -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
index 0490c2dad53e..860fd1601a66 100644
@@ -94,7 +94,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
include/configs/exynos7420-common.h +1 -1
index cff910c1bd5b..c8408eb39200 100644
@@ -67,7 +67,7 @@
 #define EXYNOS_FDTFILE_SETTING
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS
include/configs/exynos78x0-common.h +1 -1
index 8672b9e95270..92c84cd8ce05 100644
@@ -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
index 36dcee87c5fb..7ab504f35531 100644
@@ -59,7 +59,7 @@
 #define CONFIG_HOSTNAME		"gazerbeam"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consoledev=ttyS1\0"						\
 	"u-boot=u-boot.bin\0"						\
include/configs/ge_b1x5v2.h +1 -1
index 1458b187de28..9dc1d7394afd 100644
@@ -36,7 +36,7 @@
 #define CFG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* Command definition */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=/boot/fitImage\0" \
 	"fdt_addr_r=0x18000000\0" \
 	"splash_addr_r=0x20000000\0" \
include/configs/ge_bx50v3.h +1 -1
index f62b8f175e1f..32960fb93256 100644
@@ -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
index 66eed9e14f81..bc517286b113 100644
@@ -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
index d1fe375a2c1f..45f0ec6f6a0e 100644
@@ -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
index 4954c5ca0800..c4f53e6e4004 100644
@@ -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
index fc32487e1c7b..7d81d1cf1e4c 100644
@@ -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
index 4aef0b4abd12..76e6054b0cc1 100644
@@ -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
index d4280decc9f0..36bf22b1870e 100644
@@ -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
index fad1f980481e..40d5e653c3f1 100644
@@ -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
index 59ea8960071a..f59da4177316 100644
@@ -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
index fbfcded47123..2177fafcdc06 100644
@@ -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
index 05192218d225..242f92e6fd72 100644
@@ -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
index f2e3608d3a3f..f719ecb5fe0b 100644
@@ -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
index 36b6b95b84de..4208ba95915e 100644
@@ -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
index 4e23f1a2dc5d..0df61916b7d2 100644
@@ -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
index 402f83c18eae..b6006c021d5c 100644
@@ -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
index 392f97050a65..e28185f24dd3 100644
@@ -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
index 2d9d3c34b0db..c95038eaa537 100644
@@ -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
index 76771fd66ce9..438e79df3cc1 100644
@@ -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
index c228cf7f37ba..00ce7fb62a93 100644
@@ -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
index 938c5406b821..a86bd76a3c72 100644
@@ -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
index 03325e6c3a7a..ee524f0e63f2 100644
@@ -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
index 80321cf2d8d3..44d74bb1a788 100644
@@ -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
index 8a694c88a53a..d28f3f1972b9 100644
@@ -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
index 41ab9307793f..e718daa07c3e 100644
@@ -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
index 28ce834769c3..c490e3829f9a 100644
@@ -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
index 85fd5e2371f9..bb3dfe3fa0d2 100644
@@ -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
index a768ff355109..e97b8e871d22 100644
@@ -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
index 035e5c7bd90f..8619fdde7fdb 100644
@@ -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
index 024b86c7f1d0..b759b834b808 100644
@@ -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
index 4633843d1bbb..205337948cfc 100644
@@ -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
index a585cbf87e44..80c2df9f30ff 100644
@@ -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
index 5443022b04c7..b8fdedefa21f 100644
@@ -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
index 738677ff37cd..63ea25d9788b 100644
@@ -34,7 +34,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/imx8mp_icore_mx8mp.h +1 -1
index d67bad8971dd..8fac898403f1 100644
@@ -36,7 +36,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	BOOTENV \
 	"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/imx8mp_rsb3720.h +1 -1
index 58f7dc6518c1..ed4da0e69b5b 100644
@@ -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
index e79aa5707537..4b32d5a77ef6 100644
@@ -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
index 4df98e3f3735..f6f356d27ba2 100644
@@ -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
index 688c0bf70080..c40448715f8a 100644
@@ -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
index 3b4cd6562235..8fed3e31964c 100644
@@ -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
index f1f907f3e5a4..7772e71013ef 100644
@@ -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
index 2e2e5ed43cde..5692e3d00007 100644
@@ -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
index d75b8bf0c18f..669da591fa2b 100644
@@ -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
index d313bdc2a448..30dd5af03b00 100644
@@ -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
index 895c50f60253..5cd6492dd503 100644
@@ -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
index 84228676c7fd..7688464841eb 100644
@@ -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
index 0f6150fc9c7e..7d087413362c 100644
@@ -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
index e66f994a375f..a7210b5cf3ae 100644
@@ -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
index ab204c62b7d6..54dfea6952e9 100644
@@ -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
index 840a4d5401f5..227c45f0634a 100644
@@ -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
index 05cdcbfba193..a67301b9ecd6 100644
@@ -222,7 +222,7 @@
 			"can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,"	\
 			"asrc,spdif,lpuart1,ftm1\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_NEW_ENV						\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_HW_ENV_SETTINGS						\
include/configs/kmcent2.h +1 -1
index 17eb9a7c2ea0..639f2075e69f 100644
@@ -441,7 +441,7 @@ int get_scl(void);
 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	CONFIG_KM_DEF_ENV						\
 	CONFIG_KM_DEF_ARCH						\
 	CONFIG_KM_NEW_ENV						\
include/configs/koelsch.h +1 -1
index 736865ad80af..61ff80d2c983 100644
@@ -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
index 6fcacdb0c664..81ca83fdbfab 100644
@@ -46,6 +46,6 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX6UL_CONFIG_H */
include/configs/kontron-sl-mx8mm.h +1 -1
index 80a32304606a..2e21aacd1893 100644
@@ -50,6 +50,6 @@
 #define CONFIG_MALLOC_F_ADDR		0x930000
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
+#define CFG_EXTRA_ENV_SETTINGS BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */
include/configs/kontron_pitx_imx8m.h +1 -1
index 17c63d834107..d909bbbbcfda 100644
@@ -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
index 9c3174d0e02c..218e9d9b3013 100644
@@ -65,7 +65,7 @@
 	func(PXE, pxe, 0)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"env_addr=0x203e0004\0" \
 	"envload=env import -d -b ${env_addr}\0" \
 	"install_rcw=source 20200000\0" \
include/configs/kp_imx53.h +1 -1
index c551585a2062..da8a67b4ab63 100644
@@ -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
index 136e228682a6..99321b320f5f 100644
@@ -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
index 828f91096344..db45585ba313 100644
@@ -51,7 +51,7 @@
  * Default environment variables
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"stdin=serial\0"					\
 	"stdout=serial\0"					\
 	"stderr=serial\0"					\
include/configs/lager.h +1 -1
index f3feaa539fcc..777d5b94d1cd 100644
@@ -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
index abe470fe890b..b9ec7f379354 100644
@@ -49,7 +49,7 @@
  */
 #define LINUX_BOOT_PARAM_ADDR	(PHYS_SDRAM_1 + 0x100)
 #define CONFIG_SETUP_INITRD_TAG
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootenvfile=uEnv.txt\0" \
 	"fdtfile=da850-lego-ev3.dtb\0" \
 	"memsize=64M\0" \
include/configs/librem5.h +1 -1
index 11b3fa6c857d..1818a57e49c5 100644
@@ -64,7 +64,7 @@
 #endif
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"scriptaddr=0x80000000\0" \
 	"pxefile_addr_r=0x80100000\0" \
 	"kernel_addr_r=0x80800000\0" \
include/configs/liteboard.h +1 -1
index 721da818633a..938ab5ade9a7 100644
@@ -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
index f0a9e9ab3155..d1e0ed5817e9 100644
@@ -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
index 9e4f949016ef..a5f680db2d37 100644
@@ -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
index c19ed2f43ecf..4243a21f1f18 100644
@@ -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
index 1b417c72e704..872296749c0a 100644
@@ -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
index 495bb3911b3a..35e8ff057986 100644
@@ -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
index d74936d1281d..1e843f896c7e 100644
@@ -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
index 024a71852753..0a08619384b6 100644
@@ -94,7 +94,7 @@
 
 #define HWCONFIG_BUFFER_SIZE		256
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 "initrd_high=0xffffffff\0"
 
include/configs/ls1021aqds.h +2 -2
index 5a91cc3efec0..3bfb014adf11 100644
@@ -279,12 +279,12 @@
 #define HWCONFIG_BUFFER_SIZE		256
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
 	"initrd_high=0xffffffff\0"      \
 	"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
include/configs/ls1021atsn.h +1 -1
index 5612c60ae904..d4855819bd7f 100644
@@ -75,7 +75,7 @@
 	func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0"		\
 	"initrd_high=0xffffffff\0"					\
 	"kernel_addr=0x61000000\0"					\
include/configs/ls1021atwr.h +2 -2
index 3c4c207edd06..8a36620bf3ab 100644
@@ -166,7 +166,7 @@
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_LPUART
-#define CONFIG_EXTRA_ENV_SETTINGS       \
+#define CFG_EXTRA_ENV_SETTINGS       \
 	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
@@ -222,7 +222,7 @@
 		"cp.b $kernel_addr $load_addr "		\
 		"$kernel_size && bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootargs=root=/dev/ram0 rw console=ttyS0,115200 "	\
 		"cma=64M@0x0-0xb0000000\0" \
 	"initrd_high=0xffffffff\0"      \
include/configs/ls1028aqds.h +2 -2
index 228fb122f5f3..769ece901c19 100644
@@ -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
index 5c134612576c..8c53636beac3 100644
@@ -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
index a3fa92d1ff47..e259cf810c0a 100644
@@ -120,7 +120,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"initrd_high=0xffffffffffffffff\0"	\
include/configs/ls1046a_common.h +1 -1
index 4ed5481c3e74..e566ad4eed33 100644
@@ -98,7 +98,7 @@
 #endif
 #ifndef SPL_NO_MISC
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
include/configs/ls1088a_common.h +1 -1
index 57429d4bbe32..e229ba2eea64 100644
@@ -118,7 +118,7 @@ unsigned long long get_qixis_addr(void);
 
 #ifndef SPL_NO_ENV
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
include/configs/ls1088aqds.h +10 -10
index a35045d640ff..a34a71f649f6 100644
@@ -297,8 +297,8 @@
 
 /* Initial environment variables */
 #ifdef CONFIG_NXP_ESBC
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -329,8 +329,8 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580A00000 0x580E00000\0"
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -391,8 +391,8 @@
 		"$kernel_size && bootm $kernel_load#$BOARD\0"
 #else
 #if defined(CONFIG_QSPI_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
@@ -409,8 +409,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"	\
 	"mcmemsize=0x70000000 \0"
 #elif defined(CONFIG_SD_BOOT)
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS               \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS               \
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
@@ -427,8 +427,8 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else	/* NOR BOOT */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS		\
 	COMMON_ENV				\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x90100000\0"			\
include/configs/ls1088ardb.h +3 -3
index 7bc4fc6a6652..bd543a37e879 100644
@@ -238,9 +238,9 @@
 #endif
 #endif /* CONFIG_TFABOOT */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
@@ -308,7 +308,7 @@
 		" && esbc_validate ${kernelheader_addr_r};"	\
 		"bootm $load_addr#$BOARD\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"BOARD=ls1088ardb\0"			\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
include/configs/ls2080a_common.h +1 -1
index e82456fd8148..631392cb8dd2 100644
@@ -110,7 +110,7 @@ unsigned long long get_qixis_addr(void);
 #define HWCONFIG_BUFFER_SIZE		128
 
 /* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
include/configs/ls2080aqds.h +5 -5
index 924d4057d936..12b5af1b4f2f 100644
@@ -230,9 +230,9 @@
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_NXP_ESBC
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
@@ -257,7 +257,7 @@
 #define IFC_MC_INIT_CMD				\
 	"fsl_mc start mc 0x580a00000" \
 	" 0x580e00000 \0"
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x80100000\0"                 \
 	"loadaddr_sd=0x90100000\0"                 \
@@ -313,7 +313,7 @@
 	"$kernel_addr_sd $kernel_size_sd && "	\
 	"bootm $load_addr#$BOARD\0"
 #elif defined(CONFIG_SD_BOOT)
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"    \
 	"loadaddr=0x90100000\0"                 \
 	"kernel_addr=0x800\0"                \
@@ -329,7 +329,7 @@
 	"fsl_mc start mc 0x80a00000 0x80e00000\0"       \
 	"mcmemsize=0x70000000 \0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"loadaddr=0x80100000\0"			\
 	"kernel_addr=0x100000\0"		\
include/configs/ls2080ardb.h +3 -3
index c50b6030680c..1259df8f3a9a 100644
@@ -279,9 +279,9 @@
 #endif
 
 /* Initial environment variables */
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_TFABOOT
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
@@ -343,7 +343,7 @@
 		"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
 		"bootm $load_addr#$board\0"
 #else
-#define CONFIG_EXTRA_ENV_SETTINGS		\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"ramdisk_addr=0x800000\0"		\
 	"ramdisk_size=0x2000000\0"		\
include/configs/lsxl.h +1 -1
index c82eb8b04bf8..47d7ec57b80a 100644
@@ -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
index 9f891064bd5d..3a316e73308f 100644
@@ -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
index 58c0ff36571e..8cc4e0db03f0 100644
@@ -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
index 157688ef7d7a..54d7cea4c599 100644
@@ -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
index 66591390d903..9c37212463e1 100644
@@ -86,7 +86,7 @@
  */
 #define CONFIG_HOSTNAME		"m53menlo"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
include/configs/mccmon6.h +1 -1
index 7c401a2cfd6c..7ea682049261 100644
@@ -34,7 +34,7 @@
 /* Ethernet Configuration */
 #define CONFIG_FEC_MXC_PHYADDR		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
include/configs/meson64.h +2 -2
index f06fe73485fb..e2800df87869 100644
@@ -76,8 +76,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"stdin=" STDIN_CFG "\0" \
 	"stdout=" STDOUT_CFG "\0" \
 	"stderr=" STDOUT_CFG "\0" \
include/configs/meson64_android.h +1 -1
index 1266851196d2..c0e977abb01f 100644
@@ -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
index edd2466caa98..ede4ffd53f4e 100644
@@ -78,8 +78,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"unlock=yes\0"\
 	"nor0=flash-0\0"\
 	"mtdparts=mtdparts=flash-0:"\
include/configs/microchip_mpfs_icicle.h +1 -1
index 3def93d61e8a..0350f7a62da7 100644
@@ -21,7 +21,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
 	"kernel_addr_r=0x84000000\0" \
 	"fdt_addr_r=0x88000000\0" \
include/configs/msc_sm2s_imx8mp.h +1 -1
index cfe926c0a141..ef2111cd20ab 100644
@@ -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
index 39a7ba76633b..031c1aea0c00 100644
@@ -44,7 +44,7 @@
 #include <config_distro_bootcmd.h>
 
 /* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	ENV_MEM_LAYOUT_SETTINGS		\
 	BOOTENV
 
include/configs/mt8183.h +1 -1
index 3da7619d78d7..1f973829bba4 100644
@@ -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
index 3a35527da10d..c0fc8688ca67 100644
@@ -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
index 0f7981a56611..73776e3705b7 100644
@@ -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
index 8a8bc85ca70e..d6bd1a103866 100644
@@ -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
index 5c9620371e3c..c8c0fc671ab0 100644
@@ -27,7 +27,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS   \
+#define CFG_EXTRA_ENV_SETTINGS   \
 	BOOTENV \
 	"kernel_addr_r=0x202000000\0" \
 	"fdt_addr_r=0x201000000\0"    \
include/configs/mvebu_armada-37xx.h +1 -1
index 9bfc48c52d90..76e148f55ebf 100644
@@ -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
index beac3ae6496d..239a09763ae1 100644
@@ -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
index aa3d7a1a3fc8..e769ba2e8377 100644
@@ -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
index f597cdb30563..5ceba8b15fa4 100644
@@ -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
index c740d8533274..f9f65f6968e1 100644
@@ -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
index ddd37b3936ff..8ab1ee79a79c 100644
@@ -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
index cd806cb698e9..baffe65c3697 100644
@@ -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
index d0107fcc8cb1..0ac93d6e0432 100644
@@ -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
index 9464d6e44aea..94d2191af91d 100644
@@ -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
index f7f209c20b59..d4af96b51ea4 100644
@@ -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
index 6294fd1e2c42..e1cdedf27680 100644
@@ -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
index 358d9f47c0f3..4fbd06783a6d 100644
@@ -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
index 8731f6a3e4ad..cf4871cbae39 100644
@@ -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
index 0dd40563c29b..9d8737c19425 100644
@@ -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
index 6f5dffe4fbb8..8372f979dc86 100644
@@ -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
index cb1019bd56a7..90c788468710 100644
@@ -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
index 0e986093f35a..4a27fd22902b 100644
@@ -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
index 377e4d9c4b27..183e67857ca1 100644
@@ -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
index 85922fa436cb..5ee5129801d2 100644
@@ -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
index 99e01896c71b..5f4cd9306231 100644
@@ -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
index a32fcd57f8fc..43261824d3cf 100644
@@ -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
index 1b7eb3433483..9676ccc982f5 100644
@@ -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
index 5020b3bb71db..e1689679e5f6 100644
@@ -66,7 +66,7 @@
 #include <config_distro_bootcmd.h>
 #include <linux/stringify.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc1\0" \
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
include/configs/nokia_rx51.h +1 -1
index 04bff3ca4f67..96c23b5b5af7 100644
@@ -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
index 4e46dfc526ce..19b40070be92 100644
@@ -64,7 +64,7 @@
 #endif
 
 /* Extra U-Boot environment. */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"fdt_high=0xffffffff\0"						\
 	"initrd_high=0xffffffff\0"					\
 	"consdev=ttymxc1\0"						\
include/configs/npi_imx6ull.h +1 -1
index 09c4ddb6646b..07580f409492 100644
@@ -40,7 +40,7 @@
 
 #define CONFIG_FEC_ENET_DEV		1
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
 	"image=zImage\0" \
 	"fdtfile=imx6ull-seeed-npi-dev-board.dtb\0" \
include/configs/nsa310s.h +1 -1
index 62f07011809c..76c4aed6fd91 100644
@@ -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
index ea1edab9fc12..0e1083a2130c 100644
@@ -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
index 03d1a8e7b5fc..c4db38562d83 100644
@@ -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
index 58275ccffa01..0be26ef3287f 100644
@@ -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
index e2331e45cdfe..3ac13a65d63f 100644
@@ -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
index 7a81585494a9..a1542f3f8025 100644
@@ -68,8 +68,8 @@
  */
 
 /* Define new extra env settings, including DFU settings */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS \
 	EXYNOS_FDTFILE_SETTING \
 	MEM_LAYOUT_ENV_SETTINGS \
include/configs/omap3_beagle.h +1 -1
index f4e23bbb0f30..efeb7bf10078 100644
@@ -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
index 8bb8521f1c1c..adb25a62970c 100644
@@ -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
index a6b5e55b5415..93d36353ffb0 100644
@@ -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
index 389553775100..957f1c369e6d 100644
@@ -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
index 788a1113868b..02b88da28efa 100644
@@ -138,7 +138,7 @@
 
 #include <environment/ti/mmc.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	DEFAULT_MMC_TI_ARGS \
 	"bootpart=0:2\0" \
include/configs/openpiton-riscv64.h +1 -1
index 5b097e9fef29..5adfc6719585 100644
@@ -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
index 006f06e6af5c..ec3a0e0676d7 100644
@@ -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
index 6633d541a31b..d4ba599d72a4 100644
@@ -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
index 9738e9fa9cb7..88182fde972b 100644
@@ -424,7 +424,7 @@
 
 #include "p1_p2_bootsrc.h"
 
-#define	CONFIG_EXTRA_ENV_SETTINGS	\
+#define	CFG_EXTRA_ENV_SETTINGS	\
 "netdev=eth0\0"	\
 "uboot=" __stringify(CONFIG_UBOOTPATH) "\0"	\
 "loadaddr=1000000\0"	\
include/configs/pcl063.h +1 -1
index 2a1660bf188d..146f87e9ce33 100644
@@ -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
index 4421e740d9ea..0890c115700c 100644
@@ -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
index 5c2ff5d02ee7..34994016c54c 100644
@@ -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
index 3674e4cddaed..2991076c50a1 100644
@@ -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
index 71807837673f..80b14b002a92 100644
@@ -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
index f922491637d9..4e6dc79f41b2 100644
@@ -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
index 7f73117ac1c8..9160c78c0464 100644
@@ -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
index 11a833bb1276..16505529afc7 100644
@@ -19,7 +19,7 @@
 
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"image=Image\0" \
 	"console=ttymxc0,115200\0" \
 	"fdt_addr=0x48000000\0" \
include/configs/pic32mzdask.h +1 -1
index 3cc2a693ceee..60c747327588 100644
@@ -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
index 719b70144051..66258a3ab73b 100644
@@ -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
index 5dfd737cf7a4..a4b97451cfdc 100644
@@ -47,7 +47,7 @@
 	"bootmenu_2=Boot using PICO-Pi baseboard=" \
 		"setenv fdtfile imx6ul-pico-pi.dtb\0" \
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"splashpos=m,m\0" \
include/configs/pico-imx7d.h +1 -1
index 581921510426..7fc6211ff732 100644
@@ -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
index f9301a5524b9..ac25991703f2 100644
@@ -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
index a233fb8ed746..f4a34f261a6e 100644
@@ -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
index 9fd897958a4f..4994d7367fe8 100644
@@ -168,7 +168,7 @@
 /* USB */
 #define CFG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
 	"ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "		\
include/configs/pogo_e02.h +1 -1
index 085732214e50..af750e86ee98 100644
@@ -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
index b5ce2dd13d08..016da6d04b0b 100644
@@ -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
index 518d7a3639c5..7998ef7347fb 100644
@@ -17,7 +17,7 @@
 #define CONFIG_SERVERIP                 192.168.0.1
 #define CONFIG_IPADDR                   192.168.0.2
 #define CONFIG_NETMASK                  255.255.255.0
-#define CONFIG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
+#define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
 		"stdout=serial\0"   \
 		"stderr=serial\0"    \
include/configs/pomelo.h +1 -1
index 1c11685f49e4..8e74dc488875 100644
@@ -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
index c58105597e47..6e8adf91877c 100644
@@ -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
index 88fa65e0ffc1..969e175883bb 100644
@@ -34,7 +34,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
index 2b25c31b1d8d..df07df6a5a72 100644
@@ -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
index 99376155b491..003686930a4b 100644
@@ -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
index 48f49906b84e..10eaeb49de62 100644
@@ -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
index c41bb341d82e..8ea59aa21ca6 100644
@@ -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
index a67af73fd56f..45bd94ee5c76 100644
@@ -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
index 72f35cc05420..11c795787887 100644
@@ -36,7 +36,7 @@
 #define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \
 	"qemu "
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
include/configs/rastaban.h +1 -1
index 59d56d666242..777df4c11259 100644
@@ -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
index e9cbd2538240..54844fe69662 100644
@@ -33,7 +33,7 @@
 
 /* ENV setting */
 
-#define CONFIG_EXTRA_ENV_SETTINGS	\
+#define CFG_EXTRA_ENV_SETTINGS	\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __RCAR_GEN3_COMMON_H */
include/configs/rk3036_common.h +1 -1
index a4cae697181d..ea6073f29446 100644
@@ -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
index 99c86edeaa40..c4758e148ba7 100644
@@ -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
index 302546630ac6..5b0ec3700040 100644
@@ -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
index 334fb3affa5e..58f491c2f320 100644
@@ -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
index 58ad62afe165..b95268df87c2 100644
@@ -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
index 6b55c57dd770..d3b8a5150f6b 100644
@@ -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
index 4b510b139910..bc03e113fef0 100644
@@ -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
index 132b7d0fe9bc..85d2186f23e0 100644
@@ -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
index 92cdc1a51fbd..17636250510b 100644
@@ -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
index 78f624d31ca2..43066933d02f 100644
@@ -44,7 +44,7 @@
 
 #include <config_distro_bootcmd.h>
 #include <environment/distro/sf.h>
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"partitions=" PARTS_DEFAULT \
include/configs/rk3568_common.h +1 -1
index d43dc2580e46..750f16d03999 100644
@@ -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
index e3549275138b..c3f8e7bf85cd 100644
@@ -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
index b07d0c50604d..99799f8494e0 100644
@@ -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
index 84a5ae6965dd..6e17b23b624c 100644
@@ -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
index e071d4da5e86..02c469049adb 100644
@@ -142,7 +142,7 @@
 	#define EXTRA_ENV_BOOT_LOGO  EXTRA_ENV_DTB_RESERVE
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"fdt_high=0xffffffff\0"					\
 	"initrd_high=0xffffffff\0"				\
 	"rootdev=" __stringify(CONFIG_ROOT_DEV) "\0"		\
include/configs/s5p_goni.h +1 -1
index b7a91af008c7..f898d2d9ee52 100644
@@ -61,7 +61,7 @@
 
 #define COMMON_BOOT	"${console} ${meminfo} ${mtdparts}"
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS					\
 	"updateb=" \
 		"onenand erase 0x0 0x100000;" \
 		"onenand write 0x32008000 0x0 0x100000\0" \
include/configs/s5pc210_universal.h +1 -1
index 80d3fc9258cc..bf2d04a169b3 100644
@@ -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
index f7cdd5a19568..9a4fe530a20b 100644
@@ -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
index 19701ccce22e..a228dac2ee92 100644
@@ -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
index 5ad2124bddab..59e40710de48 100644
@@ -39,7 +39,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
include/configs/sifive-unmatched.h +1 -1
index f4b1a16019ec..3cf300a2e459 100644
@@ -36,7 +36,7 @@
 	"name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \
 	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x84000000\0" \
 	"kernel_comp_addr_r=0x88000000\0" \
 	"kernel_comp_size=0x4000000\0" \
include/configs/silk.h +1 -1
index 58613effaf47..025d56671122 100644
@@ -34,7 +34,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
index 974531ea0d82..760a0a5b9135 100644
@@ -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
index ff0ed180e92e..748a423b0833 100644
@@ -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
index b988b96e58d8..762f61470b15 100644
@@ -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
index ccb7ec38d033..c148757915a2 100644
@@ -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
index 14f9cf560286..11031744bef8 100644
@@ -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
index b7aa49ce435e..df8ed451a43a 100644
@@ -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
index afca7e18e9be..eaee8dd37396 100644
@@ -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
index 29b4b22b3988..f12163ccc990 100644
@@ -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
index aa13878177ef..2ce7011529a4 100644
@@ -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
index 807bff43e00a..3603bb9f4a0b 100644
@@ -148,8 +148,8 @@
 
 #include <config_distro_bootcmd.h>
 
-#ifndef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#ifndef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
 	"bootm_size=0xa000000\0" \
 	"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \
include/configs/socfpga_dbm_soc1.h +1 -1
index 8f1c2de998ea..565a661258fd 100644
@@ -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
index e76438e228d5..ac70d91e2081 100644
@@ -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
index c295e91e3d3e..fe5286e12cd1 100644
@@ -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
index df3927297bbe..66ecb168a0a0 100644
@@ -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
index 70d9f3607a67..cd48650dd554 100644
@@ -28,7 +28,7 @@
  *                            Linux system after 5 seconds
  */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\
include/configs/socrates.h +1 -1
index 95393d3ab25e..fb2b76eb829a 100644
@@ -139,7 +139,7 @@
 #define CFG_SYS_BOOTMAPSZ	(8 << 20)	/* Initial Memory map for Linux	*/
 
 
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
+#define	CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"							\
 	"consdev=ttyS0\0"						\
 	"uboot_file=/home/tftp/syscon3/u-boot.bin\0"			\
include/configs/somlabs_visionsom_6ull.h +1 -1
index de0f48b79a15..e13280563513 100644
@@ -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
index a5987c5e17a1..e58ddd752cd3 100644
@@ -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
index 9294d57ca84e..b3fce5031687 100644
@@ -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
index afd7d50428bf..de5019a364a0 100644
@@ -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
index c8aad47966fe..a4f3e43dc5a1 100644
@@ -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
index 573a6b179561..62a7e9af0c56 100644
@@ -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
index 14e883a35892..34856d300403 100644
@@ -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
index 67e6a3a19d21..d36cd6fdd44a 100644
@@ -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
index 4786eb001bc1..8f242bf0ff6e 100644
@@ -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
index e667fe6f6ac2..d27b6a3d1de2 100644
@@ -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
index c259a616133b..7c59c69e0bdc 100644
@@ -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
index c9cfadd9ce0b..ec8c8fba91f1 100644
@@ -138,7 +138,7 @@
 	"fdtoverlay_addr_r=" __FDTOVERLAY_ADDR_R "\0" \
 	"ramdisk_addr_r=" __RAMDISK_ADDR_R "\0"
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	STM32MP_MEM_LAYOUT \
 	STM32MP_BOOTCMD \
 	STM32MP_PARTS_DEFAULT \
include/configs/stm32mp15_dh_dhsom.h +1 -1
index 910d7ef107b5..919216906249 100644
@@ -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
index 38b5aa7319cf..d0cd4130cec2 100644
@@ -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
index faff8d6ed6d1..be0193105b4b 100644
@@ -15,7 +15,7 @@
 #define LDS_BOARD_TEXT						\
 	board/sysam/stmark2/sbf_dram_init.o (.text*)
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"kern_size=0x700000\0"					\
 	"loadaddr=0x40001000\0"					\
 		"-(rootfs)\0"					\
include/configs/stout.h +1 -1
index f49e88cb17cb..5058e0a204d7 100644
@@ -38,7 +38,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
index 1677aafad03b..f3c8f7002342 100644
@@ -324,7 +324,7 @@
 #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
 #endif
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_EXTRA_SETTINGS \
include/configs/synquacer.h +1 -1
index 699268900109..271080303fb6 100644
@@ -92,7 +92,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define	CONFIG_EXTRA_ENV_SETTINGS		\
+#define	CFG_EXTRA_ENV_SETTINGS		\
 	"fdt_addr_r=0x9fe00000\0"		\
 	"kernel_addr_r=0x90000000\0"		\
 	"ramdisk_addr_r=0xa0000000\0"		\
include/configs/syzygy_hub.h +1 -1
index 7af7b08eb485..e8a207f54167 100644
@@ -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
index 30f842558207..855218a8901e 100644
@@ -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
index fcc967494220..61f252cb638c 100644
@@ -33,7 +33,7 @@
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #endif /* CONFIG_CMD_USB      */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	BOOTENV \
 	"bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
 	"bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
include/configs/tegra-common-post.h +1 -1
index 69acabf19fdd..31c82822a2af 100644
@@ -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
index 57724719a9d6..e86c16313293 100644
@@ -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
index af0a095dfc8c..f34063249e48 100644
@@ -20,9 +20,9 @@
 
 /* Environment settings */
 
-#undef CONFIG_EXTRA_ENV_SETTINGS
+#undef CFG_EXTRA_ENV_SETTINGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS				\
+#define CFG_EXTRA_ENV_SETTINGS				\
 	"tftpdir=" DEF_ENV_TFTPDIR "\0"				\
 	"eth_init=" DEF_ENV_ETH_INIT "\0"			\
 	"ubuntu_part=" __stringify(DEF_ENV_UBUNTU_PART) "\0"	\
include/configs/theadorable.h +1 -1
index 76b496303f3e..9722b0db72aa 100644
@@ -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
index c8b27263e85e..1753fa410d18 100644
@@ -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
index 7becf1eb7cb4..8ba40546b2c0 100644
@@ -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/ti814x_evm.h +1 -1
index 03849adb5abe..28dba4aa95b6 100644
@@ -20,7 +20,7 @@
 
 /* commands to include */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x80F80000\0" \
 	"rdaddr=0x81000000\0" \
include/configs/ti816x_evm.h +1 -1
index 7b04292d2188..2d9d2fd66e9a 100644
@@ -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
index ea45bba409cb..479ab46e4edd 100644
@@ -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
index 64ec59d78eb6..49f4263e16ba 100644
@@ -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
index 37ab2e446724..e9723ed5b3dd 100644
@@ -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
index 83abaeddf125..3795e6152fa9 100644
@@ -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
index 0f28690612ab..e007be8e4564 100644
@@ -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
index 7a1ad9544a30..14d7730f67bf 100644
@@ -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
index 3eac66539dfe..2067327918a2 100644
@@ -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;" \
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

include/configs/trats2.h +1 -1
index 125d3e776a3f..21372243bbc8 100644

Lines of this file are not shown. View the raw message.

include/configs/turris_mox.h +1 -1
index fdb420ed874e..3443c80d06ef 100644

Lines of this file are not shown. View the raw message.

include/configs/turris_omnia.h +1 -1
index 52de4cdc7893..47b220ff9ee7 100644

Lines of this file are not shown. View the raw message.

include/configs/udoo.h +1 -1
index fac8c1eeb4e2..f0092eff1494 100644

Lines of this file are not shown. View the raw message.

include/configs/udoo_neo.h +1 -1
index d4c92233acaa..5d7d734daa2d 100644

Lines of this file are not shown. View the raw message.

include/configs/uniphier.h +1 -1
index 8cd81f1cdddc..2fe056cfef4a 100644

Lines of this file are not shown. View the raw message.

include/configs/usb_a9263.h +1 -1
index 657dbadd3396..b90e047955b9 100644

Lines of this file are not shown. View the raw message.

include/configs/usbarmory.h +1 -1
index a2bc3cd23a5b..f273533be429 100644

Lines of this file are not shown. View the raw message.

include/configs/vcoreiii.h +1 -1
index b03159805c15..2e150276e7a4 100644

Lines of this file are not shown. View the raw message.

include/configs/verdin-imx8mm.h +1 -1
index 18ac6b2b0895..7f3fa795afdc 100644

Lines of this file are not shown. View the raw message.

include/configs/verdin-imx8mp.h +1 -1
index 88839a6e561a..3ce2714e196e 100644

Lines of this file are not shown. View the raw message.

include/configs/vexpress_aemv8.h +1 -1
index 30c1f5025b05..87b8c5d57ee7 100644

Lines of this file are not shown. View the raw message.

include/configs/vexpress_common.h +1 -1
index e8b6acf8b8fe..705a941e3603 100644

Lines of this file are not shown. View the raw message.

include/configs/vf610twr.h +1 -1
index 14e6b2bac91c..0e0b3a7b594d 100644

Lines of this file are not shown. View the raw message.

include/configs/vinco.h +1 -1
index 9f72bdde8167..74ee61f09238 100644

Lines of this file are not shown. View the raw message.

include/configs/wandboard.h +1 -1
index 6923009d4598..1e765439fabe 100644

Lines of this file are not shown. View the raw message.

include/configs/warp7.h +1 -1
index 3cdf4a1ffc67..709bb046d018 100644

Lines of this file are not shown. View the raw message.

include/configs/x530.h +1 -1
index dee87cb77325..f20a85cfa19a 100644

Lines of this file are not shown. View the raw message.

include/configs/x86-common.h +1 -1
index 3e17b53dde2d..7705d31a313a 100644

Lines of this file are not shown. View the raw message.

include/configs/xea.h +1 -1
index b432ab2dc8ef..50b96f31e163 100644

Lines of this file are not shown. View the raw message.

include/configs/xenguest_arm64.h +3 -3
index 612436aeb48f..bc268d25dc3a 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_versal.h +2 -2
index ee3130ed3277..836a6506b1ad 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_versal_mini.h +2 -2
index e1f95de3c34f..23655a475221 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_versal_net.h +2 -2
index 7d77189693e2..b8d2685246f3 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_versal_net_mini.h +2 -2
index 1939832a848e..50bacc39ac58 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_zynqmp.h +4 -4
index efe241df97eb..f07e7d3f0ac3 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_zynqmp_mini.h +2 -2
index 1c0ab25c6440..9af05456640b 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_zynqmp_r5.h +1 -1
index 3a7b7e03d6af..918aa3d7402a 100644

Lines of this file are not shown. View the raw message.

include/configs/xpress.h +1 -1
index 3e604894ad48..a480bb720b58 100644

Lines of this file are not shown. View the raw message.

include/configs/zynq-common.h +2 -2
index b8c142fed37b..7f739d9ada0e 100644

Lines of this file are not shown. View the raw message.

include/configs/zynq_cse.h +1 -1
index ac6e8c4ff867..a9bb5bb90ad1 100644

Lines of this file are not shown. View the raw message.

include/env_default.h +2 -2
index 4e461c815a79..1621815f257a 100644

Lines of this file are not shown. View the raw message.

scripts/config_whitelist.txt +1 -1
index 99b3796584d0..62bb86b56fd6 100644

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.

author
#69 lore raw

PATCH 22/241 global: Migrate CONFIG_FB_ADDR to CFG

In reply to Tom Rini
---
 drivers/video/nexell_display.c | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/nexell_display.c +1 -1
index 5595796a678b..af2698ffca84 100644
@@ -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;
scripts/config_whitelist.txt +1 -1
index 62bb86b56fd6..66728d47db38 100644
@@ -22,7 +22,7 @@ CFG_ENV_TOTAL_SIZE
 CFG_ET1100_BASE
 CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
-CONFIG_FB_ADDR
+CFG_FB_ADDR
 CONFIG_FDTADDR
 CONFIG_FDTFILE
 CONFIG_FEC_ENET_DEV
Signature · 1 line
2.25.1
author
#70 lore raw

PATCH 23/241 global: Migrate CONFIG_FDTADDR to CFG

In reply to Tom Rini
---
 include/configs/colibri_vf.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/colibri_vf.h +1 -1
index 122b599a6f21..ef49969598c9 100644
@@ -20,7 +20,7 @@
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
-#define CONFIG_FDTADDR			0x84000000
+#define CFG_FDTADDR			0x84000000
 
 #define MEM_LAYOUT_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
scripts/config_whitelist.txt +1 -1
index 66728d47db38..e436bf55d94d 100644
@@ -23,7 +23,7 @@ CFG_ET1100_BASE
 CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
-CONFIG_FDTADDR
+CFG_FDTADDR
 CONFIG_FDTFILE
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
Signature · 1 line
2.25.1
author
#71 lore raw

PATCH 24/241 global: Migrate CONFIG_FDTFILE to CFG

In reply to Tom Rini
---
 include/configs/MPC837XERDB.h     | 4 ++--
 include/configs/embestmx6boards.h | 6 +++---
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
include/configs/MPC837XERDB.h +2 -2
index 2a71e0ad4dce..2eea26d7bee7 100644
@@ -229,7 +229,7 @@
 #define CONFIG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH	"u-boot.bin"
-#define CONFIG_FDTFILE		"mpc8379_rdb.dtb"
+#define CFG_FDTFILE		"mpc8379_rdb.dtb"
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"netdev=" CONFIG_NETDEV "\0"				\
@@ -246,7 +246,7 @@
 		"cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE)	\
 			" $filesize\0"	\
 	"fdtaddr=780000\0"						\
-	"fdtfile=" CONFIG_FDTFILE "\0"					\
+	"fdtfile=" CFG_FDTFILE "\0"					\
 	"ramdiskaddr=1000000\0"						\
 	"ramdiskfile=rootfs.ext2.gz.uboot\0"				\
 	"console=ttyS0\0"						\
include/configs/embestmx6boards.h +3 -3
index 4a929937b416..8f03c2ff3c0d 100644
@@ -35,11 +35,11 @@
 
 #if defined(CONFIG_ENV_IS_IN_MMC)
 /* RiOTboard */
-#define CONFIG_FDTFILE	"imx6dl-riotboard.dtb"
+#define CFG_FDTFILE	"imx6dl-riotboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	3
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 /* MarSBoard */
-#define CONFIG_FDTFILE	"imx6q-marsboard.dtb"
+#define CFG_FDTFILE	"imx6q-marsboard.dtb"
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
@@ -79,7 +79,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
 	CONSOLE_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
-	"fdtfile=" CONFIG_FDTFILE "\0" \
+	"fdtfile=" CFG_FDTFILE "\0" \
 	"finduuid=part uuid mmc 0:1 uuid\0" \
 	BOOTENV
 
scripts/config_whitelist.txt +1 -1
index e436bf55d94d..6a20473cd6ea 100644
@@ -24,7 +24,7 @@ CFG_ETHBASE
 CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
 CFG_FDTADDR
-CONFIG_FDTFILE
+CFG_FDTFILE
 CONFIG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
Signature · 1 line
2.25.1
author
#72 lore raw

PATCH 25/241 global: Migrate CONFIG_FEC_ENET_DEV to CFG

In reply to Tom Rini
---
 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
 board/freescale/mx6ullevk/mx6ullevk.c             | 2 +-
 board/seeed/npi_imx6ull/npi_imx6ull.c             | 2 +-
 board/variscite/dart_6ul/dart_6ul.c               | 2 +-
 include/configs/capricorn-common.h                | 2 +-
 include/configs/dart_6ul.h                        | 2 +-
 include/configs/liteboard.h                       | 2 +-
 include/configs/mx6ul_14x14_evk.h                 | 6 +++---
 include/configs/mx6ullevk.h                       | 2 +-
 include/configs/npi_imx6ull.h                     | 2 +-
 include/configs/xpress.h                          | 2 +-
 scripts/config_whitelist.txt                      | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +1 -1
index 1eec048a66fa..570b5014dbb1 100644
@@ -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
index 86c11c7bd3a5..e24738064757 100644
@@ -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
index eb9ee555c854..c610d2c30696 100644
@@ -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
index 7326daa1798d..98d8d1c31205 100644
@@ -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
index a8273a7fcd8d..63afa6e18969 100644
@@ -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
index 323703ac5c90..c2ed9c7c56af 100644
@@ -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
index 938ab5ade9a7..7200c69bd9e6 100644
@@ -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
index 90c788468710..efc599f37a6d 100644
@@ -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
index 4a27fd22902b..58d1a744ae99 100644
@@ -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
index 07580f409492..8f052c5ae38f 100644
@@ -38,7 +38,7 @@
 #define CONFIG_FEC_MXC_PHYADDR		0x1
 #endif
 
-#define CONFIG_FEC_ENET_DEV		1
+#define CFG_FEC_ENET_DEV		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200n8\0" \
include/configs/xpress.h +1 -1
index a480bb720b58..d095e63182ee 100644
@@ -31,7 +31,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 
-#define CONFIG_FEC_ENET_DEV		0
+#define CFG_FEC_ENET_DEV		0
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
scripts/config_whitelist.txt +1 -1
index 6a20473cd6ea..0a60216b8050 100644
@@ -25,7 +25,7 @@ CFG_EXTRA_ENV_SETTINGS
 CFG_FB_ADDR
 CFG_FDTADDR
 CFG_FDTFILE
-CONFIG_FEC_ENET_DEV
+CFG_FEC_ENET_DEV
 CONFIG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
Signature · 1 line
2.25.1
author
#73 lore raw

PATCH 26/241 global: Migrate CONFIG_FEC_FIXED_SPEED to CFG

In reply to Tom Rini
---
 doc/README.fec_mxc           | 2 +-
 drivers/net/fec_mxc.c        | 8 ++++----
 include/configs/brppt2.h     | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
doc/README.fec_mxc +1 -1
index d17dfb676f79..d27276b8783e 100644
@@ -22,7 +22,7 @@ CONFIG_FEC_MXC_PHYADDR
 	Optional, selects the exact phy address that should be connected
 	and function fecmxc_initialize will try to initialize it.
 
-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
 	Optional, selects a fixed speed on the MAC interface without asking some
 	phy. This is usefull if there is a direct MAC <-> MAC connection, for
 	example if the CPU is connected directly via the RGMII interface to a
drivers/net/fec_mxc.c +4 -4
index a61a1fc75738..659625a29d39 100644
@@ -268,7 +268,7 @@ static int miiphy_restart_aneg(struct eth_device *dev)
 	return ret;
 }
 
-#ifndef CONFIG_FEC_FIXED_SPEED
+#ifndef CFG_FEC_FIXED_SPEED
 static int miiphy_wait_aneg(struct eth_device *dev)
 {
 	uint32_t start;
@@ -294,7 +294,7 @@ static int miiphy_wait_aneg(struct eth_device *dev)
 
 	return 0;
 }
-#endif /* CONFIG_FEC_FIXED_SPEED */
+#endif /* CFG_FEC_FIXED_SPEED */
 #endif
 
 static int fec_rx_task_enable(struct fec_priv *fec)
@@ -536,8 +536,8 @@ static int fec_open(struct udevice *dev)
 		}
 		speed = fec->phydev->speed;
 	}
-#elif CONFIG_FEC_FIXED_SPEED
-	speed = CONFIG_FEC_FIXED_SPEED;
+#elif CFG_FEC_FIXED_SPEED
+	speed = CFG_FEC_FIXED_SPEED;
 #else
 	miiphy_wait_aneg(edev);
 	speed = miiphy_speed(edev->name, fec->phy_id);
include/configs/brppt2.h +1 -1
index 7e4e8ee262bf..92f34407b401 100644
@@ -81,7 +81,7 @@ BUR_COMMON_ENV \
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* Ethernet */
-#define CONFIG_FEC_FIXED_SPEED		_1000BASET
+#define CFG_FEC_FIXED_SPEED		_1000BASET
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
scripts/config_whitelist.txt +1 -1
index 0a60216b8050..1917a8d090b2 100644
@@ -26,7 +26,7 @@ CFG_FB_ADDR
 CFG_FDTADDR
 CFG_FDTFILE
 CFG_FEC_ENET_DEV
-CONFIG_FEC_FIXED_SPEED
+CFG_FEC_FIXED_SPEED
 CONFIG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
Signature · 1 line
2.25.1
author
#74 lore raw

PATCH 27/241 global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG

In reply to Tom Rini
---
 board/compulab/cl-som-imx7/cl-som-imx7.c        | 2 +-
 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +-
 doc/README.fec_mxc                              | 2 +-
 drivers/net/fec_mxc.c                           | 4 ++--
 include/configs/aristainetos2.h                 | 2 +-
 include/configs/capricorn-common.h              | 2 +-
 include/configs/cgtqmx8.h                       | 2 +-
 include/configs/cl-som-imx7.h                   | 2 +-
 include/configs/cm_fx6.h                        | 2 +-
 include/configs/imx6_logic.h                    | 2 +-
 include/configs/imx6dl-mamoj.h                  | 2 +-
 include/configs/imx8mm-cl-iot-gate.h            | 2 +-
 include/configs/imx8mm_evk.h                    | 2 +-
 include/configs/imx8mp_evk.h                    | 2 +-
 include/configs/imx8mp_icore_mx8mp.h            | 2 +-
 include/configs/imx8mp_rsb3720.h                | 2 +-
 include/configs/imx8mq_evk.h                    | 2 +-
 include/configs/imx8mq_phanbell.h               | 2 +-
 include/configs/imx8ulp_evk.h                   | 2 +-
 include/configs/kontron_pitx_imx8m.h            | 2 +-
 include/configs/liteboard.h                     | 2 +-
 include/configs/m53menlo.h                      | 2 +-
 include/configs/mccmon6.h                       | 2 +-
 include/configs/msc_sm2s_imx8mp.h               | 2 +-
 include/configs/mx6sxsabreauto.h                | 2 +-
 include/configs/mx6sxsabresd.h                  | 2 +-
 include/configs/mx6ul_14x14_evk.h               | 4 ++--
 include/configs/nitrogen6x.h                    | 2 +-
 include/configs/npi_imx6ull.h                   | 2 +-
 include/configs/pico-imx6.h                     | 2 +-
 include/configs/pico-imx6ul.h                   | 2 +-
 include/configs/pico-imx8mq.h                   | 2 +-
 include/configs/somlabs_visionsom_6ull.h        | 2 +-
 include/configs/tqma6_mba6.h                    | 2 +-
 include/configs/tqma6_wru4.h                    | 2 +-
 include/configs/vf610twr.h                      | 2 +-
 include/configs/vining_2000.h                   | 2 +-
 include/configs/xpress.h                        | 2 +-
 scripts/config_whitelist.txt                    | 2 +-
 39 files changed, 41 insertions(+), 41 deletions(-)
board/compulab/cl-som-imx7/cl-som-imx7.c +1 -1
index 9733a33ee2c2..1b08a2c5abf2 100644
@@ -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
index 7340a3440231..9205d5ef6ddb 100644
@@ -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
index d27276b8783e..7aadea222f85 100644
@@ -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
index 659625a29d39..8c231ec80066 100644
@@ -1090,8 +1090,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
 	int addr;
 
 	addr = device_get_phy_addr(priv, dev);
-#ifdef CONFIG_FEC_MXC_PHYADDR
-	addr = CONFIG_FEC_MXC_PHYADDR;
+#ifdef CFG_FEC_MXC_PHYADDR
+	addr = CFG_FEC_MXC_PHYADDR;
 #endif
 
 	phydev = phy_connect(priv->bus, addr, dev, priv->interface);
include/configs/aristainetos2.h +1 -1
index b09e06ad4d85..9b11934546c1 100644
@@ -28,7 +28,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define CONFIG_FEC_MXC_PHYADDR		0
+#define CFG_FEC_MXC_PHYADDR		0
 
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \
include/configs/capricorn-common.h +1 -1
index 63afa6e18969..19c7fca03b29 100644
@@ -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
index 263981860e86..caa1498acead 100644
@@ -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
index 2d56d37f06f8..cde7d3c891ab 100644
@@ -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
index c66cf721870c..47b76c9371e8 100644
@@ -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
index 0df61916b7d2..121b34ae96db 100644
@@ -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
index b6006c021d5c..162b0b8a69bb 100644
@@ -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
index 00ce7fb62a93..7785bdc7cbe6 100644
@@ -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
index d28f3f1972b9..c364e06dc450 100644
@@ -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
index 63ea25d9788b..cba59dbfd938 100644
@@ -21,7 +21,7 @@
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define PHY_ANEG_TIMEOUT 20000
 
include/configs/imx8mp_icore_mx8mp.h +1 -1
index 8fac898403f1..03dbeefb7a86 100644
@@ -21,7 +21,7 @@
 #endif
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define DWC_NET_PHYADDR			1
 
include/configs/imx8mp_rsb3720.h +1 -1
index ed4da0e69b5b..38ae5f137022 100644
@@ -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
index c40448715f8a..d9ce5d5d0f1a 100644
@@ -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
index 8fed3e31964c..eb7059f0648c 100644
@@ -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
index 30dd5af03b00..b7397f6038fd 100644
@@ -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
index d909bbbbcfda..4dd51c7f1d7f 100644
@@ -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
index 7200c69bd9e6..0b8781d7bf34 100644
@@ -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
index 9c37212463e1..4123964256bd 100644
@@ -55,7 +55,7 @@
  * Ethernet on SOC (FEC)
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x0
+#define CFG_FEC_MXC_PHYADDR		0x0
 #endif
 
 #define CFG_SYS_RTC_BUS_NUM		1 /* I2C2 */
include/configs/mccmon6.h +1 -1
index 7ea682049261..4be47e78d676 100644
@@ -32,7 +32,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES	{ (32 * SZ_1M) }
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR		1
+#define CFG_FEC_MXC_PHYADDR		1
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0,115200 quiet\0" \
include/configs/msc_sm2s_imx8mp.h +1 -1
index ef2111cd20ab..1cd0b3cf7374 100644
@@ -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
index 9d8737c19425..3399cdd16fa8 100644
@@ -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
index 8372f979dc86..c99d99abc179 100644
@@ -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
index efc599f37a6d..5e3695ecc971 100644
@@ -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
index e1689679e5f6..811688ae82af 100644
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_USDHC_NUM       2
 
 #define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR		6
+#define CFG_FEC_MXC_PHYADDR		6
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/npi_imx6ull.h +1 -1
index 8f052c5ae38f..664d4f11c867 100644
@@ -35,7 +35,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR		0x1
+#define CFG_FEC_MXC_PHYADDR		0x1
 #endif
 
 #define CFG_FEC_ENET_DEV		1
include/configs/pico-imx6.h +1 -1
index 66258a3ab73b..e1f7b7003194 100644
@@ -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
index a4b97451cfdc..6148a343117d 100644
@@ -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
index ac25991703f2..1d8709180c83 100644
@@ -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
index e13280563513..3418d4e2b559 100644
@@ -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
index 899c218727f3..a5f14dc42679 100644
@@ -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
index 4d8839b6e60d..34c9b6a2f97c 100644
@@ -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
index 0e0b3a7b594d..d10b88f15754 100644
@@ -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
index 1a71b300fc55..c84353ebea66 100644
@@ -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
index d095e63182ee..ce6ca175363b 100644
@@ -32,7 +32,7 @@
 #define CONFIG_MXC_USB_FLAGS		0
 
 #define CFG_FEC_ENET_DEV		0
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_UBOOT_SECTOR_START	0x2
 #define CONFIG_UBOOT_SECTOR_COUNT	0x3fe
scripts/config_whitelist.txt +1 -1
index 1917a8d090b2..901914ac043c 100644
@@ -27,7 +27,7 @@ CFG_FDTADDR
 CFG_FDTFILE
 CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
-CONFIG_FEC_MXC_PHYADDR
+CFG_FEC_MXC_PHYADDR
 CONFIG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
Signature · 1 line
2.25.1
author
#75 lore raw

PATCH 28/241 global: Migrate CONFIG_FLASH_BR_PRELIM to CFG

In reply to Tom Rini
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/p1_p2_rdb_pc.h +1 -1
index 88182fde972b..54687d3ada4e 100644
@@ -193,7 +193,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
scripts/config_whitelist.txt +1 -1
index 901914ac043c..0767c66a79ff 100644
@@ -28,7 +28,7 @@ CFG_FDTFILE
 CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
-CONFIG_FLASH_BR_PRELIM
+CFG_FLASH_BR_PRELIM
 CONFIG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
Signature · 1 line
2.25.1
author
#76 lore raw

PATCH 29/241 global: Migrate CONFIG_FLASH_OR_PRELIM to CFG

In reply to Tom Rini
---
 include/configs/p1_p2_rdb_pc.h | 2 +-
 scripts/config_whitelist.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/p1_p2_rdb_pc.h +1 -1
index 54687d3ada4e..de7c0d61c05f 100644
@@ -196,7 +196,7 @@
 #define CFG_FLASH_BR_PRELIM (BR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) \
 	| BR_PS_16 | BR_V)
 
-#define CONFIG_FLASH_OR_PRELIM	0xfc000ff7
+#define CFG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
scripts/config_whitelist.txt +1 -1
index 0767c66a79ff..ae4cb04023ad 100644
@@ -29,7 +29,7 @@ CFG_FEC_ENET_DEV
 CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
-CONFIG_FLASH_OR_PRELIM
+CFG_FLASH_OR_PRELIM
 CONFIG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
Signature · 1 line
2.25.1
author
#77 lore raw

PATCH 30/241 global: Migrate CONFIG_FLASH_SECTOR_SIZE to CFG

In reply to Tom Rini
---
 include/configs/ax25-ae350.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/ax25-ae350.h +1 -1
index b743066ea7c3..6661f2d173ce 100644
@@ -50,7 +50,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES {0x4000000}
 
 /* max number of sectors on one chip */
-#define CONFIG_FLASH_SECTOR_SIZE	(0x10000*2)
+#define CFG_FLASH_SECTOR_SIZE	(0x10000*2)
 
 /* environments */
 
scripts/config_whitelist.txt +1 -1
index ae4cb04023ad..89f47538d4c7 100644
@@ -30,7 +30,7 @@ CFG_FEC_FIXED_SPEED
 CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
-CONFIG_FLASH_SECTOR_SIZE
+CFG_FLASH_SECTOR_SIZE
 CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
Signature · 1 line
2.25.1
author
#78 lore raw

PATCH 31/241 global: Migrate CONFIG_FLASH_SHOW_PROGRESS to CFG

In reply to Tom Rini
---
 README                               |  2 +-
 drivers/mtd/cfi_flash.c              | 14 +++++++-------
 include/configs/P1010RDB.h           |  2 +-
 include/configs/P2041RDB.h           |  2 +-
 include/configs/T102xRDB.h           |  2 +-
 include/configs/T104xRDB.h           |  2 +-
 include/configs/T208xQDS.h           |  2 +-
 include/configs/T208xRDB.h           |  2 +-
 include/configs/T4240RDB.h           |  2 +-
 include/configs/blanche.h            |  2 +-
 include/configs/draak.h              |  2 +-
 include/configs/eb_cpu5282.h         |  2 +-
 include/configs/ebisu.h              |  2 +-
 include/configs/km/pg-wcom-ls102xa.h |  2 +-
 include/configs/ls1021aqds.h         |  2 +-
 include/configs/ls1021atwr.h         |  2 +-
 include/configs/ls1043a_common.h     |  2 +-
 include/configs/ls1046aqds.h         |  2 +-
 include/configs/ls1088aqds.h         |  2 +-
 include/configs/ls1088ardb.h         |  2 +-
 include/configs/ls2080aqds.h         |  2 +-
 include/configs/ls2080ardb.h         |  2 +-
 include/configs/p1_p2_rdb_pc.h       |  2 +-
 include/configs/salvator-x.h         |  2 +-
 include/configs/ulcb.h               |  2 +-
 include/configs/zynq-common.h        |  2 +-
 scripts/config_whitelist.txt         |  2 +-
 27 files changed, 33 insertions(+), 33 deletions(-)
README +1 -1
index 52545b78a19b..ea5f4cc10659 100644
@@ -1481,7 +1481,7 @@ Configuration Settings:
 		s29ws-n MirrorBit flash has non-standard addresses for buffered
 		write commands.
 
-- CONFIG_FLASH_SHOW_PROGRESS
+- CFG_FLASH_SHOW_PROGRESS
 		If defined (must be an integer), print out countdown
 		digits and dots.  Recommended value: 45 (9..1) for 80
 		column displays, 15 (3..1) for 40 column displays.
drivers/mtd/cfi_flash.c +7 -7
index c1cdd2cbc3e2..75765d76ea29 100644
@@ -1292,7 +1292,7 @@ void flash_print_info(flash_info_t *info)
  * effect updates to digit and dots.  Repeated code is nasty too, so
  * we define it once here.
  */
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
+#ifdef CFG_FLASH_SHOW_PROGRESS
 #define FLASH_SHOW_PROGRESS(scale, dots, digit, dots_sub) \
 	if (flash_verbose) { \
 		dots -= dots_sub; \
@@ -1325,17 +1325,17 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
 #ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 	int buffered_size;
 #endif
-#ifdef CONFIG_FLASH_SHOW_PROGRESS
-	int digit = CONFIG_FLASH_SHOW_PROGRESS;
+#ifdef CFG_FLASH_SHOW_PROGRESS
+	int digit = CFG_FLASH_SHOW_PROGRESS;
 	int scale = 0;
 	int dots  = 0;
 
 	/*
-	 * Suppress if there are fewer than CONFIG_FLASH_SHOW_PROGRESS writes.
+	 * Suppress if there are fewer than CFG_FLASH_SHOW_PROGRESS writes.
 	 */
-	if (cnt >= CONFIG_FLASH_SHOW_PROGRESS) {
-		scale = (int)((cnt + CONFIG_FLASH_SHOW_PROGRESS - 1) /
-			CONFIG_FLASH_SHOW_PROGRESS);
+	if (cnt >= CFG_FLASH_SHOW_PROGRESS) {
+		scale = (int)((cnt + CFG_FLASH_SHOW_PROGRESS - 1) /
+			CFG_FLASH_SHOW_PROGRESS);
 	}
 #endif
 
include/configs/P1010RDB.h +1 -1
index bc24be79366c..67ee74ba6232 100644
@@ -161,7 +161,7 @@ extern unsigned long get_sdram_size(void);
 #define CFG_SYS_NOR_FTIM3	0x0
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* CFI for NOR Flash */
 
include/configs/P2041RDB.h +1 -1
index 834400f1d601..b05601489d85 100644
@@ -101,7 +101,7 @@
 #define PIXIS_LBMAP_SHIFT	4
 #define PIXIS_LBMAP_ALTBANK	0x40
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
include/configs/T102xRDB.h +1 -1
index f666683bcc4b..09087a70895d 100644
@@ -158,7 +158,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
include/configs/T104xRDB.h +1 -1
index 53bd8e85a627..e6a9dccd752b 100644
@@ -126,7 +126,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
 
include/configs/T208xQDS.h +1 -1
index 5244c9d076f0..0d245940dc0e 100644
@@ -119,7 +119,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
include/configs/T208xRDB.h +1 -1
index 022d483da763..28c59b4e66f8 100644
@@ -114,7 +114,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS }
 
include/configs/T4240RDB.h +1 -1
index 6cf8b75c86c2..640c12d91ab5 100644
@@ -184,7 +184,7 @@
 				FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3	0x0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS \
 					+ 0x8000000, CFG_SYS_FLASH_BASE_PHYS}
include/configs/blanche.h +1 -1
index cb28ae28dd3e..dc74ed3e79d6 100644
@@ -25,7 +25,7 @@
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SH_QSPI_BASE	0xE6B10000
 #else
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BASE		0x00000000
 #define CFG_SYS_FLASH_SIZE		0x04000000	/* 64 MB */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
include/configs/draak.h +1 -1
index 8140bc469c52..03972d44789b 100644
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
include/configs/eb_cpu5282.h +1 -1
index 21eab9b3a479..5ef51c94dab8 100644
@@ -84,7 +84,7 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 
 #define CFG_SYS_FLASH_BASE		CFG_SYS_CS0_BASE
 #define	CFG_SYS_INT_FLASH_BASE	0xF0000000
include/configs/ebisu.h +1 -1
index d1882a9646be..ced71856b434 100644
@@ -15,7 +15,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
include/configs/km/pg-wcom-ls102xa.h +1 -1
index a67301b9ecd6..64fb706a1ce6 100644
@@ -61,7 +61,7 @@
 					FTIM2_NOR_TWP(0xb))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
include/configs/ls1021aqds.h +1 -1
index 3bfb014adf11..69f9bacad97c 100644
@@ -60,7 +60,7 @@
 					FTIM2_NOR_TWP(0x1c))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS, \
include/configs/ls1021atwr.h +1 -1
index 8a36620bf3ab..da1e409e5c77 100644
@@ -92,7 +92,7 @@
 					FTIM2_NOR_TWPH(0x0e))
 #define CFG_SYS_NOR_FTIM3		0
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE_PHYS }
 
include/configs/ls1043a_common.h +1 -1
index e259cf810c0a..c79e113db4e4 100644
@@ -92,7 +92,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 #endif
 #endif
 #endif
include/configs/ls1046aqds.h +1 -1
index 553ae841caba..e67ded55da6b 100644
@@ -43,7 +43,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS_EARLY	0x00000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 #endif
 #endif
 
include/configs/ls1088aqds.h +1 -1
index a34a71f649f6..0582a4568dc7 100644
@@ -62,7 +62,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
include/configs/ls1088ardb.h +1 -1
index bd543a37e879..ee796facc06c 100644
@@ -47,7 +47,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifndef SYS_NO_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE }
 #endif
include/configs/ls2080aqds.h +1 -1
index 12b5af1b4f2f..d029d841d51e 100644
@@ -64,7 +64,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
include/configs/ls2080ardb.h +1 -1
index 1259df8f3a9a..73477978be46 100644
@@ -61,7 +61,7 @@
 #define CFG_SYS_IFC_CCR	0x01000000
 
 #ifdef CONFIG_MTD_NOR_FLASH
-#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CFG_SYS_FLASH_BANKS_LIST	{ CFG_SYS_FLASH_BASE,\
 					 CFG_SYS_FLASH_BASE + 0x40000000}
include/configs/p1_p2_rdb_pc.h +1 -1
index de7c0d61c05f..93909eda55dd 100644
@@ -199,7 +199,7 @@
 #define CFG_FLASH_OR_PRELIM	0xfc000ff7
 
 #define CFG_SYS_FLASH_BANKS_LIST	{CFG_SYS_FLASH_BASE_PHYS}
-#define CONFIG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
+#define CFG_FLASH_SHOW_PROGRESS	45	/* count down from 45/5: 9..1 */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
include/configs/salvator-x.h +1 -1
index 2e422cd241e9..cb48538e62b4 100644
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
include/configs/ulcb.h +1 -1
index ab199bc726a6..aadcb30d0432 100644
@@ -13,7 +13,7 @@
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
-#define CONFIG_FLASH_SHOW_PROGRESS	45
+#define CFG_FLASH_SHOW_PROGRESS	45
 #define CFG_SYS_FLASH_BANKS_LIST	{ 0x08000000 }
 #define CFG_SYS_WRITE_SWAPPED_DATA
 
include/configs/zynq-common.h +1 -1
index 7f739d9ada0e..1edd49a784d4 100644
@@ -36,7 +36,7 @@
 
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_FLASH_SHOW_PROGRESS	10
+# define CFG_FLASH_SHOW_PROGRESS	10
 #endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
scripts/config_whitelist.txt +1 -1
index 89f47538d4c7..c510c45d8795 100644
@@ -31,7 +31,7 @@ CFG_FEC_MXC_PHYADDR
 CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
-CONFIG_FLASH_SHOW_PROGRESS
+CFG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
Signature · 1 line
2.25.1
author
#79 lore raw

PATCH 32/241 global: Migrate CONFIG_FLASH_SPANSION_S29WS_N to CFG

In reply to Tom Rini
---
 README                       | 2 +-
 drivers/mtd/cfi_flash.c      | 2 +-
 include/configs/M53017EVB.h  | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
README +1 -1
index ea5f4cc10659..0c8932425cad 100644
@@ -1477,7 +1477,7 @@ Configuration Settings:
 - CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 		Use buffered writes to flash.
 
-- CONFIG_FLASH_SPANSION_S29WS_N
+- CFG_FLASH_SPANSION_S29WS_N
 		s29ws-n MirrorBit flash has non-standard addresses for buffered
 		write commands.
 
drivers/mtd/cfi_flash.c +1 -1
index 75765d76ea29..f3abe7842b69 100644
@@ -991,7 +991,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp,
 	case CFI_CMDSET_AMD_EXTENDED:
 		flash_unlock_seq(info, sector);
 
-#ifdef CONFIG_FLASH_SPANSION_S29WS_N
+#ifdef CFG_FLASH_SPANSION_S29WS_N
 		offset = ((unsigned long)dst - info->start[sector]) >> shift;
 #endif
 		flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER);
include/configs/M53017EVB.h +1 -1
index ad27766cf0f4..6d97e6ca84ab 100644
@@ -93,7 +93,7 @@
  * FLASH organization
  */
 #ifdef CONFIG_SYS_FLASH_CFI
-#	define CONFIG_FLASH_SPANSION_S29WS_N	1
+#	define CFG_FLASH_SPANSION_S29WS_N	1
 #	define CFG_SYS_FLASH_SIZE		0x1000000	/* Max size that the board might have */
 #endif
 
scripts/config_whitelist.txt +1 -1
index c510c45d8795..16467a0bb8c9 100644
@@ -32,7 +32,7 @@ CFG_FLASH_BR_PRELIM
 CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
-CONFIG_FLASH_SPANSION_S29WS_N
+CFG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
Signature · 1 line
2.25.1
author
#80 lore raw

PATCH 33/241 global: Migrate CONFIG_FLASH_VERIFY to CFG

In reply to Tom Rini
---
 README                       | 2 +-
 common/flash.c               | 2 +-
 include/configs/mccmon6.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
README +1 -1
index 0c8932425cad..02ae72e009ef 100644
@@ -1486,7 +1486,7 @@ Configuration Settings:
 		digits and dots.  Recommended value: 45 (9..1) for 80
 		column displays, 15 (3..1) for 40 column displays.
 
-- CONFIG_FLASH_VERIFY
+- CFG_FLASH_VERIFY
 		If defined, the content of the flash (destination) is compared
 		against the source after the write operation. An error message
 		will be printed when the contents are not identical.
common/flash.c +1 -1
index 848f44e59dfd..5ca715efad2b 100644
@@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt)
 		src  += len;
 	}
 
-#if defined(CONFIG_FLASH_VERIFY)
+#if defined(CFG_FLASH_VERIFY)
 	if (memcmp(src_orig, addr_orig, cnt_orig)) {
 		printf("\nVerify failed!\n");
 		return ERR_PROG_ERROR;
include/configs/mccmon6.h +1 -1
index 4be47e78d676..9b2777339a10 100644
@@ -25,7 +25,7 @@
 
 /* NOR 16-bit mode */
 #define CFG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
-#define CONFIG_FLASH_VERIFY
+#define CFG_FLASH_VERIFY
 
 /* NOR Flash MTD */
 #define CFG_SYS_FLASH_BANKS_LIST	{ (CFG_SYS_FLASH_BASE) }
scripts/config_whitelist.txt +1 -1
index 16467a0bb8c9..8f68c6e736f6 100644
@@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM
 CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
-CONFIG_FLASH_VERIFY
+CFG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
Signature · 1 line
2.25.1
author
#81 lore raw

PATCH 34/241 global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG

In reply to Tom Rini
---
 arch/powerpc/cpu/mpc85xx/speed.c          | 6 +++---
 arch/powerpc/include/asm/config_mpc85xx.h | 4 ++--
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/powerpc/cpu/mpc85xx/speed.c +3 -3
index a6e352ceabb1..eec071022e59 100644
@@ -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
index d9e5a7d62170..29b08d56ee52 100644
@@ -175,8 +175,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
scripts/config_whitelist.txt +1 -1
index 8f68c6e736f6..09e520c3f9d8 100644
@@ -34,7 +34,7 @@ CFG_FLASH_SECTOR_SIZE
 CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
-CONFIG_FM_PLAT_CLK_DIV
+CFG_FM_PLAT_CLK_DIV
 CONFIG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
Signature · 1 line
2.25.1
author
#82 lore raw

PATCH 35/241 global: Migrate CONFIG_FSL_CPLD to CFG

In reply to Tom Rini
---
 include/configs/P2041RDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/P2041RDB.h +1 -1
index b05601489d85..f2179db6b9b4 100644
@@ -88,7 +88,7 @@
 #define CFG_SYS_FLASH_BASE_PHYS	CFG_SYS_FLASH_BASE
 #endif
 
-#define CONFIG_FSL_CPLD
+#define CFG_FSL_CPLD
 #define CPLD_BASE		0xffdf0000	/* CPLD registers */
 #ifdef CONFIG_PHYS_64BIT
 #define CPLD_BASE_PHYS		0xfffdf0000ull
scripts/config_whitelist.txt +1 -1
index 09e520c3f9d8..43d331938d51 100644
@@ -35,7 +35,7 @@ CFG_FLASH_SHOW_PROGRESS
 CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
-CONFIG_FSL_CPLD
+CFG_FSL_CPLD
 CONFIG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
Signature · 1 line
2.25.1
author
#83 lore raw

PATCH 36/241 global: Migrate CONFIG_FSL_ESDHC_PIN_MUX to CFG

In reply to Tom Rini
---
 drivers/mmc/fsl_esdhc.c       | 2 +-
 include/configs/MPC837XERDB.h | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mmc/fsl_esdhc.c +1 -1
index d5066666698c..46f0a8b813e9 100644
@@ -842,7 +842,7 @@ static void fsl_esdhc_get_cfg_common(struct fsl_esdhc_priv *priv,
 #ifdef CONFIG_OF_LIBFDT
 __weak int esdhc_status_fixup(void *blob, const char *compat)
 {
-	if (IS_ENABLED(CONFIG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
+	if (IS_ENABLED(CFG_FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) {
 		do_fixup_by_compat(blob, compat, "status", "disabled",
 				sizeof("disabled"), 1);
 		return 1;
include/configs/MPC837XERDB.h +1 -1
index 2eea26d7bee7..9af76e830dc0 100644
@@ -204,7 +204,7 @@
 #endif
 
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC_PIN_MUX
+#define CFG_FSL_ESDHC_PIN_MUX
 #define CFG_SYS_FSL_ESDHC_ADDR	CFG_SYS_MPC83xx_ESDHC_ADDR
 #endif
 
scripts/config_whitelist.txt +1 -1
index 43d331938d51..278fc032799a 100644
@@ -36,7 +36,7 @@ CFG_FLASH_SPANSION_S29WS_N
 CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
-CONFIG_FSL_ESDHC_PIN_MUX
+CFG_FSL_ESDHC_PIN_MUX
 CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
Signature · 1 line
2.25.1
author
#84 lore raw

PATCH 37/241 global: Migrate CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to CFG

In reply to Tom Rini
---
 arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
 arch/powerpc/include/asm/immap_85xx.h     | 2 +-
 doc/README.fsl-dpaa                       | 4 ++--
 drivers/net/fm/eth.c                      | 2 +-
 drivers/net/fm/init.c                     | 2 +-
 include/fm_eth.h                          | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/config_mpc85xx.h +1 -1
index 29b08d56ee52..410ae34e9504 100644
@@ -189,7 +189,7 @@
 #define CFG_SYS_NUM_FMAN		1
 #define CFG_SYS_NUM_FM1_DTSEC	4
 #define CFG_SYS_NUM_FM1_10GEC	1
-#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#define CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FM1_CLK		0
 #define CONFIG_QBMAN_CLK_DIV		1
arch/powerpc/include/asm/immap_85xx.h +1 -1
index 283fdf3b458a..05b83952f231 100644
@@ -1303,7 +1303,7 @@ typedef struct ccsr_gur {
 #define FSL_CORENET_DEVDISR2_DTSEC1_6	0x04000000
 #define FSL_CORENET_DEVDISR2_DTSEC1_9	0x00800000
 #define FSL_CORENET_DEVDISR2_DTSEC1_10	0x00400000
-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define FSL_CORENET_DEVDISR2_10GEC1_1   0x80000000
 #define FSL_CORENET_DEVDISR2_10GEC1_2   0x40000000
 #else
doc/README.fsl-dpaa +2 -2
index 3ef5eeb32e11..91c14ad12227 100644
@@ -1,10 +1,10 @@
 This file documents Freescale DPAA-specific options.
 
 FMan (Frame Manager)
-  - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+  - CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below:
 		10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2
 	on SoCs T1024, etc, the notation between 10GEC and MAC as below:
 		10GEC1->MAC1, 10GEC2->MAC2
-	so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
+	so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
 	which 10GEC enumeration is consistent with MAC enumeration.
drivers/net/fm/eth.c +1 -1
index c8381cc7133c..c84d1c0a713e 100644
@@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg)
 	num = fm_eth->num;
 
 #ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	if (fm_eth->type == FM_ETH_10G_E) {
 		/* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240.
 		 * 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080.
drivers/net/fm/init.c +1 -1
index 618c1bccbe3f..23a25056f822 100644
@@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
 	}
 
 #ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 	/*
 	 * On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
 	 * dual-role MAC, when FM1_10GEC1 is enabled and  FM1_DTSEC9
include/fm_eth.h +1 -1
index aeb640925ee2..4f130a8d04a5 100644
@@ -88,7 +88,7 @@ enum fm_eth_type {
 				offsetof(struct ccsr_fman, memac[n-1]),\
 }
 
-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
 #define FM_TGEC_INFO_INITIALIZER(idx, n) \
 {									\
 	FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR)	\
scripts/config_whitelist.txt +1 -1
index 278fc032799a..14823f42e61e 100644
@@ -37,7 +37,7 @@ CFG_FLASH_VERIFY
 CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
-CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
Signature · 1 line
2.25.1
author
#85 lore raw

PATCH 38/241 global: Migrate CONFIG_FSL_ISBC_KEY_EXT to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/fsl_secure_boot.h     |  2 +-
 arch/powerpc/include/asm/fsl_secure_boot.h |  2 +-
 board/freescale/common/fsl_validate.c      | 18 +++++++++---------
 include/fsl_validate.h                     |  8 ++++----
 scripts/config_whitelist.txt               |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/include/asm/fsl_secure_boot.h +1 -1
index a4f4961fc877..39265f3e7be4 100644
@@ -20,7 +20,7 @@
  * is copied to XIP memory
  * Also, for LS, ISBC doesn't verify this table.
  */
-#define CONFIG_FSL_ISBC_KEY_EXT
+#define CFG_FSL_ISBC_KEY_EXT
 
 #endif
 
arch/powerpc/include/asm/fsl_secure_boot.h +1 -1
index e8b26802062b..033308a4ab39 100644
@@ -51,7 +51,7 @@
  * The feature is only applicable in case of NOR boot and is
  * not applicable in case of RAMBOOT (NAND, SD, SPI).
  */
-#define CONFIG_FSL_ISBC_KEY_EXT
+#define CFG_FSL_ISBC_KEY_EXT
 #endif
 #endif /* #ifdef CONFIG_NXP_ESBC */
 
board/freescale/common/fsl_validate.c +9 -9
index 285ed9afcc9a..947c8b74c02b 100644
@@ -29,7 +29,7 @@
 #define CHECK_KEY_LEN(key_len)	(((key_len) == 2 * KEY_SIZE_BYTES / 4) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES / 2) || \
 				 ((key_len) == 2 * KEY_SIZE_BYTES))
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 /* Global data structure */
 static struct fsl_secboot_glb glb;
 #endif
@@ -63,7 +63,7 @@ self:
 	goto self;
 }
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 static u32 check_ie(struct fsl_secboot_img_priv *img)
 {
 	if (img->hdr.ie_flag & IE_FLAG_MASK)
@@ -188,7 +188,7 @@ static u32 check_srk(struct fsl_secboot_img_priv *img)
 {
 #ifdef CONFIG_ESBC_HDR_LS
 	/* In LS, No SRK Flag as SRK is always present if IE not present*/
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	return !check_ie(img);
 #endif
 	return 1;
@@ -278,7 +278,7 @@ static u32 read_validate_single_key(struct fsl_secboot_img_priv *img)
 }
 #endif /* CONFIG_ESBC_HDR_LS */
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 
 static void install_ie_tbl(uintptr_t ie_tbl_addr,
 		struct fsl_secboot_img_priv *img)
@@ -434,7 +434,7 @@ void fsl_secboot_handle_error(int error)
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_KEY_NUM:
 	case ERROR_ESBC_CLIENT_HEADER_INV_SRK_ENTRY_KEYLEN:
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	/*@fallthrough@*/
 	case ERROR_ESBC_CLIENT_HEADER_IE_KEY_REVOKED:
 	case ERROR_ESBC_CLIENT_HEADER_INVALID_IE_NUM_ENTRY:
@@ -571,7 +571,7 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img)
 		key_hash = 1;
 	}
 #endif
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!key_hash && check_ie(img))
 		key_hash = 1;
 #endif
@@ -705,7 +705,7 @@ static int read_validate_esbc_client_header(struct fsl_secboot_img_priv *img)
 	}
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!key_found && check_ie(img)) {
 		ret = read_validate_ie_tbl(img);
 		if (ret != 0)
@@ -851,7 +851,7 @@ static int secboot_init(struct fsl_secboot_img_priv **img_ptr)
 		return -ENOMEM;
 	memset(img, 0, sizeof(struct fsl_secboot_img_priv));
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (glb.ie_addr)
 		img->ie_addr = glb.ie_addr;
 #endif
@@ -952,7 +952,7 @@ int fsl_secboot_validate(uintptr_t haddr, char *arg_hash_str,
 	else
 		ret = memcmp(srk_hash, img->img_key_hash, SHA256_BYTES);
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	if (!hash_cmd && check_ie(img))
 		ret = 0;
 #endif
include/fsl_validate.h +4 -4
index 252d499e7b1a..7798a6e657bc 100644
@@ -69,7 +69,7 @@ struct fsl_secboot_img_hdr {
 #define MAX_KEY_ENTRIES 8
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 #define IE_FLAG_MASK 0x1
 #define SCRATCH_IE_LOW_ADR 13
 #define SCRATCH_IE_HIGH_ADR 14
@@ -155,14 +155,14 @@ struct fsl_secboot_img_hdr {
 #define MAX_KEY_ENTRIES 4
 #endif
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 #define IE_FLAG_MASK 0xFFFFFFFF
 #endif
 
 #endif /* CONFIG_ESBC_HDR_LS */
 
 
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 struct ie_key_table {
 	u32 key_len;
 	u8 pkey[2 * KEY_SIZE_BYTES];
@@ -217,7 +217,7 @@ struct fsl_secboot_sg_table {
  * IE Table
  */
 struct fsl_secboot_glb {
-#if defined(CONFIG_FSL_ISBC_KEY_EXT)
+#if defined(CFG_FSL_ISBC_KEY_EXT)
 	uintptr_t ie_addr;
 	struct ie_key_info ie_tbl;
 #endif
scripts/config_whitelist.txt +1 -1
index 14823f42e61e..0a0be8f05f00 100644
@@ -38,7 +38,7 @@ CFG_FM_PLAT_CLK_DIV
 CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
-CONFIG_FSL_ISBC_KEY_EXT
+CFG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
Signature · 1 line
2.25.1
author
#86 lore raw

PATCH 39/241 global: Migrate CONFIG_FSL_PMIC_BITLEN to CFG

In reply to Tom Rini
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/power/power_fsl.c +1 -1
index 9bb7e39f2cc2..eace4dd7e433 100644
@@ -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
index 8ab1ee79a79c..d4cca8d516a6 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index 0a0be8f05f00..b5f3eb1236a1 100644
@@ -39,7 +39,7 @@ CFG_FSL_CPLD
 CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
-CONFIG_FSL_PMIC_BITLEN
+CFG_FSL_PMIC_BITLEN
 CONFIG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
Signature · 1 line
2.25.1
author
#87 lore raw

PATCH 40/241 global: Migrate CONFIG_FSL_PMIC_BUS to CFG

In reply to Tom Rini
---
 board/freescale/mx51evk/mx51evk.c | 2 +-
 include/configs/mx51evk.h         | 2 +-
 scripts/config_whitelist.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/freescale/mx51evk/mx51evk.c +1 -1
index 86364acf8ca0..95edb3599443 100644
@@ -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
index d4cca8d516a6..1aaa76240deb 100644
@@ -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)
scripts/config_whitelist.txt +1 -1
index b5f3eb1236a1..3b9ec9d59f61 100644
@@ -40,7 +40,7 @@ CFG_FSL_ESDHC_PIN_MUX
 CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
-CONFIG_FSL_PMIC_BUS
+CFG_FSL_PMIC_BUS
 CONFIG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
Signature · 1 line
2.25.1
author
#88 lore raw

PATCH 41/241 global: Migrate CONFIG_FSL_PMIC_CLK to CFG

In reply to Tom Rini
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/power/power_fsl.c +1 -1
index eace4dd7e433..a576d1570b11 100644
@@ -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
index 1aaa76240deb..ee0782ebfebf 100644
@@ -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
 
scripts/config_whitelist.txt +1 -1
index 3b9ec9d59f61..d006554e3d2b 100644
@@ -41,7 +41,7 @@ CFG_FSL_FM_10GEC_REGULAR_NOTATION
 CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
-CONFIG_FSL_PMIC_CLK
+CFG_FSL_PMIC_CLK
 CONFIG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
Signature · 1 line
2.25.1
author
#89 lore raw

PATCH 42/241 global: Migrate CONFIG_FSL_PMIC_CS to CFG

In reply to Tom Rini
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/power/power_fsl.c +1 -1
index a576d1570b11..9ead212f380e 100644
@@ -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
index ee0782ebfebf..15bc4c706fdd 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index d006554e3d2b..a6598b01bb61 100644
@@ -42,7 +42,7 @@ CFG_FSL_ISBC_KEY_EXT
 CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
-CONFIG_FSL_PMIC_CS
+CFG_FSL_PMIC_CS
 CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
Signature · 1 line
2.25.1
author
#90 lore raw

PATCH 43/241 global: Migrate CONFIG_FSL_PMIC_MODE to CFG

In reply to Tom Rini
---
 drivers/power/power_fsl.c    | 2 +-
 include/configs/mx51evk.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/power/power_fsl.c +1 -1
index 9ead212f380e..9dc930fb305a 100644
@@ -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
index 15bc4c706fdd..740e357e00e9 100644
@@ -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
 
 /*
scripts/config_whitelist.txt +1 -1
index a6598b01bb61..8ba453991703 100644
@@ -43,7 +43,7 @@ CFG_FSL_PMIC_BITLEN
 CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
-CONFIG_FSL_PMIC_MODE
+CFG_FSL_PMIC_MODE
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
Signature · 1 line
2.25.1
author
#91 lore raw

PATCH 44/241 global: Migrate CONFIG_FSL_SDHC_V2_3 to CFG

In reply to Tom Rini
---
 arch/powerpc/include/asm/config_mpc85xx.h | 8 ++++----
 include/fsl_esdhc.h                       | 2 +-
 include/fsl_esdhc_imx.h                   | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/config_mpc85xx.h +4 -4
index 410ae34e9504..d6b2b9b469a3 100644
@@ -23,7 +23,7 @@
 #define CFG_SYS_FSL_SRIO_MSG_UNIT_NUM	2
 
 #elif defined(CONFIG_ARCH_P1010)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 
@@ -107,12 +107,12 @@
 #define CFG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000
 
 #elif defined(CONFIG_ARCH_BSC9131)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
 #elif defined(CONFIG_ARCH_BSC9132)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	3
 
@@ -220,7 +220,7 @@
 
 
 #elif defined(CONFIG_ARCH_C29X)
-#define CONFIG_FSL_SDHC_V2_3
+#define CFG_FSL_SDHC_V2_3
 #define CONFIG_TSECV2_1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	8
 #define CFG_SYS_FSL_SEC_IDX_OFFSET	0x20000
include/fsl_esdhc.h +1 -1
index 7ab1460abc6e..b2c238461a1b 100644
@@ -140,7 +140,7 @@
 
 #define WML		0x2e044
 #define WML_WRITE	0x00010000
-#ifdef CONFIG_FSL_SDHC_V2_3
+#ifdef CFG_FSL_SDHC_V2_3
 #define WML_RD_WML_MAX		0x80
 #define WML_WR_WML_MAX		0x80
 #define WML_RD_WML_MAX_VAL	0x0
include/fsl_esdhc_imx.h +1 -1
index b8efd2a1664c..dc789c0ba653 100644
@@ -143,7 +143,7 @@
 
 #define WML		0x2e044
 #define WML_WRITE	0x00010000
-#ifdef CONFIG_FSL_SDHC_V2_3
+#ifdef CFG_FSL_SDHC_V2_3
 #define WML_RD_WML_MAX		0x80
 #define WML_WR_WML_MAX		0x80
 #define WML_RD_WML_MAX_VAL	0x0
scripts/config_whitelist.txt +1 -1
index 8ba453991703..1093721dca5c 100644
@@ -44,7 +44,7 @@ CFG_FSL_PMIC_BUS
 CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
-CONFIG_FSL_SDHC_V2_3
+CFG_FSL_SDHC_V2_3
 CONFIG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_GATEWAYIP
Signature · 1 line
2.25.1
author
#92 lore raw

PATCH 45/241 global: Migrate CONFIG_FSL_SERDES1 to CFG

In reply to Tom Rini
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 4 ++--
 include/configs/MPC837XERDB.h             | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
board/freescale/mpc837xerdb/mpc837xerdb.c +2 -2
index 4a1455402650..9c08a2bfef02 100644
@@ -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
index 9af76e830dc0..4a3db8dec0ed 100644
@@ -153,7 +153,7 @@
 #define CFG_SYS_NS16550_COM2	(CONFIG_SYS_IMMR+0x4600)
 
 /* SERDES */
-#define CONFIG_FSL_SERDES1	0xe3000
+#define CFG_FSL_SERDES1	0xe3000
 #define CONFIG_FSL_SERDES2	0xe3100
 
 /* I2C */
scripts/config_whitelist.txt +1 -1
index 1093721dca5c..29d5b933b9df 100644
@@ -45,7 +45,7 @@ CFG_FSL_PMIC_CLK
 CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
-CONFIG_FSL_SERDES1
+CFG_FSL_SERDES1
 CONFIG_FSL_SERDES2
 CONFIG_GATEWAYIP
 CONFIG_GMII
Signature · 1 line
2.25.1
author
#93 lore raw

PATCH 46/241 global: Migrate CONFIG_FSL_SERDES2 to CFG

In reply to Tom Rini
---
 board/freescale/mpc837xerdb/mpc837xerdb.c | 6 +++---
 include/configs/MPC837XERDB.h             | 2 +-
 scripts/config_whitelist.txt              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
board/freescale/mpc837xerdb/mpc837xerdb.c +3 -3
index 9c08a2bfef02..8b1bfe0a9f91 100644
@@ -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
index 4a3db8dec0ed..2e1264978908 100644
@@ -154,7 +154,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} }
scripts/config_whitelist.txt +1 -1
index 29d5b933b9df..ea7eaef5d15f 100644
@@ -46,7 +46,7 @@ CFG_FSL_PMIC_CS
 CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
-CONFIG_FSL_SERDES2
+CFG_FSL_SERDES2
 CONFIG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
Signature · 1 line
2.25.1
author
#94 lore raw

PATCH 47/241 global: Migrate CONFIG_GATEWAYIP to CFG

In reply to Tom Rini
---
 README                             | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)
README +1 -1
index 02ae72e009ef..d76058e1ab41 100644
@@ -750,7 +750,7 @@ The following options need to be configured:
 		(Environment variable "serverip")
 
 - Gateway IP address:
-		CONFIG_GATEWAYIP
+		CFG_GATEWAYIP
 
 		Defines a default value for the IP address of the
 		default router where packets to other networks are
include/configs/M5208EVBE.h +1 -1
index ef3837e137c7..83ffe7ce76d9 100644
@@ -21,7 +21,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5208EVBe"
include/configs/M5235EVB.h +1 -1
index a31d44177362..fc56834bd9be 100644
@@ -30,7 +30,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5235EVB"
include/configs/M5272C3.h +1 -1
index 501785ac82e0..78eeca342c82 100644
@@ -33,7 +33,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5272C3"
include/configs/M5282EVB.h +1 -1
index 3912aae750d4..afc19de8ce73 100644
@@ -33,7 +33,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
 #define CONFIG_HOSTNAME		"M5282EVB"
include/configs/M53017EVB.h +1 -1
index 6d97e6ca84ab..1fcc34184928 100644
@@ -34,7 +34,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M53017"
include/configs/M5329EVB.h +1 -1
index f8aabe4944a4..a49cf6dacb81 100644
@@ -26,7 +26,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5329EVB"
include/configs/M5373EVB.h +1 -1
index 228fcde98dc3..53434881f4c7 100644
@@ -28,7 +28,7 @@
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
-#	define CONFIG_GATEWAYIP	192.162.1.1
+#	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
 #define CONFIG_HOSTNAME		"M5373EVB"
include/configs/MPC8548CDS.h +1 -1
index 515e88cf8206..e93b3cb97517 100644
@@ -332,7 +332,7 @@
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
 #define CONFIG_SERVERIP	 192.168.1.1
-#define CONFIG_GATEWAYIP 192.168.1.1
+#define CFG_GATEWAYIP 192.168.1.1
 #define CONFIG_NETMASK	 255.255.255.0
 
 #define	CFG_EXTRA_ENV_SETTINGS		\
include/configs/mvebu_alleycat-5.h +1 -1
index c8c0fc671ab0..204a9b0b5458 100644
@@ -18,7 +18,7 @@
 #define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
 #define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_GATEWAYIP        0.0.0.0
+#define CFG_GATEWAYIP        0.0.0.0
 #define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
 
 #define BOOT_TARGET_DEVICES(func) \
include/configs/uniphier.h +1 -1
index 2fe056cfef4a..874f75404712 100644
@@ -48,7 +48,7 @@
  */
 #define CONFIG_SERVERIP			192.168.11.1
 #define CONFIG_IPADDR			192.168.11.10
-#define CONFIG_GATEWAYIP		192.168.11.1
+#define CFG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
 #if defined(CONFIG_ARM64)
include/env_default.h +2 -2
index 1621815f257a..7d0af83a5913 100644
@@ -68,8 +68,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_ROOTPATH
 	"rootpath="	CONFIG_ROOTPATH			"\0"
 #endif
-#ifdef	CONFIG_GATEWAYIP
-	"gatewayip="	__stringify(CONFIG_GATEWAYIP)	"\0"
+#ifdef	CFG_GATEWAYIP
+	"gatewayip="	__stringify(CFG_GATEWAYIP)	"\0"
 #endif
 #ifdef	CONFIG_NETMASK
 	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
scripts/config_whitelist.txt +1 -1
index ea7eaef5d15f..e634d868a090 100644
@@ -47,7 +47,7 @@ CFG_FSL_PMIC_MODE
 CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
 CFG_FSL_SERDES2
-CONFIG_GATEWAYIP
+CFG_GATEWAYIP
 CONFIG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
Signature · 1 line
2.25.1
author
#95 lore raw

PATCH 48/241 global: Migrate CONFIG_GMII to CFG

In reply to Tom Rini
---
 drivers/net/mvneta.c          |  6 +++---
 drivers/net/mvpp2.c           | 12 ++++++------
 include/configs/MPC837XERDB.h |  2 +-
 scripts/config_whitelist.txt  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/mvneta.c +3 -3
index 0fbfad11d458..7bf744b483a7 100644
@@ -192,7 +192,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define      MVNETA_GMAC_FORCE_LINK_PASS         BIT(1)
 #define      MVNETA_GMAC_IB_BYPASS_AN_EN         BIT(3)
 #define      MVNETA_GMAC_CONFIG_MII_SPEED        BIT(5)
-#define      MVNETA_GMAC_CONFIG_GMII_SPEED       BIT(6)
+#define      MVNETA_GMAC_CFG_GMII_SPEED       BIT(6)
 #define      MVNETA_GMAC_AN_SPEED_EN             BIT(7)
 #define      MVNETA_GMAC_SET_FC_EN               BIT(8)
 #define      MVNETA_GMAC_ADVERT_FC_EN            BIT(9)
@@ -1163,7 +1163,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 
 		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
 		val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED |
-			 MVNETA_GMAC_CONFIG_GMII_SPEED |
+			 MVNETA_GMAC_CFG_GMII_SPEED |
 			 MVNETA_GMAC_CONFIG_FULL_DUPLEX |
 			 MVNETA_GMAC_AN_SPEED_EN |
 			 MVNETA_GMAC_AN_DUPLEX_EN);
@@ -1187,7 +1187,7 @@ static void mvneta_adjust_link(struct udevice *dev)
 			val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
 
 		if (phydev->speed == SPEED_1000)
-			val |= MVNETA_GMAC_CONFIG_GMII_SPEED;
+			val |= MVNETA_GMAC_CFG_GMII_SPEED;
 		else if (pp->speed == SPEED_100)
 			val |= MVNETA_GMAC_CONFIG_MII_SPEED;
 
drivers/net/mvpp2.c +6 -6
index 8c9afdf79aba..d9bdf2adad11 100644
@@ -379,7 +379,7 @@ do {									\
 #define      MVPP2_GMAC_EN_PCS_AN		BIT(2)
 #define      MVPP2_GMAC_AN_BYPASS_EN		BIT(3)
 #define      MVPP2_GMAC_CONFIG_MII_SPEED	BIT(5)
-#define      MVPP2_GMAC_CONFIG_GMII_SPEED	BIT(6)
+#define      MVPP2_GMAC_CFG_GMII_SPEED	BIT(6)
 #define      MVPP2_GMAC_AN_SPEED_EN		BIT(7)
 #define      MVPP2_GMAC_FC_ADV_EN		BIT(9)
 #define      MVPP2_GMAC_EN_FC_AN		BIT(11)
@@ -3064,7 +3064,7 @@ static void gop_gmac_sgmii2_5_cfg(struct mvpp2_port *port)
 	val = MVPP2_GMAC_EN_PCS_AN |
 		MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_CONFIG_MII_SPEED  |
-		MVPP2_GMAC_CONFIG_GMII_SPEED     |
+		MVPP2_GMAC_CFG_GMII_SPEED     |
 		MVPP2_GMAC_FC_ADV_EN    |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
@@ -3147,7 +3147,7 @@ static void gop_gmac_2500basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -3188,7 +3188,7 @@ static void gop_gmac_1000basex_cfg(struct mvpp2_port *port)
 	 */
 	val = MVPP2_GMAC_AN_BYPASS_EN |
 		MVPP2_GMAC_EN_PCS_AN |
-		MVPP2_GMAC_CONFIG_GMII_SPEED  |
+		MVPP2_GMAC_CFG_GMII_SPEED  |
 		MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 		MVPP2_GMAC_CHOOSE_SAMPLE_TX_CONFIG;
 	writel(val, port->base + MVPP2_GMAC_AUTONEG_CONFIG);
@@ -4441,7 +4441,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			val = readl(port->base + MVPP2_GMAC_AUTONEG_CONFIG);
 			val &= ~(MVPP2_GMAC_CONFIG_MII_SPEED |
-				 MVPP2_GMAC_CONFIG_GMII_SPEED |
+				 MVPP2_GMAC_CFG_GMII_SPEED |
 				 MVPP2_GMAC_CONFIG_FULL_DUPLEX |
 				 MVPP2_GMAC_AN_SPEED_EN |
 				 MVPP2_GMAC_AN_DUPLEX_EN);
@@ -4451,7 +4451,7 @@ static void mvpp2_link_event(struct mvpp2_port *port)
 
 			if (phydev->speed == SPEED_1000 ||
 			    phydev->speed == 2500)
-				val |= MVPP2_GMAC_CONFIG_GMII_SPEED;
+				val |= MVPP2_GMAC_CFG_GMII_SPEED;
 			else if (phydev->speed == SPEED_100)
 				val |= MVPP2_GMAC_CONFIG_MII_SPEED;
 
include/configs/MPC837XERDB.h +1 -1
index 2e1264978908..dc7fe06ceb4b 100644
@@ -183,7 +183,7 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-#define CONFIG_GMII			/* MII PHY management */
+#define CFG_GMII			/* MII PHY management */
 
 #define CONFIG_TSEC1
 
scripts/config_whitelist.txt +1 -1
index e634d868a090..8203c5ccee12 100644
@@ -48,7 +48,7 @@ CFG_FSL_SDHC_V2_3
 CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
-CONFIG_GMII
+CFG_GMII
 CONFIG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
Signature · 1 line
2.25.1
author
#96 lore raw

PATCH 49/241 global: Migrate CONFIG_G_DNL_THOR_PRODUCT_NUM to CFG

In reply to Tom Rini
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
board/samsung/common/gadget.c +1 -1
index 6d783e61e0d3..38d8773f9083 100644
@@ -11,7 +11,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
 		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
include/configs/exynos4-common.h +1 -1
index 81f450cde6c4..b29d9b0d5bac 100644
@@ -17,7 +17,7 @@
 
 /* USB Samsung's IDs */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
include/configs/odroid_xu3.h +1 -1
index a1542f3f8025..c6f6246d76ce 100644
@@ -22,7 +22,7 @@
 
 /* THOR */
 #define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM	0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
include/configs/s5p_goni.h +1 -1
index f898d2d9ee52..5567505c8182 100644
@@ -27,7 +27,7 @@
 /* USB Samsung's IDs */
 
 #define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
+#define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
scripts/config_whitelist.txt +1 -1
index 8203c5ccee12..f2304c23b80f 100644
@@ -49,7 +49,7 @@ CFG_FSL_SERDES1
 CFG_FSL_SERDES2
 CFG_GATEWAYIP
 CFG_GMII
-CONFIG_G_DNL_THOR_PRODUCT_NUM
+CFG_G_DNL_THOR_PRODUCT_NUM
 CONFIG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
Signature · 1 line
2.25.1
author
#97 lore raw

PATCH 50/241 global: Migrate CONFIG_G_DNL_THOR_VENDOR_NUM to CFG

In reply to Tom Rini
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
board/samsung/common/gadget.c +1 -1
index 38d8773f9083..f883c95f9643 100644
@@ -10,7 +10,7 @@
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 {
 	if (!strcmp(name, "usb_dnl_thor")) {
-		put_unaligned(CONFIG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
include/configs/exynos4-common.h +1 -1
index b29d9b0d5bac..defbe4bf335c 100644
@@ -16,7 +16,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 /* USB Samsung's IDs */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
+#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
include/configs/odroid_xu3.h +1 -1
index c6f6246d76ce..967ba83d4510 100644
@@ -21,7 +21,7 @@
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
 /* THOR */
-#define CONFIG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
+#define CFG_G_DNL_THOR_VENDOR_NUM	CONFIG_USB_GADGET_VENDOR_NUM
 #define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
include/configs/s5p_goni.h +1 -1
index 5567505c8182..67d01e816f9a 100644
@@ -26,7 +26,7 @@
 
 /* USB Samsung's IDs */
 
-#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
+#define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
scripts/config_whitelist.txt +1 -1
index f2304c23b80f..f04275b6b1d4 100644
@@ -50,7 +50,7 @@ CFG_FSL_SERDES2
 CFG_GATEWAYIP
 CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
-CONFIG_G_DNL_THOR_VENDOR_NUM
+CFG_G_DNL_THOR_VENDOR_NUM
 CONFIG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
Signature · 1 line
2.25.1
author
#98 lore raw

PATCH 51/241 global: Migrate CONFIG_G_DNL_UMS_PRODUCT_NUM to CFG

In reply to Tom Rini
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/dh_imx6.h        | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/socfpga_common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
board/samsung/common/gadget.c +1 -1
index f883c95f9643..71d361548434 100644
@@ -14,7 +14,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
 		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
-		put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
+		put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
 	} else {
 		put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
include/configs/dh_imx6.h +1 -1
index 56bb856a6dc2..a53846b762c1 100644
@@ -41,7 +41,7 @@
 
 /* USB IDs */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 #endif
 
include/configs/exynos4-common.h +1 -1
index defbe4bf335c..f3db02d78d8b 100644
@@ -19,7 +19,7 @@
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Common environment variables */
 #define ENV_ITB \
include/configs/odroid_xu3.h +1 -1
index 967ba83d4510..bd8d455375dd 100644
@@ -26,7 +26,7 @@
 
 /* UMS */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
 #define CFG_DFU_ALT_SYSTEM               \
 	"uImage fat 0 1;"                   \
include/configs/s5p_goni.h +1 -1
index 67d01e816f9a..d1c3f495c253 100644
@@ -29,7 +29,7 @@
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 
include/configs/socfpga_common.h +1 -1
index 3603bb9f4a0b..dbb84ab9ad08 100644
@@ -86,7 +86,7 @@
 
 /* USB IDs */
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
+#define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
 /*
scripts/config_whitelist.txt +1 -1
index f04275b6b1d4..5da8953712a5 100644
@@ -51,7 +51,7 @@ CFG_GATEWAYIP
 CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
-CONFIG_G_DNL_UMS_PRODUCT_NUM
+CFG_G_DNL_UMS_PRODUCT_NUM
 CONFIG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
Signature · 1 line
2.25.1
author
#99 lore raw

PATCH 52/241 global: Migrate CONFIG_G_DNL_UMS_VENDOR_NUM to CFG

In reply to Tom Rini
---
 board/samsung/common/gadget.c    | 2 +-
 include/configs/dh_imx6.h        | 2 +-
 include/configs/exynos4-common.h | 2 +-
 include/configs/odroid_xu3.h     | 2 +-
 include/configs/s5p_goni.h       | 2 +-
 include/configs/socfpga_common.h | 2 +-
 scripts/config_whitelist.txt     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
board/samsung/common/gadget.c +1 -1
index 71d361548434..0fe20be48556 100644
@@ -13,7 +13,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 		put_unaligned(CFG_G_DNL_THOR_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_THOR_PRODUCT_NUM, &dev->idProduct);
 	} else if (!strcmp(name, "usb_dnl_ums")) {
-		put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
+		put_unaligned(CFG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
 		put_unaligned(CFG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
 	} else {
 		put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
include/configs/dh_imx6.h +1 -1
index a53846b762c1..1fbdebb64511 100644
@@ -40,7 +40,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
 /* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 #endif
include/configs/exynos4-common.h +1 -1
index f3db02d78d8b..63e26687dbce 100644
@@ -18,7 +18,7 @@
 /* USB Samsung's IDs */
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Common environment variables */
include/configs/odroid_xu3.h +1 -1
index bd8d455375dd..50213a383528 100644
@@ -25,7 +25,7 @@
 #define CFG_G_DNL_THOR_PRODUCT_NUM	0x685D
 
 /* UMS */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 
 #define CFG_DFU_ALT_SYSTEM               \
include/configs/s5p_goni.h +1 -1
index d1c3f495c253..1e211eccee7b 100644
@@ -28,7 +28,7 @@
 
 #define CFG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CFG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
include/configs/socfpga_common.h +1 -1
index dbb84ab9ad08..d6809f8118d7 100644
@@ -85,7 +85,7 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
 /* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CFG_G_DNL_UMS_VENDOR_NUM	0x0525
 #define CFG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
scripts/config_whitelist.txt +1 -1
index 5da8953712a5..3473e7c4560b 100644
@@ -52,7 +52,7 @@ CFG_GMII
 CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
-CONFIG_G_DNL_UMS_VENDOR_NUM
+CFG_G_DNL_UMS_VENDOR_NUM
 CONFIG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
Signature · 1 line
2.25.1
author
#100 lore raw

PATCH 53/241 global: Migrate CONFIG_HDMI_ENCODER_I2C_ADDR to CFG

In reply to Tom Rini
---
 include/configs/T104xRDB.h   | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/T104xRDB.h +1 -1
index e6a9dccd752b..4b7b53094446 100644
@@ -288,7 +288,7 @@
 #define CFG_SYS_I2C_RTC_ADDR         0x68
 
 /*DVI encoder*/
-#define CONFIG_HDMI_ENCODER_I2C_ADDR  0x75
+#define CFG_HDMI_ENCODER_I2C_ADDR  0x75
 #endif
 
 /*
scripts/config_whitelist.txt +1 -1
index 3473e7c4560b..9079fbb2e3f6 100644
@@ -53,7 +53,7 @@ CFG_G_DNL_THOR_PRODUCT_NUM
 CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
-CONFIG_HDMI_ENCODER_I2C_ADDR
+CFG_HDMI_ENCODER_I2C_ADDR
 CONFIG_HOSTNAME
 CONFIG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
Signature · 1 line
2.25.1
author
#101 lore raw

PATCH 54/241 global: Migrate CONFIG_HOSTNAME to CFG

In reply to Tom Rini
---
 include/configs/M5208EVBE.h           | 2 +-
 include/configs/M5235EVB.h            | 2 +-
 include/configs/M5253DEMO.h           | 2 +-
 include/configs/M5272C3.h             | 2 +-
 include/configs/M5282EVB.h            | 2 +-
 include/configs/M53017EVB.h           | 2 +-
 include/configs/M5329EVB.h            | 2 +-
 include/configs/M5373EVB.h            | 2 +-
 include/configs/MPC837XERDB.h         | 2 +-
 include/configs/MPC8548CDS.h          | 2 +-
 include/configs/amcore.h              | 2 +-
 include/configs/aristainetos2.h       | 2 +-
 include/configs/bcm_ns3.h             | 2 +-
 include/configs/controlcenterdc.h     | 2 +-
 include/configs/gazerbeam.h           | 2 +-
 include/configs/km/km-powerpc.h       | 2 +-
 include/configs/km/pg-wcom-ls102xa.h  | 2 +-
 include/configs/kmcent2.h             | 6 +++---
 include/configs/kmcoge5ne.h           | 2 +-
 include/configs/kmeter1.h             | 2 +-
 include/configs/kmopti2.h             | 2 +-
 include/configs/kmsupx5.h             | 2 +-
 include/configs/kmtepr2.h             | 2 +-
 include/configs/kontron-sl-mx6ul.h    | 2 +-
 include/configs/kontron-sl-mx8mm.h    | 2 +-
 include/configs/m53menlo.h            | 2 +-
 include/configs/microblaze-generic.h  | 2 +-
 include/configs/novena.h              | 2 +-
 include/configs/p1_p2_rdb_pc.h        | 2 +-
 include/configs/pg-wcom-expu1.h       | 2 +-
 include/configs/pg-wcom-seli8.h       | 2 +-
 include/configs/socfpga_vining_fpga.h | 2 +-
 include/configs/stmark2.h             | 2 +-
 include/configs/tuge1.h               | 2 +-
 include/configs/tuxx1.h               | 2 +-
 include/configs/usbarmory.h           | 2 +-
 include/configs/x86-common.h          | 2 +-
 include/configs/xea.h                 | 2 +-
 include/env_default.h                 | 4 ++--
 scripts/config_whitelist.txt          | 2 +-
 40 files changed, 43 insertions(+), 43 deletions(-)
include/configs/M5208EVBE.h +1 -1
index 83ffe7ce76d9..ce75c4cbcaf0 100644
@@ -24,7 +24,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5208EVBe"
+#define CFG_HOSTNAME		"M5208EVBe"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
include/configs/M5235EVB.h +1 -1
index fc56834bd9be..8cebf099f1db 100644
@@ -33,7 +33,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5235EVB"
+#define CFG_HOSTNAME		"M5235EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
include/configs/M5253DEMO.h +1 -1
index a1cb1a8a7022..bf31d203e664 100644
@@ -42,7 +42,7 @@
 		""
 #endif
 
-#define CONFIG_HOSTNAME		"M5253DEMO"
+#define CFG_HOSTNAME		"M5253DEMO"
 
 /* I2C */
 #define CFG_SYS_I2C_PINMUX_REG	(*(u32 *) (CFG_SYS_MBAR+0x19C))
include/configs/M5272C3.h +1 -1
index 78eeca342c82..10bfb01a2e03 100644
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5272C3"
+#define CFG_HOSTNAME		"M5272C3"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
include/configs/M5282EVB.h +1 -1
index afc19de8ce73..b69e452b9e50 100644
@@ -36,7 +36,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* CONFIG_MCFFEC */
 
-#define CONFIG_HOSTNAME		"M5282EVB"
+#define CFG_HOSTNAME		"M5282EVB"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=10000\0"			\
include/configs/M53017EVB.h +1 -1
index 1fcc34184928..ce38b823436d 100644
@@ -37,7 +37,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M53017"
+#define CFG_HOSTNAME		"M53017"
 #define CFG_EXTRA_ENV_SETTINGS		\
 	"netdev=eth0\0"				\
 	"loadaddr=40010000\0"			\
include/configs/M5329EVB.h +1 -1
index a49cf6dacb81..2dc22a0b5af8 100644
@@ -29,7 +29,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5329EVB"
+#define CFG_HOSTNAME		"M5329EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=40010000\0"	\
include/configs/M5373EVB.h +1 -1
index 53434881f4c7..bce4a8470f91 100644
@@ -31,7 +31,7 @@
 #	define CFG_GATEWAYIP	192.162.1.1
 #endif				/* FEC_ENET */
 
-#define CONFIG_HOSTNAME		"M5373EVB"
+#define CFG_HOSTNAME		"M5373EVB"
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"netdev=eth0\0"			\
 	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0"	\
include/configs/MPC837XERDB.h +1 -1
index dc7fe06ceb4b..4c3acd5b013b 100644
@@ -225,7 +225,7 @@
 
 #define CONFIG_NETDEV		"eth1"
 
-#define CONFIG_HOSTNAME		"mpc837x_rdb"
+#define CFG_HOSTNAME		"mpc837x_rdb"
 #define CONFIG_ROOTPATH		"/nfsroot"
 				/* U-Boot image on TFTP server */
 #define CONFIG_UBOOTPATH	"u-boot.bin"
include/configs/MPC8548CDS.h +1 -1
index e93b3cb97517..2ce8597c0c52 100644
@@ -327,7 +327,7 @@
 
 #define CONFIG_IPADDR	 192.168.1.253
 
-#define CONFIG_HOSTNAME	 "unknown"
+#define CFG_HOSTNAME	 "unknown"
 #define CONFIG_ROOTPATH	 "/nfsroot"
 #define CONFIG_UBOOTPATH	8548cds/u-boot.bin	/* TFTP server */
 
include/configs/amcore.h +1 -1
index 78060d432a86..18244d1be4c2 100644
@@ -8,7 +8,7 @@
 #ifndef __AMCORE_CONFIG_H
 #define __AMCORE_CONFIG_H
 
-#define CONFIG_HOSTNAME			"AMCORE"
+#define CFG_HOSTNAME			"AMCORE"
 
 #define CFG_SYS_UART_PORT		0
 
include/configs/aristainetos2.h +1 -1
index 9b11934546c1..271d15dc5e50 100644
@@ -11,7 +11,7 @@
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
-#define CONFIG_HOSTNAME		"aristainetos2"
+#define CFG_HOSTNAME		"aristainetos2"
 
 #if (CONFIG_SYS_BOARD_VERSION == 5)
 #define CONSOLE_DEV	"ttymxc1"
include/configs/bcm_ns3.h +1 -1
index 70dd2802686f..84a72bff24f0 100644
@@ -9,7 +9,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_HOSTNAME			"NS3"
+#define CFG_HOSTNAME			"NS3"
 
 /* Physical Memory Map */
 #define V2M_BASE			0x80000000
include/configs/controlcenterdc.h +1 -1
index 8b31e14df31a..9cb194643492 100644
@@ -21,7 +21,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_HOSTNAME		"ccdc"
+#define CFG_HOSTNAME		"ccdc"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS						\
include/configs/gazerbeam.h +1 -1
index 7ab504f35531..f86eb4c40354 100644
@@ -56,7 +56,7 @@
  */
 
 /* TODO: Turn into string option and migrate to Kconfig */
-#define CONFIG_HOSTNAME		"gazerbeam"
+#define CFG_HOSTNAME		"gazerbeam"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
include/configs/km/km-powerpc.h +1 -1
index 424caa0df977..f6c21e1666d1 100644
@@ -31,7 +31,7 @@
 #define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
-	"u-boot="CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
 		"erase " __stringify(BOOTFLASH_START) "  +${filesize} && "\
include/configs/km/pg-wcom-ls102xa.h +1 -1
index 64fb706a1ce6..ddeabc0f79ce 100644
@@ -188,7 +188,7 @@
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"			\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"			\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
include/configs/kmcent2.h +3 -3
index 639f2075e69f..729278ebb246 100644
@@ -8,8 +8,8 @@
 #ifndef __KMCENT2_H
 #define __KMCENT2_H
 
-#define CONFIG_HOSTNAME		"kmcent2"
-#define KM_BOARD_NAME	CONFIG_HOSTNAME
+#define CFG_HOSTNAME		"kmcent2"
+#define KM_BOARD_NAME	CFG_HOSTNAME
 
 /*
  * The Linux fsl_fman driver needs to be able to process frames with more
@@ -401,7 +401,7 @@ int get_scl(void);
 	"cramfsloadfdt="						\
 		"cramfsload ${fdt_addr_r} "				\
 		"fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"		\
-	"u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"		\
+	"u-boot=" CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)	\
 		" +${filesize} && "					\
 		"erase " __stringify(CONFIG_SYS_MONITOR_BASE)		\
include/configs/kmcoge5ne.h +1 -1
index 6b30fb4b617e..8681145c309f 100644
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmcoge5ne"
+#define CFG_HOSTNAME		"kmcoge5ne"
 #define NAND_MAX_CHIPS				1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
include/configs/kmeter1.h +1 -1
index 910fc1b2cb25..deffde289601 100644
@@ -8,7 +8,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_HOSTNAME		"kmeter1"
+#define CFG_HOSTNAME		"kmeter1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/kmopti2.h +1 -1
index 5050c7030390..32f5089656d9 100644
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmopti2"
+#define CFG_HOSTNAME		"kmopti2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/kmsupx5.h +1 -1
index e3de6c61e71c..2e666c45dc80 100644
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"kmsupx5"
+#define CFG_HOSTNAME		"kmsupx5"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/kmtepr2.h +1 -1
index a4ceb1c50d6b..e41a61f9d9d0 100644
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME         "kmtepr2"
+#define CFG_HOSTNAME         "kmtepr2"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/kontron-sl-mx6ul.h +1 -1
index 81ca83fdbfab..e57ae20a74ea 100644
@@ -23,7 +23,7 @@
 
 /* Board and environment settings */
 #define CONFIG_MXC_UART_BASE		UART4_BASE
-#define CONFIG_HOSTNAME			"kontron-mx6ul"
+#define CFG_HOSTNAME			"kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/kontron-sl-mx8mm.h +1 -1
index 2e21aacd1893..56d0036147c6 100644
@@ -23,7 +23,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	0x200000
 
 /* Board and environment settings */
-#define CONFIG_HOSTNAME			"kontron-mx8mm"
+#define CFG_HOSTNAME			"kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
include/configs/m53menlo.h +1 -1
index 4123964256bd..979fddab5e32 100644
@@ -84,7 +84,7 @@
 /*
  * Extra Environments
  */
-#define CONFIG_HOSTNAME		"m53menlo"
+#define CFG_HOSTNAME		"m53menlo"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttymxc0\0"						\
include/configs/microblaze-generic.h +1 -1
index ede4ffd53f4e..53498e1c78d8 100644
@@ -16,7 +16,7 @@
 # define CFG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define	CONFIG_HOSTNAME		"microblaze-generic"
+#define	CFG_HOSTNAME		"microblaze-generic"
 
 /* architecture dependent code */
 #if defined(CONFIG_CMD_PXE) && defined(CONFIG_CMD_DHCP)
include/configs/novena.h +1 -1
index 19b40070be92..520c4ba130f1 100644
@@ -25,7 +25,7 @@
  */
 
 /* Booting Linux */
-#define CONFIG_HOSTNAME			"novena"
+#define CFG_HOSTNAME			"novena"
 
 /* Physical Memory Map */
 #define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
include/configs/p1_p2_rdb_pc.h +1 -1
index 93909eda55dd..de6440a07564 100644
@@ -418,7 +418,7 @@
 /*
  * Environment Configuration
  */
-#define CONFIG_HOSTNAME		"unknown"
+#define CFG_HOSTNAME		"unknown"
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
 #define CONFIG_UBOOTPATH	u-boot.bin /* U-Boot image on TFTP server */
 
include/configs/pg-wcom-expu1.h +1 -1
index 1b72739d143d..5b5637762aca 100644
@@ -7,7 +7,7 @@
 #define __CONFIG_PG_WCOM_EXPU1_H
 
 #define WCOM_EXPU1
-#define CONFIG_HOSTNAME				"EXPU1"
+#define CFG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
include/configs/pg-wcom-seli8.h +1 -1
index e4bcae5bb5e1..a1c1ca993d7e 100644
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_PG_WCOM_SELI8_H
 #define __CONFIG_PG_WCOM_SELI8_H
 
-#define CONFIG_HOSTNAME			"SELI8"
+#define CFG_HOSTNAME			"SELI8"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
 #define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
include/configs/socfpga_vining_fpga.h +1 -1
index cd48650dd554..31ebf34c1c68 100644
@@ -13,7 +13,7 @@
 /* Booting Linux */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			"socfpga_vining_fpga"
+#define CFG_HOSTNAME			"socfpga_vining_fpga"
 
 /*
  * Active LOW GPIO buttons:
include/configs/stmark2.h +1 -1
index be0193105b4b..63040adf97cb 100644
@@ -8,7 +8,7 @@
 #ifndef __STMARK2_CONFIG_H
 #define __STMARK2_CONFIG_H
 
-#define CONFIG_HOSTNAME			"stmark2"
+#define CFG_HOSTNAME			"stmark2"
 
 #define CFG_SYS_UART_PORT		0
 
include/configs/tuge1.h +1 -1
index d43ccbe8dd94..7ddb44124c2f 100644
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuge1"
+#define CFG_HOSTNAME		"tuge1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/tuxx1.h +1 -1
index 7eed31c35f03..d18c57c4d198 100644
@@ -23,7 +23,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_HOSTNAME		"tuxx1"
+#define CFG_HOSTNAME		"tuxx1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/usbarmory.h +1 -1
index f273533be429..b2153b441142 100644
@@ -28,7 +28,7 @@
 #define CONFIG_MXC_USB_FLAGS	0
 
 /* Linux boot */
-#define CONFIG_HOSTNAME		"usbarmory"
+#define CFG_HOSTNAME		"usbarmory"
 
 #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
 
include/configs/x86-common.h +1 -1
index 7705d31a313a..fdd7dba9a6f2 100644
@@ -42,7 +42,7 @@
 
 /* Default environment */
 #define CONFIG_ROOTPATH		"/opt/nfsroot"
-#define CONFIG_HOSTNAME		"x86"
+#define CFG_HOSTNAME		"x86"
 #define CONFIG_RAMDISK_ADDR	0x4000000
 #if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS	"othbootargs=\0"
include/configs/xea.h +1 -1
index 50b96f31e163..974ed4224bc5 100644
@@ -26,7 +26,7 @@
 #define CFG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		"xea"
+#define CFG_HOSTNAME		"xea"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
 	"bootmode=update\0"						\
include/env_default.h +2 -2
index 7d0af83a5913..b1fe945bae5b 100644
@@ -74,8 +74,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_NETMASK
 	"netmask="	__stringify(CONFIG_NETMASK)	"\0"
 #endif
-#ifdef	CONFIG_HOSTNAME
-	"hostname="	CONFIG_HOSTNAME	"\0"
+#ifdef	CFG_HOSTNAME
+	"hostname="	CFG_HOSTNAME	"\0"
 #endif
 #ifdef CONFIG_USE_BOOTFILE
 	"bootfile="	CONFIG_BOOTFILE			"\0"
scripts/config_whitelist.txt +1 -1
index 9079fbb2e3f6..0fc29f456c13 100644
@@ -54,7 +54,7 @@ CFG_G_DNL_THOR_VENDOR_NUM
 CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
-CONFIG_HOSTNAME
+CFG_HOSTNAME
 CONFIG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
Signature · 1 line
2.25.1
author
#102 lore raw

PATCH 55/241 global: Migrate CONFIG_HSMMC2_8BIT to CFG

In reply to Tom Rini
---
 drivers/mmc/omap_hsmmc.c     | 2 +-
 include/configs/am335x_shc.h | 2 +-
 include/configs/am57xx_evm.h | 2 +-
 include/configs/cm_t43.h     | 2 +-
 include/configs/dra7xx_evm.h | 2 +-
 include/configs/omap5_uevm.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
drivers/mmc/omap_hsmmc.c +1 -1
index a2595d19e7f6..80dd70f087e2 100644
@@ -1560,7 +1560,7 @@ int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio,
 #if (defined(CONFIG_OMAP44XX) || defined(CONFIG_OMAP54XX) || \
 	defined(CONFIG_DRA7XX) || defined(CONFIG_AM33XX) || \
 	defined(CONFIG_AM43XX) || defined(CONFIG_ARCH_KEYSTONE)) && \
-		defined(CONFIG_HSMMC2_8BIT)
+		defined(CFG_HSMMC2_8BIT)
 		/* Enable 8-bit interface for eMMC on OMAP4/5 or DRA7XX */
 		host_caps_val |= MMC_MODE_8BIT;
 #endif
include/configs/am335x_shc.h +1 -1
index c66650c8e8d1..577a622d42c9 100644
@@ -20,7 +20,7 @@
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
 
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 #ifndef CONFIG_SPL_BUILD
 #define CFG_EXTRA_ENV_SETTINGS \
include/configs/am57xx_evm.h +1 -1
index dacfd41ccedf..afacf70e74a9 100644
@@ -36,7 +36,7 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /* CPSW Ethernet */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs longer aneg time at 1G */
include/configs/cm_t43.h +1 -1
index 06de4dbeb6d5..5a795fe99171 100644
@@ -36,7 +36,7 @@
  * we don't need to do it twice.
  */
 
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 #include <configs/ti_armv7_omap.h>
 
include/configs/dra7xx_evm.h +1 -1
index ac3fcacc68ed..30def6abf8f4 100644
@@ -49,7 +49,7 @@
 #include <configs/ti_omap5_common.h>
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /*
  * Default to using SPI for environment, etc.
include/configs/omap5_uevm.h +1 -1
index d7fa2d43914a..8a9a6dfc4c34 100644
@@ -33,7 +33,7 @@
 /* MMC ENV related defines */
 
 /* Enhance our eMMC support / experience. */
-#define CONFIG_HSMMC2_8BIT
+#define CFG_HSMMC2_8BIT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
scripts/config_whitelist.txt +1 -1
index 0fc29f456c13..d7265e370d05 100644
@@ -55,7 +55,7 @@ CFG_G_DNL_UMS_PRODUCT_NUM
 CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
-CONFIG_HSMMC2_8BIT
+CFG_HSMMC2_8BIT
 CONFIG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
Signature · 1 line
2.25.1
author
#103 lore raw

PATCH 56/241 global: Migrate CONFIG_HW_ENV_SETTINGS to CFG

In reply to Tom Rini
---
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 4 ++--
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +2 -2
index ddeabc0f79ce..80027f3a773a 100644
@@ -217,7 +217,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"
@@ -225,7 +225,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
index 729278ebb246..d7d5bce15c59 100644
@@ -423,7 +423,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"
@@ -445,7 +445,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"					\
 	""
 
scripts/config_whitelist.txt +1 -1
index d7265e370d05..44956bff3940 100644
@@ -56,7 +56,7 @@ CFG_G_DNL_UMS_VENDOR_NUM
 CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
 CFG_HSMMC2_8BIT
-CONFIG_HW_ENV_SETTINGS
+CFG_HW_ENV_SETTINGS
 CONFIG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
Signature · 1 line
2.25.1
author
#104 lore raw

PATCH 57/241 global: Migrate CONFIG_I2C_ENV_EEPROM_BUS to CFG

In reply to Tom Rini
---
 env/Kconfig                  |  4 ++--
 env/eeprom.c                 | 18 +++++++++---------
 scripts/config_whitelist.txt |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
env/Kconfig +2 -2
index 5a7e2f299b06..1c7a414321ce 100644
@@ -78,12 +78,12 @@ config ENV_IS_IN_EEPROM
 	  still be one byte because the extra address bits are hidden
 	  in the chip address.
 
-	  - CONFIG_I2C_ENV_EEPROM_BUS
+	  - CFG_I2C_ENV_EEPROM_BUS
 	  if you have an Environment on an EEPROM reached over
 	  I2C muxes, you can define here, how to reach this
 	  EEPROM. For example:
 
-	  #define CONFIG_I2C_ENV_EEPROM_BUS	  1
+	  #define CFG_I2C_ENV_EEPROM_BUS	  1
 
 	  EEPROM which holds the environment, is reached over
 	  a pca9547 i2c mux with address 0x70, channel 3.
env/eeprom.c +9 -9
index f8556a47213c..192e0f3af6d0 100644
@@ -15,7 +15,7 @@
 #include <asm/global_data.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 #include <i2c.h>
 #endif
 #include <search.h>
@@ -28,16 +28,16 @@ static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
 			   uchar *buffer, unsigned cnt)
 {
 	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	int old_bus = i2c_get_bus_num();
 
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
+	if (old_bus != CFG_I2C_ENV_EEPROM_BUS)
+		i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS);
 #endif
 
 	rcode = eeprom_read(dev_addr, offset, buffer, cnt);
 
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	i2c_set_bus_num(old_bus);
 #endif
 
@@ -48,16 +48,16 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
 			    uchar *buffer, unsigned cnt)
 {
 	int rcode;
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	int old_bus = i2c_get_bus_num();
 
-	if (old_bus != CONFIG_I2C_ENV_EEPROM_BUS)
-		i2c_set_bus_num(CONFIG_I2C_ENV_EEPROM_BUS);
+	if (old_bus != CFG_I2C_ENV_EEPROM_BUS)
+		i2c_set_bus_num(CFG_I2C_ENV_EEPROM_BUS);
 #endif
 
 	rcode = eeprom_write(dev_addr, offset, buffer, cnt);
 
-#if defined(CONFIG_I2C_ENV_EEPROM_BUS)
+#if defined(CFG_I2C_ENV_EEPROM_BUS)
 	i2c_set_bus_num(old_bus);
 #endif
 
scripts/config_whitelist.txt +1 -1
index 44956bff3940..440bef90575d 100644
@@ -57,7 +57,7 @@ CFG_HDMI_ENCODER_I2C_ADDR
 CFG_HOSTNAME
 CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
-CONFIG_I2C_ENV_EEPROM_BUS
+CFG_I2C_ENV_EEPROM_BUS
 CONFIG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE0
Signature · 1 line
2.25.1
author
#105 lore raw

PATCH 58/241 global: Migrate CONFIG_I2C_MULTI_BUS to CFG

In reply to Tom Rini
---
 README                               |  8 ++++----
 cmd/i2c.c                            | 12 ++++++------
 drivers/i2c/mv_i2c.c                 |  4 ++--
 include/configs/display5.h           |  2 +-
 include/configs/km/pg-wcom-ls102xa.h |  2 +-
 include/configs/novena.h             |  2 +-
 include/configs/omap3_beagle.h       |  2 +-
 include/configs/sniper.h             |  2 +-
 include/configs/tqma6.h              |  2 +-
 include/i2c.h                        |  2 +-
 scripts/config_whitelist.txt         |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)
README +4 -4
index d76058e1ab41..50bfd7e4fffc 100644
@@ -1006,7 +1006,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
@@ -1016,17 +1016,17 @@ The following options need to be configured:
 		CFG_SYS_I2C_NOPROBES
 
 		This option specifies a list of I2C devices that will be skipped
-		when the 'i2c probe' command is issued.	 If CONFIG_I2C_MULTI_BUS
+		when the 'i2c probe' command is issued.	 If CFG_I2C_MULTI_BUS
 		is set, specify a list of bus-device pairs.  Otherwise, specify
 		a 1D array of device addresses
 
 		e.g.
-			#undef	CONFIG_I2C_MULTI_BUS
+			#undef	CFG_I2C_MULTI_BUS
 			#define CFG_SYS_I2C_NOPROBES {0x50,0x68}
 
 		will skip addresses 0x50 and 0x68 on a board with one I2C bus
 
-			#define CONFIG_I2C_MULTI_BUS
+			#define CFG_I2C_MULTI_BUS
 			#define CFG_SYS_I2C_NOPROBES	{{0,0x50},{0,0x68},{1,0x54}}
 
 		will skip addresses 0x50 and 0x68 on bus 0 and address 0x54 on bus 1
cmd/i2c.c +6 -6
index da8b4c255555..2f9acc6670a3 100644
@@ -98,7 +98,7 @@ static uint	i2c_mm_last_alen;
  * pairs.  The following macros take care of this */
 
 #if defined(CFG_SYS_I2C_NOPROBES)
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS)
 static struct
 {
 	uchar	bus;
@@ -1764,7 +1764,7 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
  * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
  * on error.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) || \
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) || \
 		CONFIG_IS_ENABLED(DM_I2C)
 static int do_i2c_bus_num(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[])
@@ -1916,9 +1916,9 @@ static struct cmd_tbl cmd_i2c_sub[] = {
 #endif
 	U_BOOT_CMD_MKENT(crc32, 3, 1, do_i2c_crc, "", ""),
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+	defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
 	U_BOOT_CMD_MKENT(dev, 1, 1, do_i2c_bus_num, "", ""),
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif  /* CFG_I2C_MULTI_BUS */
 #if defined(CONFIG_I2C_EDID)
 	U_BOOT_CMD_MKENT(edid, 1, 1, do_edid, "", ""),
 #endif  /* CONFIG_I2C_EDID */
@@ -1993,9 +1993,9 @@ static char i2c_help_text[] =
 #endif
 	"crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || \
-	defined(CONFIG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
+	defined(CFG_I2C_MULTI_BUS) || CONFIG_IS_ENABLED(DM_I2C)
 	"i2c dev [dev] - show or set current I2C bus\n"
-#endif  /* CONFIG_I2C_MULTI_BUS */
+#endif  /* CFG_I2C_MULTI_BUS */
 #if defined(CONFIG_I2C_EDID)
 	"i2c edid chip - print EDID configuration information\n"
 #endif  /* CONFIG_I2C_EDID */
drivers/i2c/mv_i2c.c +2 -2
index 8ee17f0a4501..dffd551f2c29 100644
@@ -374,7 +374,7 @@ static int __i2c_write(struct mv_i2c *base, uchar chip, u8 *addr, int alen,
 
 static struct mv_i2c *base_glob;
 
-#ifdef CONFIG_I2C_MULTI_BUS
+#ifdef CFG_I2C_MULTI_BUS
 static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
 static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
 static unsigned int current_bus;
@@ -407,7 +407,7 @@ void i2c_init(int speed, int slaveaddr)
 {
 	u32 val;
 
-#ifdef CONFIG_I2C_MULTI_BUS
+#ifdef CFG_I2C_MULTI_BUS
 	current_bus = 0;
 	base_glob = (struct mv_i2c *)i2c_regs[current_bus];
 #else
include/configs/display5.h +1 -1
index f95c1602e676..191c8fb8ab46 100644
@@ -37,7 +37,7 @@
 #define CONFIG_MXC_UART_BASE		UART5_BASE
 
 /* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR	0
include/configs/km/pg-wcom-ls102xa.h +1 -1
index 80027f3a773a..e64cf24bd5e9 100644
@@ -154,7 +154,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 #define CFG_SYS_I2C_MAX_HOPS		1
 #define CFG_SYS_NUM_I2C_BUSES	3
 #define I2C_MUX_PCA_ADDR		0x70
include/configs/novena.h +1 -1
index 520c4ba130f1..af99ba4f193c 100644
@@ -35,7 +35,7 @@
 #define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
 
 /* I2C */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* I2C EEPROM */
 
include/configs/omap3_beagle.h +1 -1
index efeb7bf10078..af7cb3513f8f 100644
@@ -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
index eaee8dd37396..45a3102aeeef 100644
@@ -38,7 +38,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /*
  * Input
include/configs/tqma6.h +1 -1
index 14d7730f67bf..cb5f7fc25af9 100644
@@ -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
index 51390f8fd84f..3811b26c08e0 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index 440bef90575d..501e39bb4900 100644
@@ -58,7 +58,7 @@ CFG_HOSTNAME
 CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
 CFG_I2C_ENV_EEPROM_BUS
-CONFIG_I2C_MULTI_BUS
+CFG_I2C_MULTI_BUS
 CONFIG_I2C_MVTWSI
 CONFIG_I2C_MVTWSI_BASE0
 CONFIG_I2C_MVTWSI_BASE1
Signature · 1 line
2.25.1
author
#106 lore raw

PATCH 59/241 global: Migrate CONFIG_I2C_MVTWSI to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/arch-sunxi/i2c.h        |  6 ++--
 arch/arm/mach-kirkwood/include/mach/config.h |  2 +-
 arch/arm/mach-mvebu/include/mach/config.h    |  2 +-
 drivers/i2c/mvtwsi.c                         | 38 ++++++++++----------
 include/configs/db-88f6720.h                 |  2 +-
 include/configs/db-88f6820-gp.h              |  2 +-
 include/configs/db-mv784mp-gp.h              |  2 +-
 include/configs/ds414.h                      |  2 +-
 include/configs/maxbcm.h                     |  2 +-
 include/configs/theadorable.h                |  4 +--
 scripts/config_whitelist.txt                 |  6 ++--
 11 files changed, 34 insertions(+), 34 deletions(-)
arch/arm/include/asm/arch-sunxi/i2c.h +3 -3
index 241b44928a95..f0da46d863cf 100644
@@ -8,13 +8,13 @@
 #include <asm/arch/cpu.h>
 
 #ifdef CONFIG_I2C0_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
+#define CFG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
+#define CFG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
 #endif
 #ifdef CONFIG_R_I2C_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
+#define CFG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
 #endif
 
 /* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
arch/arm/mach-kirkwood/include/mach/config.h +1 -1
index a6de7676294b..fbef9c99b1d3 100644
@@ -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
arch/arm/mach-mvebu/include/mach/config.h +1 -1
index 2e06f2bdaee3..19f9f083129b 100644
@@ -35,7 +35,7 @@
  */
 #ifdef CONFIG_CMD_I2C
 #ifndef CONFIG_SYS_I2C_SOFT
-#define CONFIG_I2C_MVTWSI
+#define CFG_I2C_MVTWSI
 #endif
 #endif
 
drivers/i2c/mvtwsi.c +19 -19
index a9c7d6e1bc26..55f9b983e884 100644
@@ -25,7 +25,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
- * Include a file that will provide CONFIG_I2C_MVTWSI_BASE*, and possibly other
+ * Include a file that will provide CFG_I2C_MVTWSI_BASE*, and possibly other
  * settings
  */
 
@@ -197,29 +197,29 @@ inline uint calc_tick(uint speed)
 static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 {
 	switch (adap->hwadapnr) {
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 	case 0:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 	case 1:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE2
+#ifdef CFG_I2C_MVTWSI_BASE2
 	case 2:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE2;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE2;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE3
+#ifdef CFG_I2C_MVTWSI_BASE3
 	case 3:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE3;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE3;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE4
+#ifdef CFG_I2C_MVTWSI_BASE4
 	case 4:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE4;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE4;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE5
+#ifdef CFG_I2C_MVTWSI_BASE5
 	case 5:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE5;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE5;
 #endif
 	default:
 		printf("Missing mvtwsi controller %d base\n", adap->hwadapnr);
@@ -737,41 +737,41 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
 				10000);
 }
 
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 1)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE2
+#ifdef CFG_I2C_MVTWSI_BASE2
 U_BOOT_I2C_ADAP_COMPLETE(twsi2, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 2)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE3
+#ifdef CFG_I2C_MVTWSI_BASE3
 U_BOOT_I2C_ADAP_COMPLETE(twsi3, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 3)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE4
+#ifdef CFG_I2C_MVTWSI_BASE4
 U_BOOT_I2C_ADAP_COMPLETE(twsi4, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 4)
 
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE5
+#ifdef CFG_I2C_MVTWSI_BASE5
 U_BOOT_I2C_ADAP_COMPLETE(twsi5, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
include/configs/db-88f6720.h +1 -1
index ef9c457e1020..54de2d0d8334 100644
@@ -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
index 6dbf582d733b..2cbe4eb440b4 100644
@@ -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
index bf8b35102ad7..5c6d7fa1b776 100644
@@ -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
index e69883ba73bc..9446acba7923 100644
@@ -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
index 5ad945b55896..413597e09b26 100644
@@ -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 +2 -2
index 9722b0db72aa..2ce92845f1c0 100644
@@ -25,8 +25,8 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
+#define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
 
 /* USB/EHCI configuration */
 
scripts/config_whitelist.txt +3 -3
index 501e39bb4900..1798a7420cd7 100644
@@ -59,9 +59,9 @@ CFG_HSMMC2_8BIT
 CFG_HW_ENV_SETTINGS
 CFG_I2C_ENV_EEPROM_BUS
 CFG_I2C_MULTI_BUS
-CONFIG_I2C_MVTWSI
-CONFIG_I2C_MVTWSI_BASE0
-CONFIG_I2C_MVTWSI_BASE1
+CFG_I2C_MVTWSI
+CFG_I2C_MVTWSI_BASE0
+CFG_I2C_MVTWSI_BASE1
 CONFIG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
Signature · 1 line
2.25.1
author
#107 lore raw

PATCH 60/241 global: Migrate CONFIG_I2C_RTC_ADDR to CFG

In reply to Tom Rini
---
 include/configs/eb_cpu5282.h | 2 +-
 scripts/config_whitelist.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/eb_cpu5282.h +1 -1
index 5ef51c94dab8..a4370ca5c7cc 100644
@@ -150,7 +150,7 @@
  */
 
 #ifdef CONFIG_CMD_DATE
-#define CONFIG_I2C_RTC_ADDR		0x68
+#define CFG_I2C_RTC_ADDR		0x68
 #endif
 
 #endif	/* _CONFIG_M5282EVB_H */
scripts/config_whitelist.txt +1 -1
index 1798a7420cd7..e507dca614f5 100644
@@ -62,7 +62,7 @@ CFG_I2C_MULTI_BUS
 CFG_I2C_MVTWSI
 CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
-CONFIG_I2C_RTC_ADDR
+CFG_I2C_RTC_ADDR
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
Signature · 1 line
2.25.1
author
#108 lore raw

PATCH 61/241 global: Migrate CONFIG_ICS307_REFCLK_HZ to CFG

In reply to Tom Rini
---
 board/freescale/common/ics307_clk.c | 4 ++--
 include/configs/T208xQDS.h          | 2 +-
 include/configs/T208xRDB.h          | 2 +-
 include/configs/T4240RDB.h          | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
board/freescale/common/ics307_clk.c +2 -2
index 01662d36e9fb..5f95571d24cc 100644
@@ -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
index 0d245940dc0e..c614a539b391 100644
@@ -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
index 28c59b4e66f8..2da4f5a09b14 100644
@@ -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
index 640c12d91ab5..b8bfc52f07ae 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index e507dca614f5..9516ba848bfc 100644
@@ -63,7 +63,7 @@ CFG_I2C_MVTWSI
 CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
-CONFIG_ICS307_REFCLK_HZ
+CFG_ICS307_REFCLK_HZ
 CONFIG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
Signature · 1 line
2.25.1
author
#109 lore raw

PATCH 62/241 global: Migrate CONFIG_IMX6_PWM_PER_CLK to CFG

In reply to Tom Rini
---
 drivers/pwm/pwm-imx.c         | 2 +-
 include/configs/vining_2000.h | 2 +-
 scripts/config_whitelist.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/pwm/pwm-imx.c +1 -1
index 9b8a8c189d09..8fbb40cc2767 100644
@@ -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
index c84353ebea66..cdd2eeef0ac9 100644
@@ -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. */
scripts/config_whitelist.txt +1 -1
index 9516ba848bfc..48de265ee7e1 100644
@@ -64,7 +64,7 @@ CFG_I2C_MVTWSI_BASE0
 CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
-CONFIG_IMX6_PWM_PER_CLK
+CFG_IMX6_PWM_PER_CLK
 CONFIG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
Signature · 1 line
2.25.1
author
#110 lore raw

PATCH 63/241 global: Migrate CONFIG_IPADDR to CFG

In reply to Tom Rini
---
 README                             | 2 +-
 doc/README.usb                     | 2 +-
 include/configs/M5208EVBE.h        | 2 +-
 include/configs/M5235EVB.h         | 2 +-
 include/configs/M5272C3.h          | 2 +-
 include/configs/M5282EVB.h         | 2 +-
 include/configs/M53017EVB.h        | 2 +-
 include/configs/M5329EVB.h         | 2 +-
 include/configs/M5373EVB.h         | 2 +-
 include/configs/MCR3000.h          | 2 +-
 include/configs/MPC8548CDS.h       | 2 +-
 include/configs/apalis-imx8.h      | 2 +-
 include/configs/apalis-tk1.h       | 4 ++--
 include/configs/apalis_imx6.h      | 4 ++--
 include/configs/cobra5272.h        | 2 +-
 include/configs/colibri-imx6ull.h  | 2 +-
 include/configs/colibri-imx8x.h    | 2 +-
 include/configs/colibri_imx6.h     | 4 ++--
 include/configs/colibri_imx7.h     | 2 +-
 include/configs/colibri_vf.h       | 2 +-
 include/configs/gw_ventana.h       | 2 +-
 include/configs/integratorcp.h     | 2 +-
 include/configs/mt7622.h           | 2 +-
 include/configs/mt7623.h           | 2 +-
 include/configs/mt7629.h           | 2 +-
 include/configs/mvebu_alleycat-5.h | 2 +-
 include/configs/poleg.h            | 2 +-
 include/configs/uniphier.h         | 2 +-
 include/env_default.h              | 4 ++--
 scripts/config_whitelist.txt       | 2 +-
 30 files changed, 34 insertions(+), 34 deletions(-)
README +1 -1
index 50bfd7e4fffc..d09ebd47cd83 100644
@@ -735,7 +735,7 @@ The following options need to be configured:
 		command issued before MII status register can be read
 
 - IP address:
-		CONFIG_IPADDR
+		CFG_IPADDR
 
 		Define a default value for the IP address to use for
 		the default Ethernet interface, in case this is not
doc/README.usb +1 -1
index 650a6daae0a5..495b1859a771 100644
@@ -162,7 +162,7 @@ common executable is discouraged, as it leads to potential conflicts,
 and all the parameters can either get stored in the board's external
 environment, or get obtained from the bootp server if not set.
 
-#define CONFIG_IPADDR		10.0.0.2  (replace with your value)
+#define CFG_IPADDR		10.0.0.2  (replace with your value)
 #define CONFIG_SERVERIP		10.0.0.1  (replace with your value)
 #define CONFIG_BOOTFILE		"uImage"
 
include/configs/M5208EVBE.h +1 -1
index ce75c4cbcaf0..647e23f380b8 100644
@@ -18,7 +18,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M5235EVB.h +1 -1
index 8cebf099f1db..7bc86eb8b5f6 100644
@@ -27,7 +27,7 @@
 
 /* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M5272C3.h +1 -1
index 10bfb01a2e03..4b88cfc2cdd9 100644
@@ -30,7 +30,7 @@
 	env/embedded.o(.text);
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M5282EVB.h +1 -1
index b69e452b9e50..f34985c47d4b 100644
@@ -30,7 +30,7 @@
 	env/embedded.o(.text*);
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M53017EVB.h +1 -1
index ce38b823436d..5afd8383c1bd 100644
@@ -31,7 +31,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M5329EVB.h +1 -1
index 2dc22a0b5af8..9d5f0e1c0964 100644
@@ -23,7 +23,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/M5373EVB.h +1 -1
index bce4a8470f91..807d591c9f12 100644
@@ -25,7 +25,7 @@
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_IPADDR	192.162.1.2
+#	define CFG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
 #	define CONFIG_SERVERIP	192.162.1.1
 #	define CFG_GATEWAYIP	192.162.1.1
include/configs/MCR3000.h +1 -1
index 6e7b6e81208f..d61ed82ab3bf 100644
@@ -52,7 +52,7 @@
 		"${ofl_args}; "						\
 		"bootm ${loadaddr} - 0xf00000\0"
 
-#define CONFIG_IPADDR			192.168.0.3
+#define CFG_IPADDR			192.168.0.3
 #define CONFIG_SERVERIP			192.168.0.1
 #define CONFIG_NETMASK			255.0.0.0
 
include/configs/MPC8548CDS.h +1 -1
index 2ce8597c0c52..d2a70aa88f88 100644
@@ -325,7 +325,7 @@
  * Environment Configuration
  */
 
-#define CONFIG_IPADDR	 192.168.1.253
+#define CFG_IPADDR	 192.168.1.253
 
 #define CFG_HOSTNAME	 "unknown"
 #define CONFIG_ROOTPATH	 "/nfsroot"
include/configs/apalis-imx8.h +1 -1
index 15bedc0afc29..0258a70d923b 100644
@@ -14,7 +14,7 @@
 #define USDHC2_BASE_ADDR		0x5b020000
 
 /* Networking */
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/apalis-tk1.h +2 -2
index f0a02ae17953..4db3465cd9b7 100644
@@ -33,8 +33,8 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR		192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR		192.168.10.2
 #define CONFIG_NETMASK		255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP		192.168.10.1
include/configs/apalis_imx6.h +2 -2
index 4899dfb4dee1..8db2909c96b2 100644
@@ -35,8 +35,8 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
include/configs/cobra5272.h +1 -1
index 6d6e2fc69620..1b5115f7caf1 100644
@@ -91,7 +91,7 @@ enter a valid image address in flash */
 
 /* User network settings */
 
-#define CONFIG_IPADDR 192.168.100.2		/* default board IP address */
+#define CFG_IPADDR 192.168.100.2		/* default board IP address */
 #define CONFIG_SERVERIP 192.168.100.1	/* default tftp server IP address */
 
 #endif
include/configs/colibri-imx6ull.h +1 -1
index a748d4f3169f..4f5287b6bcfb 100644
@@ -20,7 +20,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR	0
 #define CFG_SYS_FSL_USDHC_NUM	1
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/colibri-imx8x.h +1 -1
index e4bb71d47d62..35f29da0c351 100644
@@ -14,7 +14,7 @@
 #define USDHC1_BASE_ADDR		0x5b010000
 #define USDHC2_BASE_ADDR		0x5b020000
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/colibri_imx6.h +2 -2
index 0486db6b51ed..2f30322bb4f8 100644
@@ -30,8 +30,8 @@
 
 /* Command definition */
 
-#undef CONFIG_IPADDR
-#define CONFIG_IPADDR			192.168.10.2
+#undef CFG_IPADDR
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP			192.168.10.1
include/configs/colibri_imx7.h +1 -1
index 99ed8183ef21..0da7553e0245 100644
@@ -21,7 +21,7 @@
 #define CFG_SYS_FSL_USDHC_NUM	2
 #endif
 
-#define CONFIG_IPADDR			192.168.10.2
+#define CFG_IPADDR			192.168.10.2
 #define CONFIG_NETMASK			255.255.255.0
 #define CONFIG_SERVERIP			192.168.10.1
 
include/configs/colibri_vf.h +1 -1
index ef49969598c9..808d69d0c865 100644
@@ -16,7 +16,7 @@
 
 /* NAND support */
 
-#define CONFIG_IPADDR		192.168.10.2
+#define CFG_IPADDR		192.168.10.2
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_SERVERIP		192.168.10.1
 
include/configs/gw_ventana.h +1 -1
index 4d0a78c6269c..e71f10a24fa1 100644
@@ -57,7 +57,7 @@
 /* Persistent Environment Config */
 
 /* Environment */
-#define CONFIG_IPADDR             192.168.1.1
+#define CFG_IPADDR             192.168.1.1
 #define CONFIG_SERVERIP           192.168.1.146
 
 #endif			       /* __CONFIG_H */
include/configs/integratorcp.h +1 -1
index 25bb41ebc46c..ccf73604480b 100644
@@ -20,7 +20,7 @@
 #define CFG_SYS_HZ_CLOCK		1000000	/* Timer 1 is clocked at 1Mhz */
 
 #define CONFIG_SERVERIP 192.168.1.100
-#define CONFIG_IPADDR 192.168.1.104
+#define CFG_IPADDR 192.168.1.104
 
 /*
  * Miscellaneous configurable options
include/configs/mt7622.h +1 -1
index 8c297266d8b1..199da46ad018 100644
@@ -18,7 +18,7 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.3
 
 #endif
include/configs/mt7623.h +1 -1
index 031c1aea0c00..d3cf6597a633 100644
@@ -33,7 +33,7 @@
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.2
 
 #ifdef CONFIG_DISTRO_DEFAULTS
include/configs/mt7629.h +1 -1
index bfa44aacc726..8c0b02b40e50 100644
@@ -28,7 +28,7 @@
 #define CFG_SYS_SDRAM_BASE		0x40000000
 
 /* Ethernet */
-#define CONFIG_IPADDR			192.168.1.1
+#define CFG_IPADDR			192.168.1.1
 #define CONFIG_SERVERIP			192.168.1.2
 
 #endif
include/configs/mvebu_alleycat-5.h +1 -1
index 204a9b0b5458..0d38645c0e60 100644
@@ -15,7 +15,7 @@
 				      115200, 230400, 460800, 921600 }
 
 /* Default Env vars */
-#define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
+#define CFG_IPADDR           0.0.0.0 /* In order to cause an error */
 #define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
 #define CONFIG_NETMASK          255.255.255.0
 #define CFG_GATEWAYIP        0.0.0.0
include/configs/poleg.h +1 -1
index 7998ef7347fb..3e4309512cc1 100644
@@ -15,7 +15,7 @@
 
 /* Default environemnt variables */
 #define CONFIG_SERVERIP                 192.168.0.1
-#define CONFIG_IPADDR                   192.168.0.2
+#define CFG_IPADDR                   192.168.0.2
 #define CONFIG_NETMASK                  255.255.255.0
 #define CFG_EXTRA_ENV_SETTINGS   "uimage_flash_addr=80200000\0"   \
 		"stdin=serial\0"   \
include/configs/uniphier.h +1 -1
index 874f75404712..3ec3caade49c 100644
@@ -47,7 +47,7 @@
  * Network Configuration
  */
 #define CONFIG_SERVERIP			192.168.11.1
-#define CONFIG_IPADDR			192.168.11.10
+#define CFG_IPADDR			192.168.11.10
 #define CFG_GATEWAYIP		192.168.11.1
 #define CONFIG_NETMASK			255.255.255.0
 
include/env_default.h +2 -2
index b1fe945bae5b..5ee28a54960d 100644
@@ -53,8 +53,8 @@ const char default_environment[] = {
 #ifdef	CONFIG_ETHPRIME
 	"ethprime="	CONFIG_ETHPRIME			"\0"
 #endif
-#ifdef	CONFIG_IPADDR
-	"ipaddr="	__stringify(CONFIG_IPADDR)	"\0"
+#ifdef	CFG_IPADDR
+	"ipaddr="	__stringify(CFG_IPADDR)	"\0"
 #endif
 #ifdef	CONFIG_SERVERIP
 	"serverip="	__stringify(CONFIG_SERVERIP)	"\0"
scripts/config_whitelist.txt +1 -1
index 48de265ee7e1..9e927d81200a 100644
@@ -65,7 +65,7 @@ CFG_I2C_MVTWSI_BASE1
 CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
-CONFIG_IPADDR
+CFG_IPADDR
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
Signature · 1 line
2.25.1
author
#111 lore raw

PATCH 64/241 global: Migrate CONFIG_IRAM_BASE to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +-
 include/configs/exynos7420-common.h          | 4 ++--
 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 +-
 scripts/config_whitelist.txt                 | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/include/asm/arch-rockchip/bootrom.h +1 -1
index 0da78f30b619..4276a0f6811a 100644
@@ -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/exynos7420-common.h +2 -2
index c8408eb39200..937a3c8820c1 100644
@@ -16,9 +16,9 @@
 /* select serial console configuration */
 
 /* IRAM Layout */
-#define CONFIG_IRAM_BASE		0x02100000
+#define CFG_IRAM_BASE		0x02100000
 #define CONFIG_IRAM_SIZE		0x58000
-#define CONFIG_IRAM_END			(CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CONFIG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
include/configs/px30_common.h +1 -1
index 003686930a4b..3f1595cdc95f 100644
@@ -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
index c4758e148ba7..1a6d3678df3e 100644
@@ -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
index 5b0ec3700040..8aa17bfbd364 100644
@@ -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
index 58f491c2f320..ac9195672fb7 100644
@@ -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
index b95268df87c2..fcaf9c52c4be 100644
@@ -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
index d3b8a5150f6b..5f29432be10b 100644
@@ -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
index bc03e113fef0..55a0dfecb21b 100644
@@ -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
index 85d2186f23e0..fadcb93a5f7e 100644
@@ -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
index 17636250510b..9aa256b59592 100644
@@ -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
index 43066933d02f..9512cfdcd2d5 100644
@@ -8,7 +8,7 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_IRAM_BASE		0xff8c0000
+#define CFG_IRAM_BASE		0xff8c0000
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
 #else
include/configs/rk3568_common.h +1 -1
index 750f16d03999..ae360105d508 100644
@@ -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
index 6e17b23b624c..63551b47e200 100644
@@ -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 */
scripts/config_whitelist.txt +1 -1
index 9e927d81200a..ccc719a3b985 100644
@@ -66,7 +66,7 @@ CFG_I2C_RTC_ADDR
 CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
-CONFIG_IRAM_BASE
+CFG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE
 CONFIG_IRAM_TOP
Signature · 1 line
2.25.1
author
#112 lore raw

PATCH 65/241 global: Migrate CONFIG_IRAM_END to CFG

In reply to Tom Rini
---
 include/configs/exynos7420-common.h | 2 +-
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/configs/exynos7420-common.h +1 -1
index 937a3c8820c1..44843aba3c30 100644
@@ -18,7 +18,7 @@
 /* IRAM Layout */
 #define CFG_IRAM_BASE		0x02100000
 #define CONFIG_IRAM_SIZE		0x58000
-#define CONFIG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CFG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
scripts/config_whitelist.txt +1 -1
index ccc719a3b985..ee3bb81bb47f 100644
@@ -67,7 +67,7 @@ CFG_ICS307_REFCLK_HZ
 CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
 CFG_IRAM_BASE
-CONFIG_IRAM_END
+CFG_IRAM_END
 CONFIG_IRAM_SIZE
 CONFIG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
Signature · 1 line
2.25.1
author
#113 lore raw

PATCH 66/241 global: Migrate CONFIG_IRAM_SIZE to CFG

In reply to Tom Rini
---
 include/configs/exynos7420-common.h | 4 ++--
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
include/configs/exynos7420-common.h +2 -2
index 44843aba3c30..0a522baed894 100644
@@ -17,8 +17,8 @@
 
 /* IRAM Layout */
 #define CFG_IRAM_BASE		0x02100000
-#define CONFIG_IRAM_SIZE		0x58000
-#define CFG_IRAM_END			(CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CFG_IRAM_SIZE		0x58000
+#define CFG_IRAM_END			(CFG_IRAM_BASE + CFG_IRAM_SIZE)
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 /* select serial console configuration */
scripts/config_whitelist.txt +1 -1
index ee3bb81bb47f..249ec5090b8a 100644
@@ -68,7 +68,7 @@ CFG_IMX6_PWM_PER_CLK
 CFG_IPADDR
 CFG_IRAM_BASE
 CFG_IRAM_END
-CONFIG_IRAM_SIZE
+CFG_IRAM_SIZE
 CONFIG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
Signature · 1 line
2.25.1
author
#114 lore raw

PATCH 67/241 global: Migrate CONFIG_IRAM_TOP to CFG

In reply to Tom Rini
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 arch/arm/mach-exynos/sec_boot.S      | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-exynos/lowlevel_init.c +1 -1
index 1ff5fcac1b38..9225d2cc1f2a 100644
@@ -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
index 40c07209e475..1303544d83b6 100644
@@ -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
index 7a9307ccc3db..d5f480de0ef7 100644
@@ -10,7 +10,7 @@
 
 #define CONFIG_VAR_SIZE_SPL
 
-#define CONFIG_IRAM_TOP			0x02074000
+#define CFG_IRAM_TOP			0x02074000
 
 #define CONFIG_PHY_IRAM_BASE		0x02020000
 
scripts/config_whitelist.txt +1 -1
index 249ec5090b8a..d2683e317bd6 100644
@@ -69,7 +69,7 @@ CFG_IPADDR
 CFG_IRAM_BASE
 CFG_IRAM_END
 CFG_IRAM_SIZE
-CONFIG_IRAM_TOP
+CFG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
Signature · 1 line
2.25.1
author
#115 lore raw

PATCH 68/241 global: Migrate CONFIG_KM_DEF_ARCH to CFG

In reply to Tom Rini
---
 include/configs/km/km-mpc83xx.h | 6 +++---
 include/configs/kmcent2.h       | 6 +++---
 scripts/config_whitelist.txt    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
include/configs/km/km-mpc83xx.h +3 -3
index 227c45f0634a..33655d144df1 100644
@@ -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
index d7d5bce15c59..870603d461af 100644
@@ -437,13 +437,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"					\
scripts/config_whitelist.txt +1 -1
index d2683e317bd6..12edc317773f 100644
@@ -70,7 +70,7 @@ CFG_IRAM_BASE
 CFG_IRAM_END
 CFG_IRAM_SIZE
 CFG_IRAM_TOP
-CONFIG_KM_DEF_ARCH
+CFG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
 CONFIG_KM_DEF_ENV_BOOTARGS
Signature · 1 line
2.25.1
author
#116 lore raw

PATCH 69/241 global: Migrate CONFIG_KM_DEF_BOOT_ARGS_CPU to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h  | 2 +-
 include/configs/km/km-powerpc.h      | 2 +-
 include/configs/km/pg-wcom-ls102xa.h | 4 ++--
 include/configs/kmcent2.h            | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
include/configs/km/keymile-common.h +1 -1
index cc5ec219b8db..94408e6efd9a 100644
@@ -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
index f6c21e1666d1..da0ee3f27e7e 100644
@@ -28,7 +28,7 @@
 #define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 /* architecture specific default bootargs */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 
 #define CONFIG_KM_DEF_ENV_CPU						\
 	"u-boot="CFG_HOSTNAME "/u-boot.bin\0"		\
include/configs/km/pg-wcom-ls102xa.h +2 -2
index e64cf24bd5e9..516fa76e3209 100644
@@ -179,8 +179,8 @@
 #define CONFIG_KM_DEF_ENV
 #endif
 
-#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU		""
+#ifndef CFG_KM_DEF_BOOT_ARGS_CPU
+#define CFG_KM_DEF_BOOT_ARGS_CPU		""
 #endif
 
 #define CONFIG_KM_DEF_ENV_CPU						\
include/configs/kmcent2.h +1 -1
index 870603d461af..3c49e174d9a0 100644
@@ -16,7 +16,7 @@
  * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot
  * parameters
  */
-#define CONFIG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
+#define CFG_KM_DEF_BOOT_ARGS_CPU	"fsl_dpaa_fman.fsl_fm_max_frm=1558"
 
 #include "km/keymile-common.h"
 
scripts/config_whitelist.txt +1 -1
index 12edc317773f..d203ede8c963 100644
@@ -71,7 +71,7 @@ CFG_IRAM_END
 CFG_IRAM_SIZE
 CFG_IRAM_TOP
 CFG_KM_DEF_ARCH
-CONFIG_KM_DEF_BOOT_ARGS_CPU
+CFG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
 CONFIG_KM_DEF_ENV_BOOTARGS
 CONFIG_KM_DEF_ENV_BOOTPARAMS
Signature · 1 line
2.25.1
author
#117 lore raw

PATCH 70/241 global: Migrate CONFIG_KM_DEF_ENV to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h    | 30 +++++++++++++-------------
 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 ++--
 scripts/config_whitelist.txt           | 14 ++++++------
 7 files changed, 36 insertions(+), 36 deletions(-)
include/configs/km/keymile-common.h +15 -15
index 94408e6efd9a..3d77b1770651 100644
@@ -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
 
@@ -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,7 +120,7 @@
  * 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"		\
@@ -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
index 33655d144df1..3192ca7742a7 100644
@@ -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
index da0ee3f27e7e..73a224f790e1 100644
@@ -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="CFG_HOSTNAME "/u-boot.bin\0"		\
 	"update="							\
 		"protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\
include/configs/km/pg-wcom-ls102xa.h +4 -4
index 516fa76e3209..974486fc4c32 100644
@@ -175,15 +175,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} "				\
@@ -224,7 +224,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
index 3c49e174d9a0..35ec79f7b7db 100644
@@ -390,13 +390,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} "				\
@@ -442,7 +442,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
index f12163ccc990..71aa5a7ca949 100644
@@ -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"	\
scripts/config_whitelist.txt +7 -7
index d203ede8c963..d5909de8762e 100644
@@ -72,13 +72,13 @@ CFG_IRAM_SIZE
 CFG_IRAM_TOP
 CFG_KM_DEF_ARCH
 CFG_KM_DEF_BOOT_ARGS_CPU
-CONFIG_KM_DEF_ENV
-CONFIG_KM_DEF_ENV_BOOTARGS
-CONFIG_KM_DEF_ENV_BOOTPARAMS
-CONFIG_KM_DEF_ENV_BOOTTARGETS
-CONFIG_KM_DEF_ENV_CONSTANTS
-CONFIG_KM_DEF_ENV_CPU
-CONFIG_KM_DEF_ENV_FLASH_BOOT
+CFG_KM_DEF_ENV
+CFG_KM_DEF_ENV_BOOTARGS
+CFG_KM_DEF_ENV_BOOTPARAMS
+CFG_KM_DEF_ENV_BOOTTARGETS
+CFG_KM_DEF_ENV_CONSTANTS
+CFG_KM_DEF_ENV_CPU
+CFG_KM_DEF_ENV_FLASH_BOOT
 CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
Signature · 1 line
2.25.1
author
#118 lore raw

PATCH 71/241 global: Migrate CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/km/keymile-common.h +3 -3
index 3d77b1770651..5e3baca75b23 100644
@@ -34,7 +34,7 @@
 # define CONFIG_KM_UBI_LINUX_MTD					\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
 #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
 /* two flash chips called boot and app */
@@ -44,7 +44,7 @@
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT			\
 	CONFIG_KM_UBI_PART_BOOT_OPTS " "				\
 	"ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
-# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI				\
+# define CFG_KM_DEV_ENV_FLASH_BOOT_UBI				\
 	"ubiattach=if test ${boot_bank} -eq 0; then; "			\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; "	\
 	"ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0"
@@ -125,7 +125,7 @@
 	"cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"	\
 	"ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"		\
 	"uimage=" CONFIG_KM_UIMAGE_NAME					\
-	CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+	CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 
 /*
  * constants
scripts/config_whitelist.txt +1 -1
index d5909de8762e..fb702a42bd6b 100644
@@ -79,7 +79,7 @@ CFG_KM_DEF_ENV_BOOTTARGETS
 CFG_KM_DEF_ENV_CONSTANTS
 CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
-CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
+CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CONFIG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
Signature · 1 line
2.25.1
author
#119 lore raw

PATCH 72/241 global: Migrate CONFIG_KM_ECC_MODE to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/km/keymile-common.h +3 -3
index 5e3baca75b23..1ae134c2ae3e 100644
@@ -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				\
scripts/config_whitelist.txt +1 -1
index fb702a42bd6b..11a501212b8c 100644
@@ -80,7 +80,7 @@ CFG_KM_DEF_ENV_CONSTANTS
 CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
-CONFIG_KM_ECC_MODE
+CFG_KM_ECC_MODE
 CONFIG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
Signature · 1 line
2.25.1
author
#120 lore raw

PATCH 73/241 global: Migrate CONFIG_KM_NEW_ENV to CFG

In reply to Tom Rini
---
 include/configs/km/pg-wcom-ls102xa.h   | 4 ++--
 include/configs/kmcent2.h              | 4 ++--
 include/configs/socfpga_arria5_secu1.h | 4 ++--
 scripts/config_whitelist.txt           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
include/configs/km/pg-wcom-ls102xa.h +2 -2
index 974486fc4c32..856d2e909200 100644
@@ -209,7 +209,7 @@
 	"checkfdt=true\0"						\
 	""
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -223,7 +223,7 @@
 			"asrc,spdif,lpuart1,ftm1\0"
 
 #define CFG_EXTRA_ENV_SETTINGS					\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_KM_DEF_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
include/configs/kmcent2.h +2 -2
index 35ec79f7b7db..97070bc77c45 100644
@@ -428,7 +428,7 @@ int get_scl(void);
 	"usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0"		\
 	"usb_dr_mode=host\0"
 
-#define CONFIG_KM_NEW_ENV						\
+#define CFG_KM_NEW_ENV						\
 	"newenv=protect off " __stringify(ENV_DEL_ADDR)			\
 		" +" __stringify(CFG_ENV_TOTAL_SIZE) " && "		\
 		"erase " __stringify(ENV_DEL_ADDR)			\
@@ -444,7 +444,7 @@ int get_scl(void);
 #define CFG_EXTRA_ENV_SETTINGS					\
 	CFG_KM_DEF_ENV						\
 	CFG_KM_DEF_ARCH						\
-	CONFIG_KM_NEW_ENV						\
+	CFG_KM_NEW_ENV						\
 	CFG_HW_ENV_SETTINGS						\
 	"EEprom_ivm=pca9547:70:9\0"					\
 	""
include/configs/socfpga_arria5_secu1.h +2 -2
index 71aa5a7ca949..6fb7a895995b 100644
@@ -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"	\
scripts/config_whitelist.txt +1 -1
index 11a501212b8c..471b3243f380 100644
@@ -81,7 +81,7 @@ CFG_KM_DEF_ENV_CPU
 CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
-CONFIG_KM_NEW_ENV
+CFG_KM_NEW_ENV
 CONFIG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
Signature · 1 line
2.25.1
author
#121 lore raw

PATCH 74/241 global: Migrate CONFIG_KM_UBI_LINUX_MTD to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/km/keymile-common.h +3 -3
index 1ae134c2ae3e..7e347e5b8f4f 100644
@@ -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="							\
scripts/config_whitelist.txt +1 -1
index 471b3243f380..19a4fc540336 100644
@@ -82,7 +82,7 @@ CFG_KM_DEF_ENV_FLASH_BOOT
 CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
 CFG_KM_NEW_ENV
-CONFIG_KM_UBI_LINUX_MTD
+CFG_KM_UBI_LINUX_MTD
 CONFIG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
 CONFIG_KM_UBI_PART_BOOT_OPTS
Signature · 1 line
2.25.1
author
#122 lore raw

PATCH 75/241 global: Migrate CONFIG_KM_UBI_PARTITION_NAME_APP to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 12 ++++++------
 include/configs/kmcoge5ne.h         |  2 +-
 include/configs/pg-wcom-expu1.h     |  2 +-
 include/configs/pg-wcom-seli8.h     |  2 +-
 scripts/config_whitelist.txt        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
include/configs/km/keymile-common.h +6 -6
index 7e347e5b8f4f..2e73d9d6d28f 100644
@@ -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
index 8681145c309f..9386daa19ccc 100644
@@ -13,7 +13,7 @@
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* include common defines/options for all Keymile boards */
 #include "km/keymile-common.h"
include/configs/pg-wcom-expu1.h +1 -1
index 5b5637762aca..f7a598b5f9cb 100644
@@ -10,7 +10,7 @@
 #define CFG_HOSTNAME				"EXPU1"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* CLIPS FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
include/configs/pg-wcom-seli8.h +1 -1
index a1c1ca993d7e..b7051e3749d0 100644
@@ -9,7 +9,7 @@
 #define CFG_HOSTNAME			"SELI8"
 
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT	"ubi0"
-#define CONFIG_KM_UBI_PARTITION_NAME_APP	"ubi1"
+#define CFG_KM_UBI_PARTITION_NAME_APP	"ubi1"
 
 /* PAXK FPGA Definitions */
 #define CFG_SYS_CSPR3_EXT	(0x00)
scripts/config_whitelist.txt +1 -1
index 19a4fc540336..a311539ab15c 100644
@@ -83,7 +83,7 @@ CFG_KM_DEV_ENV_FLASH_BOOT_UBI
 CFG_KM_ECC_MODE
 CFG_KM_NEW_ENV
 CFG_KM_UBI_LINUX_MTD
-CONFIG_KM_UBI_PARTITION_NAME_APP
+CFG_KM_UBI_PARTITION_NAME_APP
 CONFIG_KM_UBI_PARTITION_NAME_BOOT
 CONFIG_KM_UBI_PART_BOOT_OPTS
 CONFIG_KM_UIMAGE_NAME
Signature · 1 line
2.25.1
author
#123 lore raw

PATCH 77/241 global: Migrate CONFIG_KM_UBI_PART_BOOT_OPTS to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 10 +++++-----
 scripts/config_whitelist.txt        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
include/configs/km/keymile-common.h +5 -5
index 720711ac8dde..b33bf3615e4f 100644
@@ -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; "			\
scripts/config_whitelist.txt +1 -1
index e166916e8f40..e5eeb35bfec4 100644
@@ -85,7 +85,7 @@ CFG_KM_NEW_ENV
 CFG_KM_UBI_LINUX_MTD
 CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
-CONFIG_KM_UBI_PART_BOOT_OPTS
+CFG_KM_UBI_PART_BOOT_OPTS
 CONFIG_KM_UIMAGE_NAME
 CONFIG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
Signature · 1 line
2.25.1
author
#124 lore raw

PATCH 78/241 global: Migrate CONFIG_KM_UIMAGE_NAME to CFG

In reply to Tom Rini
---
 include/configs/km/keymile-common.h | 6 +++---
 scripts/config_whitelist.txt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
include/configs/km/keymile-common.h +3 -3
index b33bf3615e4f..ffcd44d5ef97 100644
@@ -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
 
 /*
scripts/config_whitelist.txt +1 -1
index e5eeb35bfec4..2b4db3778e20 100644
@@ -86,7 +86,7 @@ CFG_KM_UBI_LINUX_MTD
 CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
-CONFIG_KM_UIMAGE_NAME
+CFG_KM_UIMAGE_NAME
 CONFIG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
Signature · 1 line
2.25.1
author
#125 lore raw

PATCH 79/241 global: Migrate CONFIG_KSNET_CPSW_NUM_PORTS to CFG

In reply to Tom Rini
---
 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 +-
 scripts/config_whitelist.txt                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +1 -1
index 0852ce80a641..21cac6ea312a 100644
@@ -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
index bbc58be511e4..026568c4dfb3 100644
@@ -38,7 +38,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	9
+#define CFG_KSNET_CPSW_NUM_PORTS	9
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2E_EVM_H */
include/configs/k2g_evm.h +1 -1
index bb91751d5d90..feaa43ba7f71 100644
@@ -52,7 +52,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	2
+#define CFG_KSNET_CPSW_NUM_PORTS	2
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
include/configs/k2hk_evm.h +1 -1
index 68cbe98b553b..e35f080279ae 100644
@@ -38,6 +38,6 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_0
-#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
index a18158a7eb33..b60fc2a55de3 100644
@@ -38,7 +38,7 @@
 
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
-#define CONFIG_KSNET_CPSW_NUM_PORTS	5
+#define CFG_KSNET_CPSW_NUM_PORTS	5
 #define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2L_EVM_H */
scripts/config_whitelist.txt +1 -1
index 2b4db3778e20..ddcc89f508e1 100644
@@ -87,7 +87,7 @@ CFG_KM_UBI_PARTITION_NAME_APP
 CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
-CONFIG_KSNET_CPSW_NUM_PORTS
+CFG_KSNET_CPSW_NUM_PORTS
 CONFIG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
Signature · 1 line
2.25.1
author
#126 lore raw

PATCH 80/241 global: Migrate CONFIG_KSNET_MAC_ID_BASE to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/ti-common/keystone_net.h | 2 +-
 include/configs/ti_armv7_keystone2.h          | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +1 -1
index 21cac6ea312a..f191c909f41f 100644
@@ -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
index 479ab46e4edd..e46d635ca032 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index ddcc89f508e1..031e72702307 100644
@@ -88,7 +88,7 @@ CFG_KM_UBI_PARTITION_NAME_BOOT
 CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
-CONFIG_KSNET_MAC_ID_BASE
+CFG_KSNET_MAC_ID_BASE
 CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
Signature · 1 line
2.25.1
author
#127 lore raw

PATCH 81/241 global: Migrate CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE to CFG

In reply to Tom Rini
---
 include/configs/k2e_evm.h    | 2 +-
 include/configs/k2g_evm.h    | 2 +-
 include/configs/k2l_evm.h    | 2 +-
 scripts/config_whitelist.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
include/configs/k2e_evm.h +1 -1
index 026568c4dfb3..eabd06ff9b7a 100644
@@ -39,6 +39,6 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	9
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2E_EVM_H */
include/configs/k2g_evm.h +1 -1
index feaa43ba7f71..e3f4f5ed4743 100644
@@ -53,7 +53,7 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	2
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
 
 #define SPI_MTD_PARTS	KEYSTONE_SPI1_MTD_PARTS
include/configs/k2l_evm.h +1 -1
index b60fc2a55de3..aa9075cfd8ef 100644
@@ -39,6 +39,6 @@
 /* Network */
 #define CONFIG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	5
-#define CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+#define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
 #endif /* __CONFIG_K2L_EVM_H */
scripts/config_whitelist.txt +1 -1
index 031e72702307..70296e18643b 100644
@@ -89,7 +89,7 @@ CFG_KM_UBI_PART_BOOT_OPTS
 CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
-CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE
+CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CONFIG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
Signature · 1 line
2.25.1
author
#128 lore raw

PATCH 82/241 global: Migrate CONFIG_KSNET_NETCP_BASE to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 include/configs/ti_armv7_keystone2.h          | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +4 -4
index f191c909f41f..bedbcdc8bac6 100644
@@ -18,7 +18,7 @@
 /* EMAC */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00090000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x300)
 #define EMAC_SGMII_BASE_ADDR		(GBETH_BASE + 0x100)
@@ -32,7 +32,7 @@
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define GBETH_BASE			(CONFIG_KSNET_NETCP_BASE + 0x00200000)
+#define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP		0x020
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x22000)
 #define EMAC_MDIO_BASE_ADDR		(GBETH_BASE + 0x00f00)
@@ -190,14 +190,14 @@ struct mac_sl_cfg {
 /* PSS */
 #ifdef CONFIG_KSNET_NETCP_V1_0
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x604)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
 #define hw_config_streaming_switch()\
 	writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
 #elif defined CONFIG_KSNET_NETCP_V1_5
 
-#define DEVICE_PSTREAM_CFG_REG_ADDR	(CONFIG_KSNET_NETCP_BASE + 0x500)
+#define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x0
 
 #define hw_config_streaming_switch()\
include/configs/ti_armv7_keystone2.h +1 -1
index e46d635ca032..c21fabc36ed5 100644
@@ -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
scripts/config_whitelist.txt +1 -1
index 70296e18643b..7d609640e855 100644
@@ -90,7 +90,7 @@ CFG_KM_UIMAGE_NAME
 CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
-CONFIG_KSNET_NETCP_BASE
+CFG_KSNET_NETCP_BASE
 CONFIG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
Signature · 1 line
2.25.1
author
#129 lore raw

PATCH 83/241 global: Migrate CONFIG_KSNET_NETCP_V1_0 to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 drivers/net/ti/keystone_net.c                 | 2 +-
 include/configs/k2hk_evm.h                    | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +4 -4
index bedbcdc8bac6..1576a0473850 100644
@@ -16,7 +16,7 @@
 #endif
 
 /* EMAC */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00090000)
 #define EMAC_EMACSL_BASE_ADDR		(GBETH_BASE + 0x900)
@@ -120,7 +120,7 @@ struct mac_sl_cfg {
 #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
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_CPSW_BASE			(GBETH_BASE + 0x800)
 #define CPSW_REG_CTL				0x004
@@ -166,7 +166,7 @@ struct mac_sl_cfg {
 #define SGMII_LINK_MAC_FIBER			3
 #define SGMII_LINK_MAC_PHY_FORCED		4
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 #define SGMII_OFFSET(x)		((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100))
 #elif defined CONFIG_KSNET_NETCP_V1_5
 #define SGMII_OFFSET(x)		((x) * 0x100)
@@ -188,7 +188,7 @@ struct mac_sl_cfg {
 #define RGMII_STATUS_REG		(GBETH_BASE + 0x18)
 
 /* PSS */
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x604)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x06060606
drivers/net/ti/keystone_net.c +1 -1
index 1bdbd599d7b4..513c7b32521f 100644
@@ -58,7 +58,7 @@ enum link_type {
 			 ((mac)[2] << 16) | ((mac)[3] << 24))
 #define mac_lo(mac)     (((mac)[4] << 0) | ((mac)[5] << 8))
 
-#ifdef CONFIG_KSNET_NETCP_V1_0
+#ifdef CFG_KSNET_NETCP_V1_0
 
 #define EMAC_EMACSW_BASE_OFS		0x90800
 #define EMAC_EMACSW_PORT_BASE_OFS	(EMAC_EMACSW_BASE_OFS + 0x60)
include/configs/k2hk_evm.h +1 -1
index e35f080279ae..600e73f11e78 100644
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_0
+#define CFG_KSNET_NETCP_V1_0
 #define CFG_KSNET_CPSW_NUM_PORTS	5
 
 #endif /* __CONFIG_K2HK_EVM_H */
scripts/config_whitelist.txt +1 -1
index 7d609640e855..3861edb19315 100644
@@ -91,7 +91,7 @@ CFG_KSNET_CPSW_NUM_PORTS
 CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
-CONFIG_KSNET_NETCP_V1_0
+CFG_KSNET_NETCP_V1_0
 CONFIG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
Signature · 1 line
2.25.1
author
#130 lore raw

PATCH 84/241 global: Migrate CONFIG_KSNET_NETCP_V1_5 to CFG

In reply to Tom Rini
---
 arch/arm/include/asm/ti-common/keystone_net.h | 8 ++++----
 drivers/net/ti/keystone_net.c                 | 2 +-
 include/configs/k2e_evm.h                     | 2 +-
 include/configs/k2g_evm.h                     | 2 +-
 include/configs/k2l_evm.h                     | 2 +-
 scripts/config_whitelist.txt                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/include/asm/ti-common/keystone_net.h +4 -4
index 1576a0473850..3f3c580328bf 100644
@@ -30,7 +30,7 @@
 #define CPGMACSL_REG_RESET		0x0c
 #define CPGMACSL_REG_MAXLEN		0x10
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define GBETH_BASE			(CFG_KSNET_NETCP_BASE + 0x00200000)
 #define CPGMACSL_REG_RX_PRI_MAP		0x020
@@ -130,7 +130,7 @@ struct mac_sl_cfg {
 #define CPSW_REG_ALE_PORTCTL(x)			(0x640 + (x) * 4)
 #define CPSW_REG_VAL_STAT_ENABLE_ALL		0xf
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define DEVICE_CPSW_BASE			(GBETH_BASE + 0x20000)
 #define CPSW_REG_CTL				0x00004
@@ -168,7 +168,7 @@ struct mac_sl_cfg {
 
 #ifdef CFG_KSNET_NETCP_V1_0
 #define SGMII_OFFSET(x)		((x <= 1) ? (x * 0x100) : ((x * 0x100) + 0x100))
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 #define SGMII_OFFSET(x)		((x) * 0x100)
 #endif
 
@@ -195,7 +195,7 @@ struct mac_sl_cfg {
 #define hw_config_streaming_switch()\
 	writel(DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI, DEVICE_PSTREAM_CFG_REG_ADDR);
 
-#elif defined CONFIG_KSNET_NETCP_V1_5
+#elif defined CFG_KSNET_NETCP_V1_5
 
 #define DEVICE_PSTREAM_CFG_REG_ADDR	(CFG_KSNET_NETCP_BASE + 0x500)
 #define DEVICE_PSTREAM_CFG_VAL_ROUTE_CPPI	0x0
drivers/net/ti/keystone_net.c +1 -1
index 513c7b32521f..db942811db76 100644
@@ -70,7 +70,7 @@ enum link_type {
 #define DEVICE_EMACSW_BASE(base, x)	((base) + EMAC_EMACSW_PORT_BASE_OFS +  \
 					 (x) * 0x30)
 
-#elif defined(CONFIG_KSNET_NETCP_V1_5)
+#elif defined(CFG_KSNET_NETCP_V1_5)
 
 #define EMAC_EMACSW_PORT_BASE_OFS	0x222000
 
include/configs/k2e_evm.h +1 -1
index eabd06ff9b7a..024563b5dd68 100644
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	9
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
include/configs/k2g_evm.h +1 -1
index e3f4f5ed4743..a6022cba68ad 100644
@@ -51,7 +51,7 @@
 	"name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	2
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 #define PHY_ANEG_TIMEOUT	10000 /* PHY needs longer aneg time */
include/configs/k2l_evm.h +1 -1
index aa9075cfd8ef..5ebc108d098c 100644
@@ -37,7 +37,7 @@
 #define SPI_MTD_PARTS KEYSTONE_SPI0_MTD_PARTS
 
 /* Network */
-#define CONFIG_KSNET_NETCP_V1_5
+#define CFG_KSNET_NETCP_V1_5
 #define CFG_KSNET_CPSW_NUM_PORTS	5
 #define CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 
scripts/config_whitelist.txt +1 -1
index 3861edb19315..262995ea1f6a 100644
@@ -92,7 +92,7 @@ CFG_KSNET_MAC_ID_BASE
 CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
-CONFIG_KSNET_NETCP_V1_5
+CFG_KSNET_NETCP_V1_5
 CONFIG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
Signature · 1 line
2.25.1
author
#131 lore raw

PATCH 85/241 global: Migrate CONFIG_KSNET_SERDES_LANES_PER_SGMII to CFG

In reply to Tom Rini
---
 drivers/net/ti/keystone_net.c        | 4 ++--
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ti/keystone_net.c +2 -2
index db942811db76..5d344d73c3bc 100644
@@ -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
index c21fabc36ed5..cb4ea394eb8b 100644
@@ -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 */
 
scripts/config_whitelist.txt +1 -1
index 262995ea1f6a..980e6bc1d9b1 100644
@@ -93,7 +93,7 @@ CFG_KSNET_MDIO_PHY_CONFIG_ENABLE
 CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
-CONFIG_KSNET_SERDES_LANES_PER_SGMII
+CFG_KSNET_SERDES_LANES_PER_SGMII
 CONFIG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
Signature · 1 line
2.25.1
author
#132 lore raw

PATCH 86/241 global: Migrate CONFIG_KSNET_SERDES_SGMII2_BASE to CFG

In reply to Tom Rini
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ti/keystone_net.c +1 -1
index 5d344d73c3bc..306b862e20ff 100644
@@ -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
index cb4ea394eb8b..1429faa534e3 100644
@@ -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 */
scripts/config_whitelist.txt +1 -1
index 980e6bc1d9b1..7470e7e1d91f 100644
@@ -94,7 +94,7 @@ CFG_KSNET_NETCP_BASE
 CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
-CONFIG_KSNET_SERDES_SGMII2_BASE
+CFG_KSNET_SERDES_SGMII2_BASE
 CONFIG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
Signature · 1 line
2.25.1
author
#133 lore raw

PATCH 87/241 global: Migrate CONFIG_KSNET_SERDES_SGMII_BASE to CFG

In reply to Tom Rini
---
 drivers/net/ti/keystone_net.c        | 2 +-
 include/configs/ti_armv7_keystone2.h | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ti/keystone_net.c +1 -1
index 306b862e20ff..f85c057e1399 100644
@@ -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
index 1429faa534e3..7142d30a5994 100644
@@ -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
 
scripts/config_whitelist.txt +1 -1
index 7470e7e1d91f..bd22cbb231b8 100644
@@ -95,7 +95,7 @@ CFG_KSNET_NETCP_V1_0
 CFG_KSNET_NETCP_V1_5
 CFG_KSNET_SERDES_LANES_PER_SGMII
 CFG_KSNET_SERDES_SGMII2_BASE
-CONFIG_KSNET_SERDES_SGMII_BASE
+CFG_KSNET_SERDES_SGMII_BASE
 CONFIG_L1_INIT_RAM
 CONFIG_L2_CACHE
 CONFIG_LEGACY_BOOTCMD_ENV
Signature · 1 line
2.25.1