1
0
Fork 0

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>
utp
Gong Qianyu 2015-10-26 19:47:42 +08:00 committed by York Sun
parent 5757e06c69
commit 18fb0e3cae
43 changed files with 25 additions and 41 deletions

View File

@ -806,7 +806,7 @@ static init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_BOARD_POSTCLK_INIT) #if defined(CONFIG_BOARD_POSTCLK_INIT)
board_postclk_init, board_postclk_init,
#endif #endif
#ifdef CONFIG_FSL_CLK #ifdef CONFIG_SYS_FSL_CLK
get_clocks, get_clocks,
#endif #endif
#ifdef CONFIG_M68K #ifdef CONFIG_M68K

View File

@ -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.

View File

@ -17,7 +17,6 @@
#define CONFIG_BSC9132 #define CONFIG_BSC9132
#endif #endif
#define CONFIG_FSL_CLK
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
#ifdef CONFIG_SDCARD #ifdef CONFIG_SDCARD

View File

@ -10,7 +10,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
/* /*
* High Level Configuration Options * High Level Configuration Options

View File

@ -9,7 +9,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
/* /*
* High Level Configuration Options * High Level Configuration Options

View File

@ -16,7 +16,6 @@
#define CONFIG_MPC837x 1 /* MPC837x CPU specific */ #define CONFIG_MPC837x 1 /* MPC837x CPU specific */
#define CONFIG_MPC837XERDB 1 #define CONFIG_MPC837XERDB 1
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#define CONFIG_SYS_TEXT_BASE 0xFE000000 #define CONFIG_SYS_TEXT_BASE 0xFE000000

View File

@ -12,7 +12,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"
#ifdef CONFIG_36BIT #ifdef CONFIG_36BIT

View File

@ -12,7 +12,6 @@
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_BOOKE 1 /* BOOKE */
#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_E500 1 /* BOOKE e500 family */

View File

@ -15,7 +15,6 @@
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#endif #endif
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#define CONFIG_P1010 #define CONFIG_P1010
#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_E500 /* BOOKE e500 family */

View File

@ -12,7 +12,6 @@
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#ifdef CONFIG_36BIT #ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT

View File

@ -15,7 +15,6 @@
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_PPC_P2041 #define CONFIG_PPC_P2041
#define CONFIG_FSL_CLK
#ifdef CONFIG_RAMBOOT_PBL #ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE

View File

@ -20,7 +20,6 @@
#define CONFIG_MP /* support multiple processors */ #define CONFIG_MP /* support multiple processors */
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_ENABLE_36BIT_PHYS #define CONFIG_ENABLE_36BIT_PHYS
#define CONFIG_FSL_CLK
#ifdef CONFIG_PHYS_64BIT #ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP 1 #define CONFIG_ADDR_MAP 1

View File

@ -20,7 +20,6 @@
#define CONFIG_MP /* support multiple processors */ #define CONFIG_MP /* support multiple processors */
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_ENABLE_36BIT_PHYS #define CONFIG_ENABLE_36BIT_PHYS
#define CONFIG_FSL_CLK
#ifdef CONFIG_PHYS_64BIT #ifdef CONFIG_PHYS_64BIT
#define CONFIG_ADDR_MAP 1 #define CONFIG_ADDR_MAP 1

View File

@ -29,7 +29,6 @@
#define CONFIG_T1040QDS #define CONFIG_T1040QDS
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#ifdef CONFIG_RAMBOOT_PBL #ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE

View File

@ -13,7 +13,6 @@
#define CONFIG_T104xRDB #define CONFIG_T104xRDB
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_E500 /* BOOKE e500 family */
#include <asm/config_mpc85xx.h> #include <asm/config_mpc85xx.h>

View File

@ -13,7 +13,6 @@
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
#define CONFIG_FSL_CLK
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#if defined(CONFIG_PPC_T2080) #if defined(CONFIG_PPC_T2080)

View File

@ -14,7 +14,6 @@
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_T2080RDB #define CONFIG_T2080RDB
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
#define CONFIG_FSL_CLK
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2

View File

@ -12,7 +12,6 @@
#define CONFIG_T4240QDS #define CONFIG_T4240QDS
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_FSL_CLK
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#define CONFIG_PCIE4 #define CONFIG_PCIE4

View File

@ -13,7 +13,6 @@
#define CONFIG_T4240RDB #define CONFIG_T4240RDB
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#define CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA_V2
#define CONFIG_PCIE4 #define CONFIG_PCIE4

View File

@ -15,7 +15,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#define CONFIG_FSL_ELBC #define CONFIG_FSL_ELBC
#define CONFIG_PCI #define CONFIG_PCI

View File

@ -18,7 +18,7 @@
#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_THUMB_BUILD
#define CONFIG_USE_ARCH_MEMCPY #define CONFIG_USE_ARCH_MEMCPY
#define CONFIG_USE_ARCH_MEMSET #define CONFIG_USE_ARCH_MEMSET
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_ARCH_MISC_INIT #define CONFIG_ARCH_MISC_INIT
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO

