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>
This commit is contained in:
		
							parent
							
								
									6880b330a9
								
							
						
					
					
						commit
						ada261f19a
					
				|  | @ -530,10 +530,6 @@ endmenu | ||||||
| menu "Layerscape clock tree configuration" | menu "Layerscape clock tree configuration" | ||||||
| 	depends on FSL_LSCH2 || FSL_LSCH3 | 	depends on FSL_LSCH2 || FSL_LSCH3 | ||||||
| 
 | 
 | ||||||
| config SYS_FSL_CLK |  | ||||||
| 	bool "Enable clock tree initialization" |  | ||||||
| 	default y |  | ||||||
| 
 |  | ||||||
| config CLUSTER_CLK_FREQ | config CLUSTER_CLK_FREQ | ||||||
| 	int "Reference clock of core cluster" | 	int "Reference clock of core cluster" | ||||||
| 	depends on ARCH_LS1012A | 	depends on ARCH_LS1012A | ||||||
|  |  | ||||||
|  | @ -534,6 +534,15 @@ config BOARD_LATE_INIT | ||||||
| 	  So this config enable the late init code with the help of 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. | 	  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 | config LAST_STAGE_INIT | ||||||
| 	bool "Call board-specific as last setup step" | 	bool "Call board-specific as last setup step" | ||||||
| 	help | 	help | ||||||
|  |  | ||||||
|  | @ -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. |  | ||||||
|  | @ -14,8 +14,6 @@ | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| #include <linux/sizes.h> | #include <linux/sizes.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #ifdef CONFIG_VIDEO_FSL_DCU_FB | #ifdef CONFIG_VIDEO_FSL_DCU_FB | ||||||
| #define CONFIG_VIDEO_LOGO | #define CONFIG_VIDEO_LOGO | ||||||
| #define CONFIG_VIDEO_BMP_LOGO | #define CONFIG_VIDEO_BMP_LOGO | ||||||
|  |  | ||||||
|  | @ -6,8 +6,6 @@ | ||||||
| #ifndef __CONFIG_PG_WCOM_LS102XA_H | #ifndef __CONFIG_PG_WCOM_LS102XA_H | ||||||
| #define __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 common defines/options for all Keymile boards */ | ||||||
| #include "keymile-common.h" | #include "keymile-common.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,8 +10,6 @@ | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| #include <linux/sizes.h> | #include <linux/sizes.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| /* USB Configs */ | /* USB Configs */ | ||||||
| #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW) | #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW) | ||||||
| #define CONFIG_MXC_USB_FLAGS	0 | #define CONFIG_MXC_USB_FLAGS	0 | ||||||
|  |  | ||||||
|  | @ -9,8 +9,6 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR | #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_ADDR	OCRAM_BASE_ADDR | ||||||
| #define CONFIG_SYS_INIT_RAM_SIZE	OCRAM_SIZE | #define CONFIG_SYS_INIT_RAM_SIZE	OCRAM_SIZE | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -9,8 +9,6 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_DEEP_SLEEP | #define CONFIG_DEEP_SLEEP | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | ||||||
|  |  | ||||||
|  | @ -8,8 +8,6 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_DEEP_SLEEP | #define CONFIG_DEEP_SLEEP | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | ||||||
|  |  | ||||||
|  | @ -9,8 +9,6 @@ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_DEEP_SLEEP | #define CONFIG_DEEP_SLEEP | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | #define CONFIG_SYS_INIT_RAM_ADDR	OCRAM_BASE_ADDR | ||||||
|  |  | ||||||
|  | @ -11,8 +11,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_TIMESTAMP		/* Print image info with timestamp */ | #define CONFIG_TIMESTAMP		/* Print image info with timestamp */ | ||||||
| 
 | 
 | ||||||
| /*
 | /*
 | ||||||
|  |  | ||||||
|  | @ -12,8 +12,6 @@ | ||||||
| 
 | 
 | ||||||
|  /* High Level Configuration Options */ |  /* High Level Configuration Options */ | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| /*
 | /*
 | ||||||
|  |  | ||||||
|  | @ -14,8 +14,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_MXC_UART_BASE UART2_BASE | #define CONFIG_MXC_UART_BASE UART2_BASE | ||||||
| 
 | 
 | ||||||
| #define CONFIG_FPGA_COUNT 1 | #define CONFIG_FPGA_COUNT 1 | ||||||
|  |  | ||||||
|  | @ -11,8 +11,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #define CONFIG_MXC_UART_BASE	UART1_BASE | #define CONFIG_MXC_UART_BASE	UART1_BASE | ||||||
| 
 | 
 | ||||||
| /* MMC Configs */ | /* MMC Configs */ | ||||||
|  |  | ||||||
|  | @ -11,8 +11,6 @@ | ||||||
| 
 | 
 | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| /* USB Configs */ | /* USB Configs */ | ||||||
| #define CONFIG_MXC_USB_PORT	1 | #define CONFIG_MXC_USB_PORT	1 | ||||||
| #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW) | #define CONFIG_MXC_USB_PORTSC	(PORT_PTS_UTMI | PORT_PTS_PTW) | ||||||
|  |  | ||||||
|  | @ -27,8 +27,6 @@ | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| #include <asm/mach-imx/gpio.h> | #include <asm/mach-imx/gpio.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| /* Miscellaneous configurable options */ | /* Miscellaneous configurable options */ | ||||||
| #define CONFIG_SYS_CBSIZE	512 | #define CONFIG_SYS_CBSIZE	512 | ||||||
| #define CONFIG_SYS_MAXARGS	32 | #define CONFIG_SYS_MAXARGS	32 | ||||||
|  |  | ||||||
|  | @ -17,7 +17,6 @@ | ||||||
| #define CONFIG_MXC_GPT_HCLK | #define CONFIG_MXC_GPT_HCLK | ||||||
| #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ | #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ | ||||||
| #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK | #define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_BOOTM_LEN	0x1000000 | #define CONFIG_SYS_BOOTM_LEN	0x1000000 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -10,8 +10,6 @@ | ||||||
| #ifndef __CONFIG_H | #ifndef __CONFIG_H | ||||||
| #define __CONFIG_H | #define __CONFIG_H | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| 
 | 
 | ||||||
| /* U-Boot environment */ | /* U-Boot environment */ | ||||||
|  |  | ||||||
|  | @ -11,8 +11,6 @@ | ||||||
| #include <asm/arch/imx-regs.h> | #include <asm/arch/imx-regs.h> | ||||||
| #include <linux/stringify.h> | #include <linux/stringify.h> | ||||||
| 
 | 
 | ||||||
| #define CONFIG_SYS_FSL_CLK |  | ||||||
| 
 |  | ||||||
| /* NAND support */ | /* NAND support */ | ||||||
| 
 | 
 | ||||||
| #ifdef CONFIG_CMD_NAND | #ifdef CONFIG_CMD_NAND | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue