From: Masahiro Yamada Date: Thu, 12 Mar 2015 04:24:39 +0000 (+0900) Subject: kconfig: remove meaningless prefixes in defconfig files X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=252ed872;p=u-boot.git kconfig: remove meaningless prefixes in defconfig files Since commit e02ee2548afe (kconfig: switch to single .config configuration), the prefixes in defconfig files such as "+S:", "+ST:", etc., are meaningless. This commit was generated by the following command: find configs -name '*_defconfig' | xargs sed -i 's/^+*S*T*://' Signed-off-by: Masahiro Yamada --- diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 8fa1a330cd..48a0705558 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index b5f0a0f782..73b78949df 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -3,11 +3,11 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_USB1_VBUS_PIN="PB10" -+S:CONFIG_MMC0_CD_PIN="PG1" -+S:CONFIG_MMC1_CD_PIN="PG13" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PG1" +CONFIG_MMC1_CD_PIN="PG13" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index a04f2b3362..ab890c6c5e 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -10,9 +10,9 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_POWER="PB10" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 806d5b7bd5..b923d3e8ac 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -10,9 +10,9 @@ CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index ff94e77200..8c76360d3a 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index 5442f645f8..8d71d5f018 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 97a21ee534..377bd4692a 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -3,11 +3,11 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_ CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_VIDEO_VGA=y -+S:CONFIG_MMC0_CD_PIN="PH1" -+S:CONFIG_MMC3_CD_PIN="PH11" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_MMC3_CD_PIN="PH11" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig index f8ceb6cea6..af8aefaac3 100644 --- a/configs/Ampe_A76_defconfig +++ b/configs/Ampe_A76_defconfig @@ -8,9 +8,9 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:82,up:22,lo: CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig index 03ec3dbdc4..ee6d6f69ab 100644 --- a/configs/Auxtek-T004_defconfig +++ b/configs/Auxtek-T004_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb" CONFIG_USB1_VBUS_PIN="PG13" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/B4420QDS_NAND_defconfig b/configs/B4420QDS_NAND_defconfig index 5367e9bc62..b9467bb1cd 100644 --- a/configs/B4420QDS_NAND_defconfig +++ b/configs/B4420QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_B4860QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_B4860QDS=y diff --git a/configs/B4860QDS_NAND_defconfig b/configs/B4860QDS_NAND_defconfig index 05cf734101..c5e4d37b97 100644 --- a/configs/B4860QDS_NAND_defconfig +++ b/configs/B4860QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_B4860QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_B4860QDS=y diff --git a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig index 1adc2b8d11..bb63eeab32 100644 --- a/configs/BSC9131RDB_NAND_SYSCLK100_defconfig +++ b/configs/BSC9131RDB_NAND_SYSCLK100_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_BSC9131RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_BSC9131RDB=y diff --git a/configs/BSC9131RDB_NAND_defconfig b/configs/BSC9131RDB_NAND_defconfig index 502fa31475..3f536e692c 100644 --- a/configs/BSC9131RDB_NAND_defconfig +++ b/configs/BSC9131RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_BSC9131RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_BSC9131RDB=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig index 3c3b46e4df..14daffacbd 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK100_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK100_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_BSC9132QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_BSC9132QDS=y diff --git a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig index d2e7391003..2474172688 100644 --- a/configs/BSC9132QDS_NAND_DDRCLK133_defconfig +++ b/configs/BSC9132QDS_NAND_DDRCLK133_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_BSC9132QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_BSC9132QDS=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 5aba938276..bad6081fe4 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" CONFIG_FDTFILE="sun7i-a20-bananapi.dtb" CONFIG_GMAC_TX_DELAY=3 -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index e501b5c95c..2274c80b01 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -4,9 +4,9 @@ CONFIG_FDTFILE="sun7i-a20-bananapro.dtb" CONFIG_USB1_VBUS_PIN="PH0" CONFIG_USB2_VBUS_PIN="PH1" CONFIG_GMAC_TX_DELAY=3 -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig index c9325795b5..f4de2b3fae 100644 --- a/configs/C29XPCIE_NAND_defconfig +++ b/configs/C29XPCIE_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_C29XPCIE=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_C29XPCIE=y diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig index 4040beea69..ec84acb028 100644 --- a/configs/CSQ_CS908_defconfig +++ b/configs/CSQ_CS908_defconfig @@ -1,15 +1,15 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31s-cs908.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 # Ethernet phy power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 # Wifi power -+S:CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_AXP221_ALDO1_VOLT=3300 # No Vbus gpio for either usb -+S:CONFIG_USB1_VBUS_PIN="" -+S:CONFIG_USB2_VBUS_PIN="" +CONFIG_USB1_VBUS_PIN="" +CONFIG_USB2_VBUS_PIN="" diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index 1ef23e4f16..03f9361730 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -12,9 +12,9 @@ CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_SCLK="PA1" CONFIG_VIDEO_LCD_SPI_MOSI="PA2" CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index 33edcc4205..d6aad5e674 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -1,12 +1,12 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31-colombus.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=240 -+S:CONFIG_DRAM_ZQ=251 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=240 +CONFIG_DRAM_ZQ=251 # Wifi power -+S:CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_AXP221_ALDO1_VOLT=3300 # No Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="" +CONFIG_USB1_VBUS_PIN="" diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 7704a0ef81..05b11a0b40 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index 4efc6e147e..0b5c536e85 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index b64f84f2b8..5c23bc76cd 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" CONFIG_VIDEO_VGA=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig index 027546391f..7fd5a2a681 100644 --- a/configs/Hummingbird_A31_defconfig +++ b/configs/Hummingbird_A31_defconfig @@ -3,14 +3,14 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)" CONFIG_FDTFILE="sun6i-a31-hummingbird.dtb" CONFIG_VIDEO_VGA_VIA_LCD=y CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=312 -+S:CONFIG_DRAM_ZQ=251 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=312 +CONFIG_DRAM_ZQ=251 # Wifi power -+S:CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_AXP221_ALDO1_VOLT=3300 # Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="PH24" +CONFIG_USB1_VBUS_PIN="PH24" # No Vbus gpio for usb2 -+S:CONFIG_USB2_VBUS_PIN="" +CONFIG_USB2_VBUS_PIN="" diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig index 6b784e2408..b2bba11e60 100644 --- a/configs/Hyundai_A7HD_defconfig +++ b/configs/Hyundai_A7HD_defconfig @@ -16,9 +16,9 @@ CONFIG_VIDEO_LCD_BL_EN="PH9" CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW=n CONFIG_VIDEO_LCD_PANEL_LVDS=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Inet_86VS_defconfig b/configs/Inet_86VS_defconfig index 50c073a2e5..e5c103f319 100644 --- a/configs/Inet_86VS_defconfig +++ b/configs/Inet_86VS_defconfig @@ -8,9 +8,9 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:45,ri:209,up:22,lo CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig index 9b0d0dd144..0c88edd40c 100644 --- a/configs/Ippo_q8h_v1_2_defconfig +++ b/configs/Ippo_q8h_v1_2_defconfig @@ -9,13 +9,13 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0 CONFIG_VIDEO_LCD_POWER="PH7" CONFIG_VIDEO_LCD_BL_EN="PH6" CONFIG_VIDEO_LCD_BL_PWM="PH0" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN8I=y -+S:CONFIG_DRAM_CLK=432 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I=y +CONFIG_DRAM_CLK=432 # zq = 0xf74a -+S:CONFIG_DRAM_ZQ=63306 +CONFIG_DRAM_ZQ=63306 # Wifi power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 # aldo1 is connected to VCC-IO, VCC-PD, VCC-USB and VCC-HP -+S:CONFIG_AXP221_ALDO1_VOLT=3000 +CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig index 5bc90ce805..16ba03ba2a 100644 --- a/configs/Ippo_q8h_v5_defconfig +++ b/configs/Ippo_q8h_v5_defconfig @@ -9,13 +9,13 @@ CONFIG_VIDEO_LCD_DCLK_PHASE=0 CONFIG_VIDEO_LCD_POWER="PH7" CONFIG_VIDEO_LCD_BL_EN="PH6" CONFIG_VIDEO_LCD_BL_PWM="PH0" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN8I=y -+S:CONFIG_DRAM_CLK=480 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I=y +CONFIG_DRAM_CLK=480 # zq = 0xf777 -+S:CONFIG_DRAM_ZQ=63351 +CONFIG_DRAM_ZQ=63351 # Wifi power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 # aldo1 is connected to VCC-IO, VCC-PD, VCC-USB and VCC-HP -+S:CONFIG_AXP221_ALDO1_VOLT=3000 +CONFIG_AXP221_ALDO1_VOLT=3000 diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig index 4baba14bf0..15a883aa15 100644 --- a/configs/Linksprite_pcDuino3_Nano_defconfig +++ b/configs/Linksprite_pcDuino3_Nano_defconfig @@ -3,9 +3,9 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2 CONFIG_FDTFILE="sun7i-a20-pcduino3-nano.dtb" CONFIG_GMAC_TX_DELAY=3 CONFIG_USB1_VBUS_PIN="PH11" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=122 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=122 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index 45d88f3015..e6420695f5 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=122 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=122 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig index 1e749cded1..1504664dba 100644 --- a/configs/Linksprite_pcDuino3_fdt_defconfig +++ b/configs/Linksprite_pcDuino3_fdt_defconfig @@ -7,11 +7,11 @@ CONFIG_DM_SERIAL=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" CONFIG_OF_CONTROL=y CONFIG_OF_SEPARATE=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=480 -+S:CONFIG_DRAM_ZQ=122 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=480 +CONFIG_DRAM_ZQ=122 +CONFIG_DRAM_EMR1=4 CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig index 1ba37bb3fb..3bed6aa3a8 100644 --- a/configs/Linksprite_pcDuino_defconfig +++ b/configs/Linksprite_pcDuino_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-pcduino.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig index bf4e21759d..d50d7859a7 100644 --- a/configs/MK808C_defconfig +++ b/configs/MK808C_defconfig @@ -5,9 +5,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun7i-a20-mk808c.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/MPC8313ERDB_NAND_33_defconfig b/configs/MPC8313ERDB_NAND_33_defconfig index 3a55931b01..ba8188538a 100644 --- a/configs/MPC8313ERDB_NAND_33_defconfig +++ b/configs/MPC8313ERDB_NAND_33_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SYS_33MHZ,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC83xx=y -+S:CONFIG_TARGET_MPC8313ERDB=y +CONFIG_PPC=y +CONFIG_MPC83xx=y +CONFIG_TARGET_MPC8313ERDB=y diff --git a/configs/MPC8313ERDB_NAND_66_defconfig b/configs/MPC8313ERDB_NAND_66_defconfig index 180316ba20..afe874051e 100644 --- a/configs/MPC8313ERDB_NAND_66_defconfig +++ b/configs/MPC8313ERDB_NAND_66_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SYS_66MHZ,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC83xx=y -+S:CONFIG_TARGET_MPC8313ERDB=y +CONFIG_PPC=y +CONFIG_MPC83xx=y +CONFIG_TARGET_MPC8313ERDB=y diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig index c6fb7e65d0..5227b6f42a 100644 --- a/configs/MSI_Primo73_defconfig +++ b/configs/MSI_Primo73_defconfig @@ -15,9 +15,9 @@ CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_USB_KEYBOARD=n -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index 6657ad66c9..b6aa876cb6 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -21,10 +21,10 @@ CONFIG_VIDEO_LCD_SPI_MISO="PH12" CONFIG_VIDEO_LCD_BL_EN="PA25" CONFIG_VIDEO_LCD_BL_PWM="PH13" CONFIG_USB_KEYBOARD=n -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=122 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=122 # Wifi power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig index 653cb01b93..74ce12c2a3 100644 --- a/configs/Marsboard_A10_defconfig +++ b/configs/Marsboard_A10_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-marsboard.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index 1a0a025bd9..c30e18b5ba 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-a1000.dtb" CONFIG_VIDEO_VGA=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig index e2c63c597a..0e9a9500f2 100644 --- a/configs/Mele_I7_defconfig +++ b/configs/Mele_I7_defconfig @@ -7,20 +7,20 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31-i7.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=312 -+S:CONFIG_DRAM_ZQ=120 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=312 +CONFIG_DRAM_ZQ=120 # The Mele I7 uses 3.3V for general IO -+S:CONFIG_AXP221_DCDC1_VOLT=3300 +CONFIG_AXP221_DCDC1_VOLT=3300 # Ethernet phy power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 # USB hub power -+S:CONFIG_AXP221_DLDO4_VOLT=3300 +CONFIG_AXP221_DLDO4_VOLT=3300 # Wifi power -+S:CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_AXP221_ALDO1_VOLT=3300 # Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="PC27" +CONFIG_USB1_VBUS_PIN="PC27" # No Vbus gpio for usb2 -+S:CONFIG_USB2_VBUS_PIN="" +CONFIG_USB2_VBUS_PIN="" diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 723a72a2ef..a28e0a0a45 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -2,11 +2,11 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI" CONFIG_FDTFILE="sun7i-a20-m3.dtb" CONFIG_VIDEO_VGA=y -+S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+S:CONFIG_MMC0_CD_PIN="PH1" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index 2e1f80d509..14423182ae 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -2,12 +2,12 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234" CONFIG_FDTFILE="sun7i-a20-m5.dtb" CONFIG_VIDEO_HDMI=y -+S:CONFIG_MMC0_CD_PIN="PH1" -+S:CONFIG_USB1_VBUS_PIN="PH6" -+S:CONFIG_USB2_VBUS_PIN="PH3" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=122 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_USB1_VBUS_PIN="PH6" +CONFIG_USB2_VBUS_PIN="PH3" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=122 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index eaf9a7e349..f9d4ccc415 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,20 +1,20 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" CONFIG_FDTFILE="sun6i-a31-m9.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN6I=y -+S:CONFIG_DRAM_CLK=312 -+S:CONFIG_DRAM_ZQ=120 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN6I=y +CONFIG_DRAM_CLK=312 +CONFIG_DRAM_ZQ=120 # The Mele M9 uses 3.3V for general IO -+S:CONFIG_AXP221_DCDC1_VOLT=3300 +CONFIG_AXP221_DCDC1_VOLT=3300 # Ethernet phy power -+S:CONFIG_AXP221_DLDO1_VOLT=3300 +CONFIG_AXP221_DLDO1_VOLT=3300 # USB hub power -+S:CONFIG_AXP221_DLDO4_VOLT=3300 +CONFIG_AXP221_DLDO4_VOLT=3300 # Wifi power -+S:CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_AXP221_ALDO1_VOLT=3300 # Vbus gpio for usb1 -+S:CONFIG_USB1_VBUS_PIN="PC27" +CONFIG_USB1_VBUS_PIN="PC27" # No Vbus gpio for usb2 -+S:CONFIG_USB2_VBUS_PIN="" +CONFIG_USB2_VBUS_PIN="" diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index 6aea77716d..a4cd5c7208 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index ed049300a1..28fadcd3b9 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -5,9 +5,9 @@ CONFIG_GMAC_TX_DELAY=3 CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22" CONFIG_VIDEO_VGA=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index cbc9994eff..330679be2d 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -7,9 +7,9 @@ CONFIG_MMC3_CD_PIN="PH11" CONFIG_GMAC_TX_DELAY=3 CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig index b13024d0f8..6449b2d6b5 100644 --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig index 944d52fd7b..9a36f5c17c 100644 --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig index 7cb82ef137..b985fa5b1f 100644 --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig index fdf0777511..f19d5d242d 100644 --- a/configs/P1010RDB-PA_NAND_defconfig +++ b/configs/P1010RDB-PA_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig index 8d6ab188a7..a7888ca9f9 100644 --- a/configs/P1010RDB-PA_SDCARD_defconfig +++ b/configs/P1010RDB-PA_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig index 869b1a460e..2731a013bf 100644 --- a/configs/P1010RDB-PA_SPIFLASH_defconfig +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PA,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig index dd5277d8fd..a81424c5ef 100644 --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig index f1900fece9..eaa7da77b1 100644 --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig index 1b24dba2cc..39e35457ac 100644 --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig index 012516496f..1e11593ac6 100644 --- a/configs/P1010RDB-PB_NAND_defconfig +++ b/configs/P1010RDB-PB_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig index dcb0847a01..1d6a42110a 100644 --- a/configs/P1010RDB-PB_SDCARD_defconfig +++ b/configs/P1010RDB-PB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig index 23dc027a83..106b2bcd85 100644 --- a/configs/P1010RDB-PB_SPIFLASH_defconfig +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1010RDB_PB,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1010RDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1010RDB=y diff --git a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig index e2b625ea15..1036dc2473 100644 --- a/configs/P1020MBG-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020MBG-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD,36BIT" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020MBG-PC_SDCARD_defconfig b/configs/P1020MBG-PC_SDCARD_defconfig index d34d3c873b..1aac35b96d 100644 --- a/configs/P1020MBG-PC_SDCARD_defconfig +++ b/configs/P1020MBG-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020MBG,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig index c01de3a54a..86c05e965b 100644 --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig index 81593e1cd5..7d483d3eac 100644 --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig index 93c0c71ca6..44b38cbcf6 100644 --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig index 521398dec7..69a05a81f2 100644 --- a/configs/P1020RDB-PC_NAND_defconfig +++ b/configs/P1020RDB-PC_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig index 4e3ed602d1..5a72da1c60 100644 --- a/configs/P1020RDB-PC_SDCARD_defconfig +++ b/configs/P1020RDB-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig index d4642c4403..335e703f47 100644 --- a/configs/P1020RDB-PC_SPIFLASH_defconfig +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PC,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig index 199b3f202e..2ff990b096 100644 --- a/configs/P1020RDB-PD_NAND_defconfig +++ b/configs/P1020RDB-PD_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig index a5edd3bb83..fc7b89d9ea 100644 --- a/configs/P1020RDB-PD_SDCARD_defconfig +++ b/configs/P1020RDB-PD_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig index 789b1bd5f6..fb4269f70f 100644 --- a/configs/P1020RDB-PD_SPIFLASH_defconfig +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020RDB_PD,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig index 7f393f4e33..6a843442ee 100644 --- a/configs/P1020UTM-PC_36BIT_SDCARD_defconfig +++ b/configs/P1020UTM-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1020UTM-PC_SDCARD_defconfig b/configs/P1020UTM-PC_SDCARD_defconfig index 3757de38bb..c91a50c333 100644 --- a/configs/P1020UTM-PC_SDCARD_defconfig +++ b/configs/P1020UTM-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1020UTM,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_36BIT_NAND_defconfig b/configs/P1021RDB-PC_36BIT_NAND_defconfig index 285a0c4af0..ae764b6707 100644 --- a/configs/P1021RDB-PC_36BIT_NAND_defconfig +++ b/configs/P1021RDB-PC_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig index 0f9b175842..36216e92e8 100644 --- a/configs/P1021RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P1021RDB-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig index e2345dd4b9..bd600f0ab5 100644 --- a/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_NAND_defconfig b/configs/P1021RDB-PC_NAND_defconfig index da4b17db12..e4523de710 100644 --- a/configs/P1021RDB-PC_NAND_defconfig +++ b/configs/P1021RDB-PC_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_SDCARD_defconfig b/configs/P1021RDB-PC_SDCARD_defconfig index ec729d8de0..8a40f2921f 100644 --- a/configs/P1021RDB-PC_SDCARD_defconfig +++ b/configs/P1021RDB-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1021RDB-PC_SPIFLASH_defconfig b/configs/P1021RDB-PC_SPIFLASH_defconfig index 98a3e23923..1b1b3fcfad 100644 --- a/configs/P1021RDB-PC_SPIFLASH_defconfig +++ b/configs/P1021RDB-PC_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1021RDB,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig index d482617490..0c326cdac7 100644 --- a/configs/P1022DS_36BIT_NAND_defconfig +++ b/configs/P1022DS_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig index 3f2a46c90f..4990fc4a12 100644 --- a/configs/P1022DS_36BIT_SDCARD_defconfig +++ b/configs/P1022DS_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig index 47a39eec3f..4d7d7ac4e0 100644 --- a/configs/P1022DS_36BIT_SPIFLASH_defconfig +++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig index 071280b0a3..03b6e27da2 100644 --- a/configs/P1022DS_NAND_defconfig +++ b/configs/P1022DS_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig index 47f21eab2e..0b693b397a 100644 --- a/configs/P1022DS_SDCARD_defconfig +++ b/configs/P1022DS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig index a866f2467b..2fc5981b0b 100644 --- a/configs/P1022DS_SPIFLASH_defconfig +++ b/configs/P1022DS_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1022DS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1022DS=y diff --git a/configs/P1024RDB_NAND_defconfig b/configs/P1024RDB_NAND_defconfig index be4201462e..f0ba0dc201 100644 --- a/configs/P1024RDB_NAND_defconfig +++ b/configs/P1024RDB_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1024RDB_SDCARD_defconfig b/configs/P1024RDB_SDCARD_defconfig index 88504bf4b8..1c4968d6f0 100644 --- a/configs/P1024RDB_SDCARD_defconfig +++ b/configs/P1024RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1024RDB_SPIFLASH_defconfig b/configs/P1024RDB_SPIFLASH_defconfig index 5def94279f..744ddbe9bf 100644 --- a/configs/P1024RDB_SPIFLASH_defconfig +++ b/configs/P1024RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1024RDB,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1025RDB_NAND_defconfig b/configs/P1025RDB_NAND_defconfig index f07388a536..266ca17ebd 100644 --- a/configs/P1025RDB_NAND_defconfig +++ b/configs/P1025RDB_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1025RDB_SDCARD_defconfig b/configs/P1025RDB_SDCARD_defconfig index 1791ec420f..0563bbd45e 100644 --- a/configs/P1025RDB_SDCARD_defconfig +++ b/configs/P1025RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P1025RDB_SPIFLASH_defconfig b/configs/P1025RDB_SPIFLASH_defconfig index 774bbfe225..765db63e01 100644 --- a/configs/P1025RDB_SPIFLASH_defconfig +++ b/configs/P1025RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P1025RDB,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig index cdfe13db1c..8a8f60ca87 100644 --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig index a98ce43297..623762128c 100644 --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig index 14e53ba014..8b1ffa1f74 100644 --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,36BIT,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig index 10b208a48b..b97bde0de3 100644 --- a/configs/P2020RDB-PC_NAND_defconfig +++ b/configs/P2020RDB-PC_NAND_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_TPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,NAND" -+ST:CONFIG_PPC=y -+ST:CONFIG_MPC85xx=y -+ST:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig index 6cb0e6e350..00ce2fcf78 100644 --- a/configs/P2020RDB-PC_SDCARD_defconfig +++ b/configs/P2020RDB-PC_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig index 769eb37ebb..936fac204c 100644 --- a/configs/P2020RDB-PC_SPIFLASH_defconfig +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="P2020RDB,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_P1_P2_RDB_PC=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_P1_P2_RDB_PC=y diff --git a/configs/T1024QDS_NAND_defconfig b/configs/T1024QDS_NAND_defconfig index acbbe43ac9..e42913dcd9 100644 --- a/configs/T1024QDS_NAND_defconfig +++ b/configs/T1024QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XQDS=y diff --git a/configs/T1024QDS_SDCARD_defconfig b/configs/T1024QDS_SDCARD_defconfig index 82c6e194f5..52e98c06a7 100644 --- a/configs/T1024QDS_SDCARD_defconfig +++ b/configs/T1024QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XQDS=y diff --git a/configs/T1024QDS_SPIFLASH_defconfig b/configs/T1024QDS_SPIFLASH_defconfig index 52aeac79b0..165688355a 100644 --- a/configs/T1024QDS_SPIFLASH_defconfig +++ b/configs/T1024QDS_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XQDS=y diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig index 73d14ab6b2..efbd5402d3 100644 --- a/configs/T1024RDB_NAND_defconfig +++ b/configs/T1024RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XRDB=y diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig index 3599f1dae9..65ae8d7cdd 100644 --- a/configs/T1024RDB_SDCARD_defconfig +++ b/configs/T1024RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XRDB=y diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig index c8ea98544a..0b995730e6 100644 --- a/configs/T1024RDB_SPIFLASH_defconfig +++ b/configs/T1024RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1024,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T102XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T102XRDB=y diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index 5fe34d8a3f..fb87031e84 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig index 08c3730718..feb659cb5e 100644 --- a/configs/T1040RDB_SDCARD_defconfig +++ b/configs/T1040RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig index 1a6170391c..699b57e2e1 100644 --- a/configs/T1040RDB_SPIFLASH_defconfig +++ b/configs/T1040RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042RDB_PI_NAND_defconfig b/configs/T1042RDB_PI_NAND_defconfig index d1a1665b7c..2dd6fdaca2 100644 --- a/configs/T1042RDB_PI_NAND_defconfig +++ b/configs/T1042RDB_PI_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042RDB_PI_SDCARD_defconfig b/configs/T1042RDB_PI_SDCARD_defconfig index 2bf123dd30..0e33e35cd1 100644 --- a/configs/T1042RDB_PI_SDCARD_defconfig +++ b/configs/T1042RDB_PI_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig index 30d6d2dc88..776fc9ab87 100644 --- a/configs/T1042RDB_PI_SPIFLASH_defconfig +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T104XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig index b75195a314..0129238dd8 100644 --- a/configs/T2080QDS_NAND_defconfig +++ b/configs/T2080QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig index 6ed65dd53c..035a60daf3 100644 --- a/configs/T2080QDS_SDCARD_defconfig +++ b/configs/T2080QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index a3b58d3bce..a831b16fb8 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig index 7c48f8f8ac..b778f61e8b 100644 --- a/configs/T2080RDB_NAND_defconfig +++ b/configs/T2080RDB_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XRDB=y diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig index 31ca9a7387..44fee2257b 100644 --- a/configs/T2080RDB_SDCARD_defconfig +++ b/configs/T2080RDB_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XRDB=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index bdddeae291..05cdc7ce34 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XRDB=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XRDB=y diff --git a/configs/T2081QDS_NAND_defconfig b/configs/T2081QDS_NAND_defconfig index d3558c5668..a3d4c53b5a 100644 --- a/configs/T2081QDS_NAND_defconfig +++ b/configs/T2081QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T2081QDS_SDCARD_defconfig b/configs/T2081QDS_SDCARD_defconfig index fc13d2caa5..ebf3c0091a 100644 --- a/configs/T2081QDS_SDCARD_defconfig +++ b/configs/T2081QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig index e5ea3dce1b..ff358e32af 100644 --- a/configs/T2081QDS_SPIFLASH_defconfig +++ b/configs/T2081QDS_SPIFLASH_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T208XQDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T208XQDS=y diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig index 0a18424157..8d1659e9e4 100644 --- a/configs/T4160QDS_NAND_defconfig +++ b/configs/T4160QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T4240QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T4240QDS=y diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig index de1b2c4669..bf66469433 100644 --- a/configs/T4160QDS_SDCARD_defconfig +++ b/configs/T4160QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T4240QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T4240QDS=y diff --git a/configs/T4240QDS_NAND_defconfig b/configs/T4240QDS_NAND_defconfig index 65978ebe89..3070082852 100644 --- a/configs/T4240QDS_NAND_defconfig +++ b/configs/T4240QDS_NAND_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T4240QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T4240QDS=y diff --git a/configs/T4240QDS_SDCARD_defconfig b/configs/T4240QDS_SDCARD_defconfig index 4db1b80a68..3ecd4a0298 100644 --- a/configs/T4240QDS_SDCARD_defconfig +++ b/configs/T4240QDS_SDCARD_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD" -+S:CONFIG_PPC=y -+S:CONFIG_MPC85xx=y -+S:CONFIG_TARGET_T4240QDS=y +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T4240QDS=y diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig index c22286abe9..4ff4542f54 100644 --- a/configs/TZX-Q8-713B7_defconfig +++ b/configs/TZX-Q8-713B7_defconfig @@ -8,9 +8,9 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,up:31,lo: CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=408 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig index 919a4674d1..19ccd700d1 100644 --- a/configs/UTOO_P66_defconfig +++ b/configs/UTOO_P66_defconfig @@ -11,11 +11,11 @@ CONFIG_VIDEO_LCD_RESET="PG11" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_TL059WV5C0=y -+S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+S:CONFIG_MMC0_CD_PIN="PG0" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_MMC0_CD_PIN="PG0" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig index 6c15dc8449..3f9318fbe2 100644 --- a/configs/Wexler_TAB7200_defconfig +++ b/configs/Wexler_TAB7200_defconfig @@ -5,9 +5,9 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:210,up:22,lo CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig index de42b3ce95..9147ead6b4 100644 --- a/configs/Wits_Pro_A20_DKT_defconfig +++ b/configs/Wits_Pro_A20_DKT_defconfig @@ -7,9 +7,9 @@ CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_VGA=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig index 16218c0519..7971c06328 100644 --- a/configs/a3m071_defconfig +++ b/configs/a3m071_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_PPC=y -+S:CONFIG_MPC5xxx=y -+S:CONFIG_TARGET_A3M071=y +CONFIG_PPC=y +CONFIG_MPC5xxx=y +CONFIG_TARGET_A3M071=y diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig index 15f04f9540..0410814533 100644 --- a/configs/a4m2k_defconfig +++ b/configs/a4m2k_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="A4M2K" -+S:CONFIG_PPC=y -+S:CONFIG_MPC5xxx=y -+S:CONFIG_TARGET_A3M071=y +CONFIG_PPC=y +CONFIG_MPC5xxx=y +CONFIG_TARGET_A3M071=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index f5b807b059..e0b058b50e 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -2,5 +2,5 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index db27c3e70b..0e39c7dd1a 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -2,8 +2,8 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" CONFIG_FIT=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index b2f332ea76..968d0418eb 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -3,5 +3,5 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_CONS_INDEX=1 -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index ed72af6d33..4826057e68 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -3,6 +3,6 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_CONS_INDEX=1 -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y CONFIG_NOR=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 097dd47320..7a8415a5d0 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -3,5 +3,5 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" CONFIG_CONS_INDEX=1 -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 773042a393..4c8418a674 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -3,5 +3,5 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="NAND,SPL_USBETH_SUPPORT" CONFIG_CONS_INDEX=1 -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index 7634d03d3b..8d38e262da 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM335X_IGEP0033=y +CONFIG_ARM=y +CONFIG_TARGET_AM335X_IGEP0033=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 33b63c7e0e..72cc2d75f0 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_AM3517_CRANE=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_AM3517_CRANE=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 7558b89e49..6d6b0d2a8a 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_AM3517_EVM=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_AM3517_EVM=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 369f2a4c77..14bda6930c 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_AM43XX_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_AM43XX_EVM=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index fc5e1e4d38..3d9ae9699c 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA30=y -+S:CONFIG_TARGET_APALIS_T30=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA30=y +CONFIG_TARGET_APALIS_T30=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis" diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 67effa1642..b81fbff33a 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_APF27=y +CONFIG_ARM=y +CONFIG_TARGET_APF27=y diff --git a/configs/apx4devkit_defconfig b/configs/apx4devkit_defconfig index a47d6301c2..3bb8c48468 100644 --- a/configs/apx4devkit_defconfig +++ b/configs/apx4devkit_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_APX4DEVKIT=y +CONFIG_ARM=y +CONFIG_TARGET_APX4DEVKIT=y diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index fc30508170..4aa14af057 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_ARNDALE=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_ARNDALE=y CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale" diff --git a/configs/axm_defconfig b/configs/axm_defconfig index abb64b6def..f78434e705 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_TAURUS=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_TAURUS=y diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index 400906d377..503cd87625 100644 --- a/configs/ba10_tv_box_defconfig +++ b/configs/ba10_tv_box_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb" CONFIG_USB2_VBUS_PIN="PH12" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig index 872ab63bdd..5bb8433da1 100644 --- a/configs/beagle_x15_defconfig +++ b/configs/beagle_x15_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_BEAGLE_X15=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_BEAGLE_X15=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index ab615a83d7..097bf22d5f 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA30=y -+S:CONFIG_TARGET_BEAVER=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA30=y +CONFIG_TARGET_BEAVER=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index b8c8352f38..bc873bed4b 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_BG0900=y +CONFIG_ARM=y +CONFIG_TARGET_BG0900=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 8546fd886d..60df411cbd 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_BAV335X=y -+S:CONFIG_BAV_VERSION=1 +CONFIG_ARM=y +CONFIG_TARGET_BAV335X=y +CONFIG_BAV_VERSION=1 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index c3f2ecc186..ed3f6fa13c 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_BAV335X=y -+S:CONFIG_BAV_VERSION=2 +CONFIG_ARM=y +CONFIG_TARGET_BAV335X=y +CONFIG_BAV_VERSION=2 diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index ae1dda2eb5..753d2a5300 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_CAIRO=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_CAIRO=y diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig index dfdda82f0a..bf6b7f1cc8 100644 --- a/configs/cam_enc_4xx_defconfig +++ b/configs/cam_enc_4xx_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_DAVINCI=y -+S:CONFIG_TARGET_CAM_ENC_4XX=y +CONFIG_ARM=y +CONFIG_ARCH_DAVINCI=y +CONFIG_TARGET_CAM_ENC_4XX=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 4466e98ac8..1a9c12e1d1 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA30=y -+S:CONFIG_TARGET_CARDHU=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA30=y +CONFIG_TARGET_CARDHU=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 631698c95d..2fd21cf6d7 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_CM_FX6=y +CONFIG_ARM=y +CONFIG_TARGET_CM_FX6=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 5c1d3cf3a5..086e526871 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_CM_T335=y +CONFIG_ARM=y +CONFIG_TARGET_CM_T335=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 6eb37c0695..5c40b900c7 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=n -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_CM_T3517=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_CM_T3517=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 84a6fb0efa..4a99263d9b 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_CM_T35=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_CM_T35=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index 32efaa233a..dda8abd199 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_CM_T54=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_CM_T54=y diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig index b76f78bba5..a14d55a08b 100644 --- a/configs/colibri_t20_iris_defconfig +++ b/configs/colibri_t20_iris_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_COLIBRI_T20_IRIS=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_COLIBRI_T20_IRIS=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris" diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index b955303070..4e4114373a 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA30=y -+S:CONFIG_TARGET_COLIBRI_T30=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA30=y +CONFIG_TARGET_COLIBRI_T30=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 82be323a79..266a2ab498 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_CORVUS=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_CORVUS=y diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index a79a0a8c42..57c1494d8d 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_DAVINCI=y -+S:CONFIG_TARGET_DA850EVM=y +CONFIG_ARM=y +CONFIG_ARCH_DAVINCI=y +CONFIG_TARGET_DA850EVM=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index afdce5ed25..5891d15c0b 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_DAVINCI=y -+S:CONFIG_TARGET_DA850EVM=y +CONFIG_ARM=y +CONFIG_ARCH_DAVINCI=y +CONFIG_TARGET_DA850EVM=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index f704c75afa..1beff84fc0 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA114=y -+S:CONFIG_TARGET_DALMORE=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA114=y +CONFIG_TARGET_DALMORE=y CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index a7f13e2132..8bdad0f894 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_DB_MV784MP_GP=y +CONFIG_ARM=y +CONFIG_TARGET_DB_MV784MP_GP=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 05a8700759..97564617c2 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_DEVKIT8000=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_DEVKIT8000=y CONFIG_DM=y CONFIG_DM_SERIAL=y CONFIG_DM_GPIO=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 297c6b5879..20a1fadd5b 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_DRA7XX_EVM=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 92417f267b..7d1ea9eefc 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_DRA7XX_EVM=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 3551317a14..2d2dcbae75 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_DRA7XX_EVM=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_DRA7XX_EVM=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 18def0b503..fba7bf1288 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_DRACO=y +CONFIG_ARM=y +CONFIG_TARGET_DRACO=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index 85918458e4..c0bf27d9bb 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP44XX=y -+S:CONFIG_TARGET_DUOVERO=y +CONFIG_ARM=y +CONFIG_OMAP44XX=y +CONFIG_TARGET_DUOVERO=y diff --git a/configs/dxr2_defconfig b/configs/dxr2_defconfig index 15f11810f2..e0f577fa12 100644 --- a/configs/dxr2_defconfig +++ b/configs/dxr2_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_DXR2=y +CONFIG_ARM=y +CONFIG_TARGET_DXR2=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index e07df8bbd4..fbe6335a88 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_ECO5PK=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_ECO5PK=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 20c1c65e1f..2a74f7624d 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ORION5X=y -+S:CONFIG_TARGET_EDMINIV2=y +CONFIG_ARM=y +CONFIG_ORION5X=y +CONFIG_TARGET_EDMINIV2=y diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig index d56e3c5f5e..8151eacb9b 100644 --- a/configs/forfun_q88db_defconfig +++ b/configs/forfun_q88db_defconfig @@ -8,10 +8,10 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,up:31,lo: CONFIG_VIDEO_LCD_POWER="AXP0-0" CONFIG_VIDEO_LCD_BL_EN="AXP0-1" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5b1a4c4e58..6eab019c1e 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_GW_VENTANA=y +CONFIG_ARM=y +CONFIG_TARGET_GW_VENTANA=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index d99b42955a..b2c0afc20d 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_HARMONY=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_HARMONY=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony" diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index 41192fc73f..157997f001 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=127 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=127 +CONFIG_DRAM_EMR1=4 diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index dd56ea18c3..2bf24a87d1 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig index da54da02ab..c199e58c8e 100644 --- a/configs/igep0020_nand_defconfig +++ b/configs/igep0020_nand_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 1025feddba..096b662c43 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index b3b3366c9b..40c0a552d2 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index faa04f7ecd..2f250d2bb3 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_IGEP00X0=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_IGEP00X0=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 4fefcbee76..b42524e0a9 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_DAVINCI=y -+S:CONFIG_TARGET_IPAM390=y +CONFIG_ARM=y +CONFIG_ARCH_DAVINCI=y +CONFIG_TARGET_IPAM390=y diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig index 7c3feb8ddf..8c9801918f 100644 --- a/configs/jesurun_q5_defconfig +++ b/configs/jesurun_q5_defconfig @@ -12,9 +12,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)" CONFIG_FDTFILE="sun4i-a10-jesurun-q5.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=312 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=312 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index ef1d41c20b..168b9196ca 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA124=y -+S:CONFIG_TARGET_JETSON_TK1=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA124=y +CONFIG_TARGET_JETSON_TK1=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 9e702198be..8379b7bc75 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_KEYSTONE=y -+S:CONFIG_TARGET_K2E_EVM=y +CONFIG_ARM=y +CONFIG_ARCH_KEYSTONE=y +CONFIG_TARGET_K2E_EVM=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index e04e3151b6..764ed5b18e 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_KEYSTONE=y -+S:CONFIG_TARGET_K2HK_EVM=y +CONFIG_ARM=y +CONFIG_ARCH_KEYSTONE=y +CONFIG_TARGET_K2HK_EVM=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 45399cea6b..efb2c7e2bc 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_KEYSTONE=y -+S:CONFIG_TARGET_K2L_EVM=y +CONFIG_ARM=y +CONFIG_ARCH_KEYSTONE=y +CONFIG_TARGET_K2L_EVM=y diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig index 106a24f199..b857a4b91a 100644 --- a/configs/kwb_defconfig +++ b/configs/kwb_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_KWB=y +CONFIG_ARM=y +CONFIG_TARGET_KWB=y # CONFIG_CMD_CRC32 is not set diff --git a/configs/lcd4_lwmon5_defconfig b/configs/lcd4_lwmon5_defconfig index 1541733528..f11a3767b0 100644 --- a/configs/lcd4_lwmon5_defconfig +++ b/configs/lcd4_lwmon5_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="LCD4_LWMON5" -+S:CONFIG_PPC=y -+S:CONFIG_4xx=y -+S:CONFIG_TARGET_LWMON5=y +CONFIG_PPC=y +CONFIG_4xx=y +CONFIG_TARGET_LWMON5=y diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig index dad5274ae8..3cd33fa452 100644 --- a/configs/ls1021aqds_nand_defconfig +++ b/configs/ls1021aqds_nand_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021AQDS=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index 29335ee10c..a59f59e655 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -1,3 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021AQDS=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index 05ec8e6502..91c1125617 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -1,3 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021AQDS=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021aqds_sdcard_defconfig b/configs/ls1021aqds_sdcard_defconfig index e03c3b467d..910aa6703b 100644 --- a/configs/ls1021aqds_sdcard_defconfig +++ b/configs/ls1021aqds_sdcard_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021AQDS=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig index bdab6d9985..7c800410d7 100644 --- a/configs/ls1021atwr_nor_lpuart_defconfig +++ b/configs/ls1021atwr_nor_lpuart_defconfig @@ -1,3 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="LPUART" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021ATWR=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig index 611f6e846a..c9715a4a27 100644 --- a/configs/ls1021atwr_qspi_defconfig +++ b/configs/ls1021atwr_qspi_defconfig @@ -1,3 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021ATWR=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/configs/ls1021atwr_sdcard_defconfig b/configs/ls1021atwr_sdcard_defconfig index 0eb556ad4c..3390eac172 100644 --- a/configs/ls1021atwr_sdcard_defconfig +++ b/configs/ls1021atwr_sdcard_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_LS1021ATWR=y +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index e7af81714c..d902434f2e 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_M28EVK=y +CONFIG_ARM=y +CONFIG_TARGET_M28EVK=y diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index 65a647044a..1d7933bb8b 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/denx/m53evk/imximage.cfg" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_M53EVK=y +CONFIG_ARM=y +CONFIG_TARGET_M53EVK=y diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 219586a27d..17f1abb476 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MAXBCM=y +CONFIG_ARM=y +CONFIG_TARGET_MAXBCM=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 6566d40c19..2f6185879b 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_MCX=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_MCX=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index 35963e9302..1be16d8387 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_MEDCOM_WIDE=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_MEDCOM_WIDE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide" diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 5cfd596761..4211d711b7 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y -+S:CONFIG_MICROBLAZE=y -+S:CONFIG_TARGET_MICROBLAZE_GENERIC=y +CONFIG_MICROBLAZE=y +CONFIG_TARGET_MICROBLAZE_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig index cafcbaa62e..701b92b808 100644 --- a/configs/mk802_a10s_defconfig +++ b/configs/mk802_a10s_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" CONFIG_FDTFILE="sun5i-a10s-mk802.dtb" CONFIG_USB1_VBUS_PIN="PB10" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig index d6b51a5269..0fe6edba39 100644 --- a/configs/mk802_defconfig +++ b/configs/mk802_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" CONFIG_FDTFILE="sun4i-a10-mk802.dtb" CONFIG_USB2_VBUS_PIN="PH12" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig index 500f4df4b9..073d5195d7 100644 --- a/configs/mk802ii_defconfig +++ b/configs/mk802ii_defconfig @@ -1,9 +1,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-mk802ii.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=360 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=0 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=360 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=0 diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index a4747c6256..5b1da8c30d 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_MT_VENTOUX=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_MT_VENTOUX=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 03d5066255..5bb4eb69bc 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX23_OLINUXINO=y +CONFIG_ARM=y +CONFIG_TARGET_MX23_OLINUXINO=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index 963cec365c..a2d289180a 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX23EVK=y +CONFIG_ARM=y +CONFIG_TARGET_MX23EVK=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 7986880173..296a3ae9dc 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX28EVK=y +CONFIG_ARM=y +CONFIG_TARGET_MX28EVK=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index e006209d7a..3714ff0fc8 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX28EVK=y +CONFIG_ARM=y +CONFIG_TARGET_MX28EVK=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index ab42316b36..0339b86aa6 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_NAND" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX28EVK=y +CONFIG_ARM=y +CONFIG_TARGET_MX28EVK=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index df992fac31..140fb081d3 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX28EVK=y +CONFIG_ARM=y +CONFIG_TARGET_MX28EVK=y diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig index 26cd87e384..2d39920ac6 100644 --- a/configs/mx31pdk_defconfig +++ b/configs/mx31pdk_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX31PDK=y +CONFIG_ARM=y +CONFIG_TARGET_MX31PDK=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 67079ba0cf..16a947e843 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX6SABRESD=y +CONFIG_ARM=y +CONFIG_TARGET_MX6SABRESD=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index 901b01bf98..de3d98fc89 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_MX6SXSABRESD=y +CONFIG_ARM=y +CONFIG_TARGET_MX6SXSABRESD=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index b8fd97fd3f..ba120753f0 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_KOSAGI_NOVENA=y +CONFIG_ARM=y +CONFIG_TARGET_KOSAGI_NOVENA=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index ec79b5b5f0..0d2ed51895 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA124=y -+S:CONFIG_TARGET_NYAN_BIG=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA124=y +CONFIG_TARGET_NYAN_BIG=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big" diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 5a2d20b0df..51068210d6 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="NAND" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_BEAGLE=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 3bb191135e..fb4a80092a 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_EVM=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_EVM=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig index 4e1471bac8..d4594cb2c0 100644 --- a/configs/omap3_evm_quick_mmc_defconfig +++ b/configs/omap3_evm_quick_mmc_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig index f98672f862..1a78a6e491 100644 --- a/configs/omap3_evm_quick_nand_defconfig +++ b/configs/omap3_evm_quick_nand_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index 1a8b1b4e9e..344eca5db8 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_TAO3530=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_TAO3530=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 7e0d334289..ff49de9d71 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_OMAP3_OVERO=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_OMAP3_OVERO=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 6afac386c2..acc82d8c92 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP44XX=y -+S:CONFIG_TARGET_OMAP4_PANDA=y +CONFIG_ARM=y +CONFIG_OMAP44XX=y +CONFIG_TARGET_OMAP4_PANDA=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index c771e76026..bfa928f7df 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP44XX=y -+S:CONFIG_TARGET_OMAP4_SDP4430=y +CONFIG_ARM=y +CONFIG_OMAP44XX=y +CONFIG_TARGET_OMAP4_SDP4430=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 86d5c1662e..5ab4682297 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP54XX=y -+S:CONFIG_TARGET_OMAP5_UEVM=y +CONFIG_ARM=y +CONFIG_OMAP54XX=y +CONFIG_TARGET_OMAP5_UEVM=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 2a7f83bf89..aaef37f225 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_ORIGEN=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_ORIGEN=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen" diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index ad57f88c9d..d99b03723d 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_OT1200=y +CONFIG_ARM=y +CONFIG_TARGET_OT1200=y diff --git a/configs/palmtreo680_defconfig b/configs/palmtreo680_defconfig index 84c4c16179..998f89b7f8 100644 --- a/configs/palmtreo680_defconfig +++ b/configs/palmtreo680_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PALMTREO680=y +CONFIG_ARM=y +CONFIG_TARGET_PALMTREO680=y diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index d2d36a5848..e18017b00d 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_PAZ00=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_PAZ00=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00" diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index baa2b231b0..f417aacb48 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV1" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PCM051=y +CONFIG_ARM=y +CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index b5c62a6a3b..cc6f3f5418 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV3" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PCM051=y +CONFIG_ARM=y +CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 333e335a26..1869a411d1 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_PEACH_PI=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_PEACH_PI=y CONFIG_DEFAULT_DEVICE_TREE="exynos5800-peach-pi" CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index cf84444950..bf6c9bd6b0 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_PEACH_PIT=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_PEACH_PIT=y CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit" CONFIG_CROS_EC=y CONFIG_CROS_EC_SPI=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index cbdd404c70..9c6ddf4ca2 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PENGWYN=y +CONFIG_ARM=y +CONFIG_TARGET_PENGWYN=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index 14266ef875..e14b008818 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PEPPER=y +CONFIG_ARM=y +CONFIG_TARGET_PEPPER=y CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x400 diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index c3ca0400a1..c102626345 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PLATINUM_PICON=y +CONFIG_ARM=y +CONFIG_TARGET_PLATINUM_PICON=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index db8cef9cf4..77049e5bfe 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PLATINUM_TITANIUM=y +CONFIG_ARM=y +CONFIG_TARGET_PLATINUM_TITANIUM=y diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index d2743b8ef6..d5f6a1f9dd 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_PLUTUX=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_PLUTUX=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux" diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index e0d9031561..f9e594f41a 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_PXM2=y +CONFIG_ARM=y +CONFIG_TARGET_PXM2=y diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig index e99e57d505..563fa1afbe 100644 --- a/configs/r7-tv-dongle_defconfig +++ b/configs/r7-tv-dongle_defconfig @@ -2,9 +2,9 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb" CONFIG_USB1_VBUS_PIN="PG13" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN5I=y -+S:CONFIG_DRAM_CLK=384 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=384 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 0568655e1e..b7161bab11 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_RUT=y +CONFIG_ARM=y +CONFIG_TARGET_RUT=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 1d95487b4c..3b1621a3bf 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D3_XPLAINED=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3_XPLAINED=y diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 91dd104cdb..3a366e24c3 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D3_XPLAINED=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3_XPLAINED=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index c03106ca08..940c3370be 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 54bf79c963..7ecd07ffd7 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index 07bff18fb4..30e96f9f8e 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D3XEK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D3XEK=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index da5f811f77..539b1d1a18 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4_XPLAINED=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4_XPLAINED=y diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index ea06200509..4021cb236d 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4_XPLAINED=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4_XPLAINED=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index 0408fa4b87..2b4d8fccc9 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4_XPLAINED=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4_XPLAINED=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 1f66d373c6..2c77fb8284 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4EK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4EK=y diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index c623d9b21c..4a10fa1871 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4EK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4EK=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 3b4e124a5c..72fb5e4650 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_SAMA5D4EK=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_SAMA5D4EK=y diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index b6b0fc7478..14e0f6ac2c 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_SANSA_FUZE_PLUS=y +CONFIG_ARM=y +CONFIG_TARGET_SANSA_FUZE_PLUS=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index 75e0fc8248..c640125c69 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_SC_SPS_1=y +CONFIG_ARM=y +CONFIG_TARGET_SC_SPS_1=y diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index ddf2cd6995..327a6708f1 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_SEABOARD=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_SEABOARD=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 9b76d0d124..efc738bfeb 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_SMDK5250=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_SMDK5250=y CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250" diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 8cf673d093..3d3db8e778 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_SMDK5420=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_SMDK5420=y CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420" diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 0d1a24f99f..101d957f29 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_SMDKV310=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_SMDKV310=y CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310" diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 353ddb03a0..2b0d6faf98 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_EXYNOS=y -+S:CONFIG_TARGET_SNOW=y +CONFIG_ARM=y +CONFIG_ARCH_EXYNOS=y +CONFIG_TARGET_SNOW=y CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow" CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index ed46adf1f5..87d6007f0d 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_SOCFPGA_ARRIA5=y +CONFIG_ARM=y +CONFIG_TARGET_SOCFPGA_ARRIA5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" CONFIG_DM=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index 6743f4d490..0ebfbfcece 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y +CONFIG_ARM=y +CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" CONFIG_DM=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 888bbb6c6f..873b721ead 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_SOCFPGA_CYCLONE5=y +CONFIG_ARM=y +CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" CONFIG_DM=y diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig index a85db2a235..1e13fea39d 100644 --- a/configs/sunxi_Gemei_G9_defconfig +++ b/configs/sunxi_Gemei_G9_defconfig @@ -12,9 +12,9 @@ CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN4I=y -+S:CONFIG_DRAM_CLK=432 -+S:CONFIG_DRAM_ZQ=123 -+S:CONFIG_DRAM_EMR1=4 +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 +CONFIG_DRAM_EMR1=4 diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index 39ed872349..077dc892d6 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_TAO3530=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_TAO3530=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index fac3316421..90c22d2907 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_AT91=y -+S:CONFIG_TARGET_TAURUS=y +CONFIG_ARM=y +CONFIG_ARCH_AT91=y +CONFIG_TARGET_TAURUS=y diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index fabd34a3f3..8f953bff70 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA30=y -+S:CONFIG_TARGET_TEC_NG=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA30=y +CONFIG_TARGET_TEC_NG=y CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" diff --git a/configs/tec_defconfig b/configs/tec_defconfig index d3cafa7e4b..cc52fecf19 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_TEC=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_TEC=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec" diff --git a/configs/ti814x_evm_defconfig b/configs/ti814x_evm_defconfig index 0170655122..6f1325b050 100644 --- a/configs/ti814x_evm_defconfig +++ b/configs/ti814x_evm_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TI814X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_TI814X_EVM=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index abb6c5e0bc..4661f3cc92 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TI816X_EVM=y +CONFIG_ARM=y +CONFIG_TARGET_TI816X_EVM=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 3efe8290d9..745ebc83a5 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_TRICORDER=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_TRICORDER=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 8f999ff621..cc935669e8 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD" -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_TRICORDER=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_TRICORDER=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 0b2a6d0292..0ce8f81fd3 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_TRIMSLICE=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_TRIMSLICE=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice" diff --git a/configs/tseries_mmc_defconfig b/configs/tseries_mmc_defconfig index 6eda869fbe..0b92e14e59 100644 --- a/configs/tseries_mmc_defconfig +++ b/configs/tseries_mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TSERIES=y +CONFIG_ARM=y +CONFIG_TARGET_TSERIES=y # CONFIG_CMD_CRC32 is not set diff --git a/configs/tseries_nand_defconfig b/configs/tseries_nand_defconfig index bd06d83efd..658e1888bb 100644 --- a/configs/tseries_nand_defconfig +++ b/configs/tseries_nand_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TSERIES=y +CONFIG_ARM=y +CONFIG_TARGET_TSERIES=y # CONFIG_CMD_CRC32 is not set diff --git a/configs/tseries_spi_defconfig b/configs/tseries_spi_defconfig index 32ccc4e007..a274db06f7 100644 --- a/configs/tseries_spi_defconfig +++ b/configs/tseries_spi_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TSERIES=y +CONFIG_ARM=y +CONFIG_TARGET_TSERIES=y # CONFIG_CMD_CRC32 is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index d21a551f95..5e7250ab99 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_OMAP34XX=y -+S:CONFIG_TARGET_TWISTER=y +CONFIG_ARM=y +CONFIG_OMAP34XX=y +CONFIG_TARGET_TWISTER=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n diff --git a/configs/tx25_defconfig b/configs/tx25_defconfig index 0cbc4ee37b..dfa5c30ad8 100644 --- a/configs/tx25_defconfig +++ b/configs/tx25_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_TX25=y +CONFIG_ARM=y +CONFIG_TARGET_TX25=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index c12dae933f..7375cd59e8 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA124=y -+S:CONFIG_TARGET_VENICE2=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA124=y +CONFIG_TARGET_VENICE2=y CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index f62ab6b17a..b268ec749e 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_VENTANA=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_VENTANA=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana" diff --git a/configs/vpac270_ond_256_defconfig b/configs/vpac270_ond_256_defconfig index 2a536a564c..75a471eced 100644 --- a/configs/vpac270_ond_256_defconfig +++ b/configs/vpac270_ond_256_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ONENAND,RAM_256M" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_VPAC270=y +CONFIG_ARM=y +CONFIG_TARGET_VPAC270=y diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig index 9553eb8664..f235a03b55 100644 --- a/configs/whistler_defconfig +++ b/configs/whistler_defconfig @@ -1,5 +1,5 @@ -+S:CONFIG_ARM=y -+S:CONFIG_TEGRA=y -+S:CONFIG_TEGRA20=y -+S:CONFIG_TARGET_WHISTLER=y +CONFIG_ARM=y +CONFIG_TEGRA=y +CONFIG_TEGRA20=y +CONFIG_TARGET_WHISTLER=y CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler" diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig index d3dcb3c3c1..275a33f1a8 100644 --- a/configs/woodburn_sd_defconfig +++ b/configs/woodburn_sd_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg" -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_WOODBURN_SD=y +CONFIG_ARM=y +CONFIG_TARGET_WOODBURN_SD=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index cb66890498..c8bec6791e 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_X600=y +CONFIG_ARM=y +CONFIG_TARGET_X600=y diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index 737db40959..75375676fe 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -1,3 +1,3 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_TARGET_XFI3=y +CONFIG_ARM=y +CONFIG_TARGET_XFI3=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 8b985fe5a4..39a7f6b5fb 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_MICROZED=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_MICROZED=y CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig index cceb32199d..a8ef97f173 100644 --- a/configs/zynq_zc70x_defconfig +++ b/configs/zynq_zc70x_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZC70X=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" CONFIG_FIT=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 2935c0dff7..ecd245a549 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_FIT=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 0401739652..341a4d83aa 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_FIT=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index a95970a917..ee08a9f7e0 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -1,8 +1,8 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZC770=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_FIT=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 0fbc41ab8a..2500d84e9a 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZED=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZED=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_FIT=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 4e66760750..c9d0121afb 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -1,7 +1,7 @@ CONFIG_SPL=y -+S:CONFIG_ARM=y -+S:CONFIG_ZYNQ=y -+S:CONFIG_TARGET_ZYNQ_ZYBO=y +CONFIG_ARM=y +CONFIG_ZYNQ=y +CONFIG_TARGET_ZYNQ_ZYBO=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" CONFIG_FIT=y