From 3bf5f13c0cda80cf1075c53862cb3ba998245cf8 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 15 Mar 2018 22:11:46 +0000 Subject: [PATCH] Migrate CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC This converts CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC to Kconfig Signed-off-by: Alex Kiernan --- README | 3 --- common/spl/Kconfig | 7 +++++++ configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_prompt_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/am335x_shc_sdboot_prompt_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/bootcount/Kconfig | 1 + include/configs/am335x_shc.h | 1 - include/configs/bur_am335x_common.h | 1 - include/configs/cm_t335.h | 1 - include/configs/draco.h | 1 - include/configs/etamin.h | 1 - include/configs/rastaban.h | 1 - include/configs/thuban.h | 1 - include/configs/ti_am335x_common.h | 1 - scripts/config_whitelist.txt | 1 - 23 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README b/README index ed79298fd4..87d79ef419 100644 --- a/README +++ b/README @@ -3430,9 +3430,6 @@ Low Level (hardware related) configuration options: If defined, the x86 reset vector code is included. This is not needed when U-Boot is running from Coreboot. -- CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC: - Enables the RTC32K OSC on AM33xx based plattforms - - CONFIG_SYS_NAND_NO_SUBPAGE_WRITE Option to disable subpage write in NAND driver driver that uses this: diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b9b9e0f3a0..d15f576a81 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -772,6 +772,13 @@ config SPL_ATF_NO_PLATFORM_PARAM If your ATF is affected, say Y. +config SPL_AM33XX_ENABLE_RTC32K_OSC + bool "Enable the RTC32K OSC on AM33xx based platforms" + default y if AM33XX + help + Enable access to the AM33xx RTC and select the external 32kHz clock + source. + config TPL bool depends on SUPPORT_TPL diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index fb714dacd6..a9fe489e22 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 2568e3d2ef..3a81e9e638 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 16071fbac6..8d2703ffc6 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -24,6 +24,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index bbad6ddbfd..b989a643ea 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" CONFIG_AUTOBOOT_DELAY_STR="shc" diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index 82a61a3596..2ef7cedf1b 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index 82a61a3596..2ef7cedf1b 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 46979b3a5c..45eace2465 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 985e662929..19c9a6c3a2 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index dd862bb965..7db968515e 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index e561edccf8..6a7c2ef524 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index eb7e2850ff..3fccaf1337 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y +# CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 73972b7f9c..d335ed14b9 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -34,6 +34,7 @@ config BOOTCOUNT_EXT config BOOTCOUNT_AM33XX bool "Boot counter in AM33XX RTC IP block" depends on AM33XX || SOC_DA8XX + select SPL_AM33XX_ENABLE_RTC32K_OSC if AM33XX help A bootcount driver for the RTC IP block found on many TI platforms. This requires the RTC clocks, etc, to be enabled prior to use and diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 6fa117ef23..60b162e534 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -16,7 +16,6 @@ #include /* settings we don;t want on this board */ -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_CMD_SPI #define CONFIG_CMD_CACHE diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index e8abe531ef..4aa0cb698d 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -17,7 +17,6 @@ /* Timer information */ #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_POWER_TPS65217 #include diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 641bdb71e9..0609ccacfe 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -16,7 +16,6 @@ #include #undef CONFIG_SPI -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */ diff --git a/include/configs/draco.h b/include/configs/draco.h index c1816409a9..02e935e649 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -18,7 +18,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index ef9f330a09..a605f8d73e 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* FWD Button = 27 * SRV Button = 87 */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 116728fc22..a9304e8d77 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -16,7 +16,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC /* FWD Button = 27 * SRV Button = 87 */ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 78674a14c8..88dce5472a 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -16,7 +16,6 @@ #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */ #define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */ diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 8251ceb63f..9832e09aac 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -15,7 +15,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f76d68b25b..88494bf615 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1942,7 +1942,6 @@ CONFIG_SPLASH_SCREEN_ALIGN CONFIG_SPLASH_SOURCE CONFIG_SPLL_FREQ CONFIG_SPL_ -CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC CONFIG_SPL_ATMEL_SIZE CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE -- 2.25.1