common/board_f.c: change the macro name and remove it for PPC platforms

For most PPC platforms, they will call the first get_clocks() in init_sequence_f[] as they define CONFIG_PPC. CONFIG_SYS_FSL_CLK is then defined to call the second get_clocks(), which should be redundant for PPC. Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
9 years ago · 18fb0e3cae
parent 5757e06c69
commit 18fb0e3cae
43 changed files with 25 additions and 41 deletions
--- a/common/board_f.c
+++ b/common/board_f.c
@ -806,7 +806,7 @@ static init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_BOARD_POSTCLK_INIT)
 	board_postclk_init,
 #endif
-#ifdef CONFIG_FSL_CLK
+#ifdef CONFIG_SYS_FSL_CLK
 	get_clocks,
 #endif
 #ifdef CONFIG_M68K
--- a/doc/README.fsl-clk
+++ b/doc/README.fsl-clk
@ -0,0 +1,6 @@
+Freescale system clock options
+
+	- CONFIG_SYS_FSL_CLK
+		Enable to call get_clocks() in board_init_f() for
+		non-PPC platforms and PCC 8xx platforms such as
+		TQM866M and TQM885D.
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@ -17,7 +17,6 @@
 #define CONFIG_BSC9132
 #endif

-#define CONFIG_FSL_CLK
 #define CONFIG_MISC_INIT_R

 #ifdef CONFIG_SDCARD
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@ -10,7 +10,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 /*
 * High Level Configuration Options
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@ -9,7 +9,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 /*
 * High Level Configuration Options
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@ -16,7 +16,6 @@
 #define CONFIG_MPC837x		1 /* MPC837x CPU specific */
 #define CONFIG_MPC837XERDB	1
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #define	CONFIG_SYS_TEXT_BASE	0xFE000000

--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@ -12,7 +12,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK
 #include "../board/freescale/common/ics307_clk.h"

 #ifdef CONFIG_36BIT
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@ -12,7 +12,6 @@

 #define CONFIG_DISPLAY_BOARDINFO

-#define CONFIG_FSL_CLK
 /* High Level Configuration Options */
 #define CONFIG_BOOKE		1	/* BOOKE */
 #define CONFIG_E500		1	/* BOOKE e500 family */
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@ -15,7 +15,6 @@
 #define CONFIG_PHYS_64BIT
 #endif
 #define	CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #define CONFIG_P1010
 #define CONFIG_E500			/* BOOKE e500 family */
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@ -12,7 +12,6 @@
 #include "../board/freescale/common/ics307_clk.h"

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_36BIT
 #define CONFIG_PHYS_64BIT
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@ -15,7 +15,6 @@
 #define CONFIG_PHYS_64BIT
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_PPC_P2041
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@ -20,7 +20,6 @@
 #define CONFIG_MP			/* support multiple processors */
 #define CONFIG_PHYS_64BIT
 #define CONFIG_ENABLE_36BIT_PHYS
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_PHYS_64BIT
 #define CONFIG_ADDR_MAP		1
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@ -20,7 +20,6 @@
 #define CONFIG_MP			/* support multiple processors */
 #define CONFIG_PHYS_64BIT
 #define CONFIG_ENABLE_36BIT_PHYS
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_PHYS_64BIT
 #define CONFIG_ADDR_MAP		1
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@ -29,7 +29,6 @@
 #define CONFIG_T1040QDS
 #define CONFIG_PHYS_64BIT
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@ -13,7 +13,6 @@
 #define CONFIG_T104xRDB
 #define CONFIG_PHYS_64BIT
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #define CONFIG_E500			/* BOOKE e500 family */
 #include <asm/config_mpc85xx.h>
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@ -13,7 +13,6 @@

 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
-#define CONFIG_FSL_CLK
 #define CONFIG_MMC
 #define CONFIG_USB_EHCI
 #if defined(CONFIG_PPC_T2080)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@ -14,7 +14,6 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_T2080RDB
 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
-#define CONFIG_FSL_CLK
 #define CONFIG_MMC
 #define CONFIG_USB_EHCI
 #define CONFIG_FSL_SATA_V2
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@ -12,7 +12,6 @@

 #define CONFIG_T4240QDS
 #define CONFIG_PHYS_64BIT
