From: Simon Glass Date: Tue, 13 Sep 2016 05:18:54 +0000 (-0600) Subject: Convert CONFIG_SPL_POWER_SUPPORT to Kconfig X-Git-Tag: v2016.11-rc1~143 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2253797d285ab717818013928e6c93ff1622f090;p=u-boot Convert CONFIG_SPL_POWER_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig index 98056b1543..5cb6b814cc 100644 --- a/arch/arm/cpu/armv7/omap3/Kconfig +++ b/arch/arm/cpu/armv7/omap3/Kconfig @@ -27,6 +27,9 @@ config SPL_MMC_SUPPORT config SPL_NAND_SUPPORT default y +config SPL_POWER_SUPPORT + default y + choice prompt "OMAP3 board select" optional diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig index 15287af069..f24be67106 100644 --- a/arch/arm/cpu/armv7/omap4/Kconfig +++ b/arch/arm/cpu/armv7/omap4/Kconfig @@ -27,6 +27,9 @@ config SPL_MMC_SUPPORT config SPL_NAND_SUPPORT default y +config SPL_POWER_SUPPORT + default y + choice prompt "OMAP4 board select" optional diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 31862022a8..b8e9fe2f72 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -27,6 +27,9 @@ config SPL_MMC_SUPPORT config SPL_NAND_SUPPORT default y +config SPL_POWER_SUPPORT + default y + choice prompt "OMAP5 board select" optional diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 94a4323f11..76ed46a790 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -15,6 +15,9 @@ config SPL_LIBGENERIC_SUPPORT config SPL_MMC_SUPPORT default y +config SPL_POWER_SUPPORT + default y + # Note only one of these may be selected at a time! But hidden choices are # not supported by Kconfig config SUNXI_GEN_SUN4I diff --git a/board/ti/common/Kconfig b/board/ti/common/Kconfig index 667e15c970..5f22e8cb93 100644 --- a/board/ti/common/Kconfig +++ b/board/ti/common/Kconfig @@ -33,3 +33,6 @@ config SPL_MMC_SUPPORT config SPL_NAND_SUPPORT default y + +config SPL_POWER_SUPPORT + default y diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 72c1507d4f..7ade9cfb49 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -8,6 +8,8 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -17,7 +19,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index d8e6667b28..86ebf0f7f6 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index bd6559257e..1a467c3b7f 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -9,7 +9,6 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index c81938417f..07ce05416e 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -8,7 +8,6 @@ CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index 3dbde192e0..f859d38cd3 100644 --- a/configs/am335x_igep0033_defconfig +++ b/configs/am335x_igep0033_defconfig @@ -8,12 +8,13 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 5bebd9bd65..a08a275dab 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SERIES=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_FIT=y diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index a0dd839136..571c9e5ea1 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SHC_ICT=y CONFIG_SERIES=y CONFIG_SPL_STACK_R_ADDR=0x82000000 diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 28b5ec17f1..2faf022d7d 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SHC_NETBOOT=y CONFIG_SERIES=y diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index 27abd5eee8..41b9d8bdfb 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SERIES=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_FIT=y diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index b980f475e2..b43419003d 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SHC_SDBOOT=y CONFIG_SERIES=y CONFIG_SPL_STACK_R_ADDR=0x82000000 diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index b980f475e2..b43419003d 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SHC_SDBOOT=y CONFIG_SERIES=y CONFIG_SPL_STACK_R_ADDR=0x82000000 diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 6446ca4c85..bd6317e7a2 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_FIT=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 297b419ec9..6fd6fb1a74 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -9,7 +9,6 @@ CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AM3517_EVM # " CONFIG_CMD_BOOTZ=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index c41da95f28..0be9bb7042 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -10,7 +10,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 86c9a5b69b..a1ab32c347 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -6,7 +6,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_HUSH_PARSER=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 688243f5af..477c9389e5 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -11,7 +11,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 5b3729dfb0..9c01781212 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -14,7 +14,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 7d61de9860..3a47e66eea 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_BAV_VERSION=1 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index f6703e42b3..680823186a 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_BAV_VERSION=2 CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 3e6b2239b0..b63c7a0a0d 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" CONFIG_BOOTDELAY=-2 diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index a3d7638dca..1c01bd4e25 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -4,12 +4,13 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" CONFIG_BOOTDELAY=-2 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 62fb3db152..a8ca05eeb0 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" CONFIG_SPI_BOOT=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index fe1fbb6dfa..1aaacad105 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_BOOTDELAY=-2 CONFIG_VERSION_VARIABLE=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index f23232665b..e6c0b80144 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -5,7 +5,6 @@ CONFIG_BOOTDELAY=-2 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Cairo # " CONFIG_CMD_BOOTZ=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index bc7f0d2de6..5335aa5691 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_MMC_SUPPORT is not set +CONFIG_SPL_POWER_SUPPORT=y CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_CHROMEBOOK_JERRY=y CONFIG_ROCKCHIP_FAST_SPL=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 0b80e46293..bfd8a79702 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -8,10 +8,11 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 29eb60b126..2aed9b6d4c 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 6905389c08..634f4cd5ca 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_GW_VENTANA=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_DM_SERIAL=y CONFIG_FIT=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 1ee8032c76..6da10bab2f 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -7,7 +7,6 @@ CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 66b6f4dc96..66371d6964 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig index 82bc8d6474..f63bcacad1 100644 --- a/configs/igep0030_nand_defconfig +++ b/configs/igep0030_nand_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 10a40c9e25..991d9d7e50 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index faba2b9dd3..0be360c97a 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2E_EVM=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="k2e-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index d5030d733b..8c459cffe4 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2G_EVM=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="k2g-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index c5232dcc46..7e582dc223 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2HK_EVM=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 62b787756f..91d5bd49fb 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2L_EVM=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="k2l-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index e4863e7b38..ece9638e49 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 5935778cd7..454a090ccf 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP Logic # " CONFIG_CMD_BOOTZ=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 8fd54c7a68..e6ec9e869e 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -4,7 +4,6 @@ CONFIG_TARGET_OMAP3_OVERO=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Overo # " CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index a187e07544..e3b1853f59 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_VERSION_VARIABLE=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index e2a7549ad5..9a19bc6534 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_VERSION_VARIABLE=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 02b44fc5b6..b816c70673 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -8,12 +8,13 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_HUSH_PARSER=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index cf7d1ae9aa..dc5b74876e 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 4431288fde..21932fe494 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -206,7 +206,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* Bootcount using the RTC block */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 2762d53323..46a396adcd 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -279,7 +279,6 @@ #define CONFIG_POWER_TPS65217 /* SPL */ -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 80140e7f27..466142734f 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -80,7 +80,6 @@ #define CONFIG_POWER_TPS65910 /* SPL */ -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* Bootcount using the RTC block */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index a98aa5866e..fe4c70b46c 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -291,7 +291,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" /* NAND boot config */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7cd8cd00c8..023c00f3bf 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -348,7 +348,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" #endif /* __CONFIG_H */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 67c3899de9..d7a96b9be4 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -39,7 +39,6 @@ #define CONFIG_SPL_TEXT_BASE CONFIG_ISW_ENTRY_ADDR #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* Enabling L2 Cache */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 3bce7a2c87..8f8655af93 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -217,7 +217,6 @@ /* SPL */ #ifndef CONFIG_NOR_BOOT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* Bootcount using the RTC block */ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 0a2ad5243e..b3eabe6572 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -350,7 +350,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL */ #ifndef CONFIG_NOR_BOOT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* Bootcount using the RTC block */ diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 77014c8320..f856526c69 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ #define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* enable 32kHz OSC at bootime */ -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_POWER_TPS65217 #define CONFIG_SYS_NO_FLASH /* have no NOR-flash */ diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index cdc81b652e..56cd499db8 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -24,8 +24,6 @@ #define CONFIG_KEYBOARD -#define CONFIG_SPL_POWER_SUPPORT - #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index bda9ab500c..faed281846 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -310,7 +310,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index ad3be27321..29e40dbdc5 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -151,14 +151,12 @@ /* SPL defines. */ #define CONFIG_SPL_TEXT_BASE 0x40300350 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + (128 << 20)) -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (256 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x480 #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_POWER_SUPPORT /* EEPROM */ #define CONFIG_CMD_EEPROM diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6e6bd038f1..b7945c208a 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -9,7 +9,6 @@ /* SPL */ #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_POWER_SUPPORT /* Location in NAND to read U-Boot from */ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M) diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 78991f3128..b82f5a11bb 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -130,7 +130,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 2 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index dc52df2f90..d744df9963 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -321,7 +321,6 @@ #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index d19f8710ca..e74c4070a1 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -347,7 +347,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 40f96401d2..1105ca0581 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 /* SPL */ -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_YMODEM_SUPPORT /* NAND support */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 20146b0d15..74c240812a 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -138,7 +138,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 2 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 6aadca89b9..1a26120dae 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -256,7 +256,6 @@ extern int soft_i2c_gpio_scl; #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ defined CONFIG_AXP221_POWER || defined CONFIG_AXP818_POWER || \ defined CONFIG_SY8106A_POWER -#define CONFIG_SPL_POWER_SUPPORT #endif #ifndef CONFIG_CONS_INDEX diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index bd65e058a7..82fac9072d 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -202,7 +202,6 @@ #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 6ed4a64c0a..359710433c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -292,7 +292,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index a62f5b5999..44f0033caa 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -264,7 +264,6 @@ /* General parts of the framework, required. */ #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_BOARD_INIT #ifdef CONFIG_NAND diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 33426c89bb..d607f407fd 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -69,7 +69,6 @@ /* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (64 << 20)) diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index a36c431406..177a663385 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -320,7 +320,6 @@ #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC