diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:05:38 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:10 -0800 |
| commit | 4167a67d5dfae995740bf5b7a7061756d8d985ad (patch) | |
| tree | 5571bfaef6100b3836853d82dfde9235de22eef4 /arch/powerpc/cpu/mpc85xx | |
| parent | 52b6f13d2c9c69d2841572e10515880bc59fed48 (diff) | |
| download | u-boot-4167a67d5dfae995740bf5b7a7061756d8d985ad.tar.gz | |
powerpc: P1025: Remove macro CONFIG_P1025
Replace CONFIG_P1025 with ARCH_P1025 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 | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/speed.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 62c0dec48a..90777db968 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -156,6 +156,7 @@ config TARGET_P1025RDB bool "Support P1025RDB" select SUPPORT_SPL select SUPPORT_TPL + select ARCH_P1025 config TARGET_P2020RDB bool "Support P2020RDB-PC" @@ -164,6 +165,7 @@ config TARGET_P2020RDB config TARGET_P1_TWR bool "Support p1_twr" + select ARCH_P1025 config TARGET_P2041RDB bool "Support P2041RDB" @@ -301,6 +303,9 @@ config ARCH_P1023 config ARCH_P1024 bool +config ARCH_P1025 + 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 239cf414fd..a3fba03741 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -79,7 +79,7 @@ obj-$(CONFIG_ARCH_P1021) += p1021_serdes.o obj-$(CONFIG_ARCH_P1022) += p1022_serdes.o obj-$(CONFIG_ARCH_P1023) += p1023_serdes.o obj-$(CONFIG_ARCH_P1024) += p1021_serdes.o -obj-$(CONFIG_P1025) += p1021_serdes.o +obj-$(CONFIG_ARCH_P1025) += p1021_serdes.o obj-$(CONFIG_P2010) += p2020_serdes.o obj-$(CONFIG_P2020) += p2020_serdes.o obj-$(CONFIG_PPC_P2041) += p2041_serdes.o diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 8155620edb..38a28a83df 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -596,7 +596,7 @@ void get_sys_info(sys_info_t *sys_info) #endif #ifdef CONFIG_QE -#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_P1025) +#if defined(CONFIG_ARCH_P1021) || defined(CONFIG_ARCH_P1025) sys_info->freq_qe = sys_info->freq_systembus; #else qe_ratio = ((gur->porpllsr) & MPC85xx_PORPLLSR_QE_RATIO) |