-#define CONFIG_FSL_CLK

 #define CONFIG_FSL_SATA_V2
 #define CONFIG_PCIE4
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@ -13,7 +13,6 @@
 #define CONFIG_T4240RDB
 #define CONFIG_PHYS_64BIT
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #define CONFIG_FSL_SATA_V2
 #define CONFIG_PCIE4
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@ -15,7 +15,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #define CONFIG_FSL_ELBC
 #define CONFIG_PCI
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@ -18,7 +18,7 @@
 #define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_USE_ARCH_MEMCPY
 #define CONFIG_USE_ARCH_MEMSET
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_DISPLAY_CPUINFO
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@ -44,7 +44,6 @@
 #define CONFIG_P1022
 #define CONFIG_CONTROLCENTERD
 #define CONFIG_MP			/* support multiple processors */
-#define CONFIG_FSL_CLK


 #define CONFIG_SYS_NO_FLASH
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@ -11,7 +11,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #include "../board/freescale/common/ics307_clk.h"

--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@ -23,7 +23,6 @@
 #define CONFIG_IDENT_STRING	" hrcon 0.01"


-#define CONFIG_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@ -11,7 +11,7 @@

 #define CONFIG_ARMV7_PSCI

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@ -11,7 +11,7 @@

 #define CONFIG_ARMV7_PSCI

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@ -16,7 +16,7 @@ unsigned long get_board_sys_clk(void);
 unsigned long get_board_ddr_clk(void);
 #endif

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK
 #define CONFIG_SYS_CLK_FREQ		get_board_sys_clk()
 #define CONFIG_DDR_CLK_FREQ		get_board_ddr_clk()
 #define COUNTER_FREQUENCY_REAL		(CONFIG_SYS_CLK_FREQ/4)
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@ -18,7 +18,7 @@
 unsigned long get_board_sys_clk(void);
 #endif

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK
 #define CONFIG_SYS_CLK_FREQ		get_board_sys_clk()
 #define CONFIG_DDR_CLK_FREQ		133333333
 #define COUNTER_FREQUENCY_REAL		(CONFIG_SYS_CLK_FREQ/4)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@ -17,7 +17,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_REVISION_TAG
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_FIT

--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@ -14,7 +14,7 @@
 #define CONFIG_MX25
 #define CONFIG_SYS_TEXT_BASE		0x81200000
 #define CONFIG_MXC_GPIO
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_SYS_TIMER_RATE		32768
 #define CONFIG_SYS_TIMER_COUNTER	\
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@ -19,7 +19,7 @@
 #define CONFIG_MX35

 #define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 /* Set TEXT at the beginning of the NOR flash */
 #define CONFIG_SYS_TEXT_BASE	0xA0000000
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@ -18,7 +18,7 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK
 #define CONFIG_SYS_TEXT_BASE	0x97800000

 #include <asm/arch/imx-regs.h>
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@ -23,7 +23,7 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@ -23,7 +23,7 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_OF_LIBFDT

--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@ -22,7 +22,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(10 * 1024 * 1024)
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@ -23,7 +23,7 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG

-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@ -45,7 +45,7 @@

 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 /* ATAGs */
 #define CONFIG_CMDLINE_TAG
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@ -21,6 +21,7 @@
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SYSCOUNTER_TIMER
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CONFIG_SYS_FSL_CLK

 /* Enable iomux-lpsr support */
 #define CONFIG_IOMUX_LPSR
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@ -11,7 +11,6 @@
 #define __CONFIG_H

 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK

 #ifdef CONFIG_36BIT
 #define CONFIG_PHYS_64BIT
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@ -11,7 +11,6 @@
 #define __CONFIG_H

 #define	CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK
 #if defined(CONFIG_TWR_P1025)
 #define CONFIG_BOARDNAME "TWR-P1025"
 #define CONFIG_P1025
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@ -14,7 +14,7 @@
 #define CONFIG_MX53
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_OF_LIBFDT
 #define CONFIG_MXC_GPIO
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@ -15,7 +15,7 @@

 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_MACH_TYPE		4146

--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@ -16,7 +16,7 @@
 /* High Level Configuration Options */
 #define CONFIG_MX35
 #define CONFIG_MX35_HCLK_FREQ	24000000
-#define CONFIG_FSL_CLK
+#define CONFIG_SYS_FSL_CLK

 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_CACHELINE_SIZE	32