diff mbox

[U-Boot,v2,1/4] configs: convert CONFIG_SYS_MPUCLK to Kconfig

Message ID 20170505072910.20772-2-lokeshvutla@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Lokesh Vutla May 5, 2017, 7:29 a.m. UTC 
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 README                                           | 5 -----
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 5 -----
 arch/arm/mach-omap2/Kconfig                      | 5 +++++
 configs/draco_defconfig                          | 1 +
 configs/etamin_defconfig                         | 1 +
 configs/pxm2_defconfig                           | 1 +
 configs/rastaban_defconfig                       | 1 +
 configs/rut_defconfig                            | 1 +
 configs/thuban_defconfig                         | 1 +
 include/configs/draco.h                          | 1 -
 include/configs/etamin.h                         | 1 -
 include/configs/pxm2.h                           | 1 -
 include/configs/rastaban.h                       | 1 -
 include/configs/rut.h                            | 1 -
 include/configs/thuban.h                         | 1 -
 scripts/config_whitelist.txt                     | 1 -
 16 files changed, 11 insertions(+), 17 deletions(-)

Comments

Tom Rini May 5, 2017, 2:17 p.m. UTC | #1 
On Fri, May 05, 2017 at 12:59:07PM +0530, Lokesh Vutla wrote:

> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini May 12, 2017, 5:20 p.m. UTC | #2 
On Fri, May 05, 2017 at 12:59:07PM +0530, Lokesh Vutla wrote:

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

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/README b/README
index 0ac01363f7..a02e890057 100644
--- a/README
+++ b/README
@@ -4507,11 +4507,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 4c9352a2ed..c06b01b842 100644
--- 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 fd45fefa7f..04bc2885e4 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -147,6 +147,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 148d0f2075..2526c20b1d 100644
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_DRACO=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 9babc09343..6b3df0f3f1 100644
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_ETAMIN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 33b666316e..31e48901e3 100644
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_PXM2=y
+CONFIG_SYS_MPUCLK=720
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index a2c82826a3..1e9b0e6016 100644
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_RASTABAN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index 4cf8538695..d6f5e75391 100644
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_RUT=y
+CONFIG_SYS_MPUCLK=600
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 7d9e63fe5e..f591bd9965 100644
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -11,6 +11,7 @@  CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_THUBAN=y
+CONFIG_SYS_MPUCLK=300
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
diff --git a/include/configs/draco.h b/include/configs/draco.h
index da77c451b0..896d14f99a 100644
--- 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 3383f06bf7..40c57948cc 100644
--- 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 c8bc8f3512..57f034f0df 100644
--- 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 16ed1f0133..99fe1616e5 100644
--- 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 bd819f1aad..8cfb73d781 100644
--- 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 9b73828df6..8c37d7cace 100644
--- 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 ed349b9e6b..7e9cf48380 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4870,7 +4870,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