configs: convert CONFIG_SYS_MPUCLK to Kconfig

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 685a8222b0dd3a3304f087821d9a7db088d3be93..2ca0102b57b74f03106c33d20052d08ce9f5eac2 100644 (file)
--- a/README
+++ b/README
@@ -4512,11 +4512,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_SYS_MPUCLK
-               Defines the MPU clock speed (in MHz).
-
-               NOTE : currently only supported on AM335x platforms.
-
 - CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC:
                Enables the RTC32K OSC on AM33xx based plattforms
 

diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
index 4c9352a2ed768f29bcec1ff5678807ccbb396464..c06b01b842f92101648e955fb03c621efa6c56b9 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
@@ -19,11 +19,6 @@
 #define MPUPLL_M_550   550
 #define MPUPLL_M_300   300
 
-/* MAIN PLL Fdll = 550 MHz, by default */
-#ifndef CONFIG_SYS_MPUCLK
-#define CONFIG_SYS_MPUCLK      MPUPLL_M_550
-#endif
-
 #define UART_RESET             (0x1 << 1)
 #define UART_CLK_RUNNING_MASK  0x1
 #define UART_SMART_IDLE_EN     (0x1 << 0x3)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 5bca20e315a8940d85249abceacfc96fb2465547..d3f380256baec795fd65dcb07948551a844c6f8c 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -148,6 +148,11 @@ config TARGET_CM_T43
 
 endchoice
 
+config SYS_MPUCLK
+       int "MPU CLK speed"
+       default 550
+       help
+         Defines the MPU clock speed (in MHz).
 
 config TI_SECURE_DEVICE
        bool "HS Device Type Support"

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index ea678b6f48c2f62cf2765b5182fe45bfe340f4bd..2ecdd3c8f68d4ccbc2522428ae3cbf3a5d61b73b 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_DRACO=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 39d3ad1cd9f9d752d937be84061c4732e3b8daa0..7e0b1923b8ac4c49521cf2576bdf8facbb33be31 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_ETAMIN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 5b7c5ef3e993b8aca3aed29dec1d8f05b2a6060b..c40684a81d48c3946fc8f45648620686788ca955 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_PXM2=y
+CONFIG_SYS_MPUCLK=720
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 084c03cd002f1aa4a65d8decacd0c1385925a720..01848c5702ab778ea96d5f3a16b850a2dae0dbfe 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_RASTABAN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 33289962a889222b20d551f361d0a45ec0690728..f09a67e62c73a321ce2b9299b496e4a52fbaa3c2 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_RUT=y
+CONFIG_SYS_MPUCLK=600
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index a20c4dfb31d0dc70b376d6ac5c48769186410c3c..dd61ead647cd56cdec449c11c09da39a486183a0 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_THUBAN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/include/configs/draco.h b/include/configs/draco.h
index da77c451b0aa2545a0aace925ed4ab990725d780..896d14f99a977b95a4e12c5956421a8e7861996c 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -18,7 +18,6 @@
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      300
 #define DDR_PLL_FREQ   303
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 3383f06bf727f163ae846b2019109bc83b37be05..40c57948ccd47a86ff2497b7b8e16e1655da4bf2 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -69,7 +69,6 @@
                                        CONFIG_SYS_NAND_BASE2}
 
 #define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_SYS_MPUCLK      300
 #define DDR_PLL_FREQ   303
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index c8bc8f35128f6341a7f21cdc605c64ef986fe915..57f034f0df61d725dc9ea1962452c0c6f6839801 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -19,7 +19,6 @@
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      720
 #define DDR_IOCTRL_VAL         0x18b
 #define DDR_PLL_FREQ           266
 

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 16ed1f0133c3b818aeb764250709723c98350138..99fe1616e555525247d66de1d5a5d89b971919d3 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -15,7 +15,6 @@
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      300
 #define DDR_PLL_FREQ   303
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 

diff --git a/include/configs/rut.h b/include/configs/rut.h
index bd819f1aadd82c4222efcbf29ce843e78a70961d..8cfb73d781379f538430e03bf28a0c76240eb060 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -19,7 +19,6 @@
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      600
 #define RUT_IOCTRL_VAL 0x18b
 #define DDR_PLL_FREQ   303
 

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 9b73828df6d57fd59ff3557b353982f7c4fcd08d..8c37d7cace8c7eef28d14416651addeb267745db 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -15,7 +15,6 @@
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      300
 #define DDR_PLL_FREQ   303
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cd0165f9344d622ee2c59406f245638b8a02715d..3eba402f7dafc377341154acfcfd37f9f58b4f82 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4869,7 +4869,6 @@ CONFIG_SYS_MPTPR_1BK_8K
 CONFIG_SYS_MPTPR_2BK_2K
 CONFIG_SYS_MPTPR_2BK_4K
 CONFIG_SYS_MPTPR_2BK_8K
-CONFIG_SYS_MPUCLK
 CONFIG_SYS_MRAM_BASE
 CONFIG_SYS_MRAM_SIZE
 CONFIG_SYS_MRS_OFFS