View File

@ -44,7 +44,6 @@
#define CONFIG_P1022 #define CONFIG_P1022
#define CONFIG_CONTROLCENTERD #define CONFIG_CONTROLCENTERD
#define CONFIG_MP /* support multiple processors */ #define CONFIG_MP /* support multiple processors */
#define CONFIG_FSL_CLK
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH

View File

@ -11,7 +11,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"

View File

@ -23,7 +23,6 @@
#define CONFIG_IDENT_STRING " hrcon 0.01" #define CONFIG_IDENT_STRING " hrcon 0.01"
#define CONFIG_FSL_CLK
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_LAST_STAGE_INIT #define CONFIG_LAST_STAGE_INIT

View File

@ -11,7 +11,7 @@
#define CONFIG_ARMV7_PSCI #define CONFIG_ARMV7_PSCI
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO

View File

@ -11,7 +11,7 @@
#define CONFIG_ARMV7_PSCI #define CONFIG_ARMV7_PSCI
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO

View File

@ -16,7 +16,7 @@ unsigned long get_board_sys_clk(void);
unsigned long get_board_ddr_clk(void); unsigned long get_board_ddr_clk(void);
#endif #endif
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_SYS_CLK_FREQ get_board_sys_clk()
#define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk()
#define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4)

View File

@ -18,7 +18,7 @@
unsigned long get_board_sys_clk(void); unsigned long get_board_sys_clk(void);
#endif #endif
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_SYS_CLK_FREQ get_board_sys_clk()
#define CONFIG_DDR_CLK_FREQ 133333333 #define CONFIG_DDR_CLK_FREQ 133333333
#define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4) #define COUNTER_FREQUENCY_REAL (CONFIG_SYS_CLK_FREQ/4)

View File

@ -17,7 +17,7 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_FIT #define CONFIG_FIT

View File

@ -14,7 +14,7 @@
#define CONFIG_MX25 #define CONFIG_MX25
#define CONFIG_SYS_TEXT_BASE 0x81200000 #define CONFIG_SYS_TEXT_BASE 0x81200000
#define CONFIG_MXC_GPIO #define CONFIG_MXC_GPIO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_RATE 32768
#define CONFIG_SYS_TIMER_COUNTER \ #define CONFIG_SYS_TIMER_COUNTER \

View File

@ -19,7 +19,7 @@
#define CONFIG_MX35 #define CONFIG_MX35
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
/* Set TEXT at the beginning of the NOR flash */ /* Set TEXT at the beginning of the NOR flash */
#define CONFIG_SYS_TEXT_BASE 0xA0000000 #define CONFIG_SYS_TEXT_BASE 0xA0000000

View File

@ -18,7 +18,7 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_TEXT_BASE 0x97800000 #define CONFIG_SYS_TEXT_BASE 0x97800000
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>

View File

@ -23,7 +23,7 @@
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)

View File

@ -23,7 +23,7 @@
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT

View File

@ -22,7 +22,7 @@
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

View File

@ -23,7 +23,7 @@
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)

View File

@ -45,7 +45,7 @@
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
/* ATAGs */ /* ATAGs */
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG

View File

@ -21,6 +21,7 @@
#define CONFIG_MXC_GPT_HCLK #define CONFIG_MXC_GPT_HCLK
#define CONFIG_SYSCOUNTER_TIMER #define CONFIG_SYSCOUNTER_TIMER
#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
#define CONFIG_SYS_FSL_CLK
/* Enable iomux-lpsr support */ /* Enable iomux-lpsr support */
#define CONFIG_IOMUX_LPSR #define CONFIG_IOMUX_LPSR

View File

@ -11,7 +11,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#ifdef CONFIG_36BIT #ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT

View File

@ -11,7 +11,6 @@
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK
#if defined(CONFIG_TWR_P1025) #if defined(CONFIG_TWR_P1025)
#define CONFIG_BOARDNAME "TWR-P1025" #define CONFIG_BOARDNAME "TWR-P1025"
#define CONFIG_P1025 #define CONFIG_P1025

View File

@ -14,7 +14,7 @@
#define CONFIG_MX53 #define CONFIG_MX53
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT
#define CONFIG_MXC_GPIO #define CONFIG_MXC_GPIO

View File

@ -15,7 +15,7 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_MACH_TYPE 4146 #define CONFIG_MACH_TYPE 4146

View File

@ -16,7 +16,7 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_MX35 #define CONFIG_MX35
#define CONFIG_MX35_HCLK_FREQ 24000000 #define CONFIG_MX35_HCLK_FREQ 24000000
#define CONFIG_FSL_CLK #define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_DCACHE_OFF #define CONFIG_SYS_DCACHE_OFF
#define CONFIG_SYS_CACHELINE_SIZE 32 #define CONFIG_SYS_CACHELINE_SIZE 32