Migrate CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC

This converts CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC to Kconfig

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>

diff --git a/README b/README
index ed79298fd4ea9f09911ac5bbc7860da870d9055a..87d79ef419685fabe2f0fe976386c82ab43c0cfe 100644 (file)
--- 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 b9b9e0f3a0a991c8a5621098bb142cf7da072dc6..d15f576a815243e4fa041bb3ab9465b3b35a98f7 100644 (file)
--- 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 fb714dacd66710b94f142ff1a47f62be53939304..a9fe489e22b6994da7915f795ea3853fa135a8a0 100644 (file)
--- 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 2568e3d2ef12492f42154fcffe800c08008d355d..3a81e9e638eb93ba7e6eb65bcb4b5e4f4c4fe99b 100644 (file)
--- 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 16071fbac602547c4896a0112e9c321da8e7bce5..8d2703ffc65b245d06daf59c768f69d4783ea617 100644 (file)
--- 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 bbad6ddbfd0b2701a92abfff5559532e657ab711..b989a643ead1bd28fd98df94dbc8710a351049fc 100644 (file)
--- 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 82a61a35963c3f903a04cabd16b094282f1c2e2b..2ef7cedf1b29676cbcd32f64315d8a49e1bbcec5 100644 (file)
--- 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 82a61a35963c3f903a04cabd16b094282f1c2e2b..2ef7cedf1b29676cbcd32f64315d8a49e1bbcec5 100644 (file)
--- 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 46979b3a5c64ab9704ab70b21edfa2c84de066e2..45eace2465e868cc6180c7cfff1f0e5d14237790 100644 (file)
--- 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 985e6629294da68ed7a063879e0417f9e21aa3e8..19c9a6c3a2afb05d837e58115cc7d7111598fac3 100644 (file)
--- 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 dd862bb965dab78cb0366b4996beb8ae074e8e16..7db968515e714ffc5df4025f234c0b7fe37e7b52 100644 (file)
--- 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 e561edccf89a589f622ad18be0e36f7d8d8829b2..6a7c2ef524c7e7e982fcb7165bbe8c115a1b164d 100644 (file)
--- 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 eb7e2850ff10d214bbed6762eff23d58851efb84..3fccaf133707063231e722e0869ecae2772275df 100644 (file)
--- 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 73972b7f9c375363feb71a7afdf73fb0b9841842..d335ed14b96172a5bbd29768546cf863d2f7bb8e 100644 (file)
--- 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 6fa117ef2346f9a85e96b2013cc4f2d6625958b2..60b162e534a4eece3bc9d0819978440348dada8a 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -16,7 +16,6 @@
 #include <configs/ti_am335x_common.h>
 
 /* 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 e8abe531ef45a3cb471ee386787ef453b0acce64..4aa0cb698d13154a795b529e291e4fb9181f3703 100644 (file)
--- 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 <asm/arch/omap.h>

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 641bdb71e9bc687a1fa02a813d172e5cafb30506..0609ccacfe83731a9d86d64add00b7acbb488a91 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -16,7 +16,6 @@
 #include <configs/ti_am335x_common.h>
 
 #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 c1816409a986ef653da8146ab241637158bccb05..02e935e64932d0c0c22ed4094e81013bfa43ceca 100644 (file)
--- 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 ef9f330a0946537797184397fa11b0a1c0b4d461..a605f8d73e0c84ed18fe273ca8aacb3eea4666db 100644 (file)
--- 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 116728fc228991b2ad03814a9e1f984e887d9fe8..a9304e8d776e1ae60c2fa19e38c449b78552af77 100644 (file)
--- 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 78674a14c8186f2c8016e8414a2051a22dcd4732..88dce5472ad42cfd5cdc7e79e4cad0d9d8a89d2e 100644 (file)
--- 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 8251ceb63fa0da17455c04cfc29c3292af60f447..9832e09aacf629e1f71839d7637fd0014ca3f0d1 100644 (file)
--- 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 <asm/arch/omap.h>
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index f76d68b25b363b5d67d194d7943af40743941110..88494bf61535b0583057ecbdd9158ab5213e58fa 100644 (file)
--- 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