diff options
author | York Sun <york.sun@nxp.com> | 2016-11-18 13:01:34 -0800 |
---|---|---|
committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:13 -0800 |
commit | e5d5f5a8be964c4a3ffc84fd99762736db96c27a (patch) | |
tree | 45083d313bcb7e36a76830cf7da17c725dd6ac52 /arch/powerpc/cpu/mpc85xx | |
parent | 6f53bd475a0f9917fff4cdb72a40767c1176b42f (diff) | |
download | u-boot-imx-e5d5f5a8be964c4a3ffc84fd99762736db96c27a.zip u-boot-imx-e5d5f5a8be964c4a3ffc84fd99762736db96c27a.tar.gz u-boot-imx-e5d5f5a8be964c4a3ffc84fd99762736db96c27a.tar.bz2 |
powerpc: T1024: Remove macro CONFIG_PPC_T1024
Replace CONFIG_PPC_T1024 with ARCH_T1024 in Kconfig and clean up
existing macros.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8e5461b..48447c9 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -191,6 +191,7 @@ config TARGET_QEMU_PPCE500 config TARGET_T1024QDS bool "Support T1024QDS" + select ARCH_T1024 select SUPPORT_SPL select PHYS_64BIT @@ -202,6 +203,7 @@ config TARGET_T1023RDB config TARGET_T1024RDB bool "Support T1024RDB" + select ARCH_T1024 select SUPPORT_SPL select PHYS_64BIT @@ -358,6 +360,9 @@ config ARCH_QEMU_E500 config ARCH_T1023 bool +config ARCH_T1024 + bool + source "board/freescale/b4860qds/Kconfig" source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9132qds/Kconfig" diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index 8988af1..574259c 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_PPC_T1042) += t1040_ids.o obj-$(CONFIG_PPC_T1020) += t1040_ids.o obj-$(CONFIG_PPC_T1022) += t1040_ids.o obj-$(CONFIG_ARCH_T1023) += t1024_ids.o -obj-$(CONFIG_PPC_T1024) += t1024_ids.o +obj-$(CONFIG_ARCH_T1024) += t1024_ids.o obj-$(CONFIG_PPC_T2080) += t2080_ids.o obj-$(CONFIG_PPC_T2081) += t2080_ids.o @@ -97,7 +97,7 @@ obj-$(CONFIG_PPC_T1042) += t1040_serdes.o obj-$(CONFIG_PPC_T1020) += t1040_serdes.o obj-$(CONFIG_PPC_T1022) += t1040_serdes.o obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o -obj-$(CONFIG_PPC_T1024) += t1024_serdes.o +obj-$(CONFIG_ARCH_T1024) += t1024_serdes.o obj-$(CONFIG_PPC_T2080) += t2080_serdes.o obj-$(CONFIG_PPC_T2081) += t2080_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index a6d5206..18333ce 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info) defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) #define FM1_CLK_SEL 0xe0000000 #define FM1_CLK_SHIFT 29 -#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) +#elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023) #define FM1_CLK_SEL 0x00000007 #define FM1_CLK_SHIFT 0 #else @@ -216,7 +216,7 @@ void get_sys_info(sys_info_t *sys_info) #define FM1_CLK_SHIFT 26 #endif #if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) -#if defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) +#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023) rcw_tmp = in_be32(&gur->rcwsr[15]) - 4; #else rcw_tmp = in_be32(&gur->rcwsr[7]); |