Finish converting CONFIG_SYS_FSL_CLK to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_FSL_CLK

We move the exiting option to common/Kconfig near the other options to
control the contents of board_init_f() and note that this is a legacy
option.  We further restrict this to where the call is going to be
non-empty, for the SoCs that had only been using this for some
MMC-related clocks.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 0b0e2ea7ab2df56383b271610a30259fc849ce0e..da53afcea93dfc8e0933435fffe9e7ae30dadbb1 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -530,10 +530,6 @@ endmenu
 menu "Layerscape clock tree configuration"
        depends on FSL_LSCH2 || FSL_LSCH3
 
-config SYS_FSL_CLK
-       bool "Enable clock tree initialization"
-       default y
-
 config CLUSTER_CLK_FREQ
        int "Reference clock of core cluster"
        depends on ARCH_LS1012A

diff --git a/common/Kconfig b/common/Kconfig
index 50ac4331f5cad671824492d6248a965f9a437432..0892d9be362c481137e44048562d215838bfeee9 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -534,6 +534,15 @@ config BOARD_LATE_INIT
          So this config enable the late init code with the help of board_late_init
          function which should defined on respective boards.
 
+config SYS_FSL_CLK
+       bool
+       depends on ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3 || \
+               (FSL_ESDHC_IMX && (ARCH_MX5 || ARCH_MX6 || ARCH_MX7))
+       default y
+       help
+         Enable to call get_clocks() in board_init_f() for platforms other
+         than PowerPC or M68k.  This is a legacy option.  If not TARGET_BRPPT2
+
 config LAST_STAGE_INIT
        bool "Call board-specific as last setup step"
        help

diff --git a/doc/README.fsl-clk b/doc/README.fsl-clk
deleted file mode 100644 (file)
index 3a9927f..0000000
--- a/doc/README.fsl-clk
+++ /dev/null
@@ -1,5 +0,0 @@
-Freescale system clock options
-
-       - CONFIG_SYS_FSL_CLK
-               Enable to call get_clocks() in board_init_f() for
-               non-PPC platforms.

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index a7c91b9f1da48532de3c000ff3d29f9faf7763bb..40984d661c80d29855f64a461b6ca03e1f8de51a 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -14,8 +14,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 #ifdef CONFIG_VIDEO_FSL_DCU_FB
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 32659dba1c430dd1f68d1ecd0610cb07094a1aa0..d94572d3abf6faafc836fc596f42798062829f73 100644 (file)
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -6,8 +6,6 @@
 #ifndef __CONFIG_PG_WCOM_LS102XA_H
 #define __CONFIG_PG_WCOM_LS102XA_H
 
-#define CONFIG_SYS_FSL_CLK
-
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index 8ac381c5d78d21fb81055063ec3382df9bb1ca23..0983d40ec411fb375468cba48cf0fbd856e4262e 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -10,8 +10,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 499dbe1c70ddeb103870f89b4b99c20fb14e8ec7..3d504599f317a30f5da35fbd7d4b0ee206897ed7 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -9,8 +9,6 @@
 
 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 1dfad1253ea9020f10a9311356abfff7af038b16..d8ce83b33fa1805388375a7c58f60592310809eb 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -9,8 +9,6 @@
 
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_DEEP_SLEEP
 
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 3773a0a186b58bb9f8f5cc748a301ef52e9c7301..08fbd72008b480ffdc8ef0311e6de2af8e26fb92 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -8,8 +8,6 @@
 
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_DEEP_SLEEP
 
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 6fae28e73cf74ef3a3e4b6a8fb6cd24fa65fb349..c5ccaa84e52ee28e0d8054fc2817975d2c7850ec 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -9,8 +9,6 @@
 
 #define CONFIG_ARMV7_SECURE_BASE       OCRAM_BASE_S_ADDR
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_DEEP_SLEEP
 
 #define CONFIG_SYS_INIT_RAM_ADDR       OCRAM_BASE_ADDR

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 124aab0eff08ecef84c029d4a6f0f0f5cacac0e2..c2345e8224efb483ee5c7df819ca57f1d5490418 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -11,8 +11,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 /*

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index f1a87faaecebd0a52a46304b47ef1b0c5338af0c..fd42d2b0f506a76587c28a1591b4c8149a40b600 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -12,8 +12,6 @@
 
  /* High Level Configuration Options */
 
-#define CONFIG_SYS_FSL_CLK
-
 #include <asm/arch/imx-regs.h>
 
 /*

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index f03e42529761cb288c16caa2a4aac3a84789828a..16c2241fd57e4ff3cfc1c3f88b768c8a634e0633 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -14,8 +14,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_MXC_UART_BASE UART2_BASE
 
 #define CONFIG_FPGA_COUNT 1

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 92c75f5ee8ed1357a43e501d778bb68e014cafc5..a972410db74ab199c02b8bef64e854525f7e0f29 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -11,8 +11,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
 /* MMC Configs */

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 80487e099bc3f8a79a40df884dbb0a2935d50fd0..8f8dfe94ca9cded8dce6fafcf9e9857a909db2d1 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -11,8 +11,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 0ae8305c592e5d86a8f573aa4622627883335943..5ff931ee3bc997a3678b0c9bed741488df017521 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -27,8 +27,6 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_CBSIZE      512
 #define CONFIG_SYS_MAXARGS     32

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index ffe8c758dd2609a5cfcdb7d2c1d1e11705d60a83..2e976df6985f233e03b927b0f5b45cf40eb54ac5 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -17,7 +17,6 @@
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
 #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
-#define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_SYS_BOOTM_LEN   0x1000000
 

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 77da2bfdd791636b1ebb5b9378d16f70e367c1b4..0faa656bc63afb2b927f5d6577f265ff587bbf08 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_SYS_FSL_CLK
-
 #include <asm/arch/imx-regs.h>
 
 /* U-Boot environment */

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index c42db3686f61b140ee423fa05d241d8cbec1f2d0..d90c2fa053453a0253c4d6482327bfdf08320884 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -11,8 +11,6 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/stringify.h>
 
-#define CONFIG_SYS_FSL_CLK
-
 /* NAND support */
 
 #ifdef CONFIG_CMD_NAND