brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-24 21:50:30 +09:00
Code Issues Projects Releases Wiki Activity

powerpc: P1010: Remove macro CONFIG_P1010

Browse Source 
Replace CONFIG_P1010 with ARCH_P1010 in Kconfig and clean up existing
macros.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-16 13:08:52 -08:00
parent 164b2f812b
commit 7d5f9f84f1
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -96,6 +96,7 @@ config TARGET_MPC8572DS
config TARGET_P1010RDB config TARGET_P1010RDB
bool "Support P1010RDB" bool "Support P1010RDB"
select ARCH_P1010
select SUPPORT_SPL select SUPPORT_SPL
select SUPPORT_TPL select SUPPORT_TPL
@ -228,6 +229,9 @@ config ARCH_MPC8569
config ARCH_MPC8572 config ARCH_MPC8572
bool bool
config ARCH_P1010
bool
source "board/freescale/b4860qds/Kconfig" source "board/freescale/b4860qds/Kconfig"
source "board/freescale/bsc9131rdb/Kconfig" source "board/freescale/bsc9131rdb/Kconfig"
source "board/freescale/bsc9132qds/Kconfig" source "board/freescale/bsc9132qds/Kconfig"

2
arch/powerpc/cpu/mpc85xx/Makefile
View File

@ -72,7 +72,7 @@ obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o
obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o
obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o
obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
obj-$(CONFIG_P1010) += p1010_serdes.o obj-$(CONFIG_ARCH_P1010) += p1010_serdes.o
obj-$(CONFIG_P1011) += p1021_serdes.o obj-$(CONFIG_P1011) += p1021_serdes.o
obj-$(CONFIG_P1012) += p1021_serdes.o obj-$(CONFIG_P1012) += p1021_serdes.o
obj-$(CONFIG_P1013) += p1022_serdes.o obj-$(CONFIG_P1013) += p1022_serdes.o

2
arch/powerpc/cpu/mpc85xx/speed.c
View File

@ -707,7 +707,7 @@ int get_clocks (void)
#ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #ifdef CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
gd->arch.sdhc_clk = sys_info.freq_sdhc / 2; gd->arch.sdhc_clk = sys_info.freq_sdhc / 2;
#else #else
#if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_P1010) ||\ #if defined(CONFIG_ARCH_MPC8569) || defined(CONFIG_ARCH_P1010) ||\
defined(CONFIG_P1014) defined(CONFIG_P1014)
gd->arch.sdhc_clk = gd->bus_clk; gd->arch.sdhc_clk = gd->bus_clk;
#else #else

2
arch/powerpc/include/asm/config_mpc85xx.h
View File

@ -140,7 +140,7 @@
#define CONFIG_SYS_FSL_ERRATUM_A004508 #define CONFIG_SYS_FSL_ERRATUM_A004508
#define CONFIG_SYS_FSL_ERRATUM_A005125 #define CONFIG_SYS_FSL_ERRATUM_A005125
#elif defined(CONFIG_P1010) #elif defined(CONFIG_ARCH_P1010)
#define CONFIG_MAX_CPUS 1 #define CONFIG_MAX_CPUS 1
#define CONFIG_FSL_SDHC_V2_3 #define CONFIG_FSL_SDHC_V2_3
#define CONFIG_SYS_FSL_NUM_LAWS 12 #define CONFIG_SYS_FSL_NUM_LAWS 12

8
arch/powerpc/include/asm/immap_85xx.h
View File

@ -2169,7 +2169,7 @@ typedef struct ccsr_gur {
#define MPC85xx_PORDEVSR_IO_SEL 0x00600000 #define MPC85xx_PORDEVSR_IO_SEL 0x00600000
#define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21
#else #else
#if defined(CONFIG_P1010) #if defined(CONFIG_ARCH_P1010)
#define MPC85xx_PORDEVSR_IO_SEL 0x00600000 #define MPC85xx_PORDEVSR_IO_SEL 0x00600000
#define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 21
#elif defined(CONFIG_ARCH_BSC9132) #elif defined(CONFIG_ARCH_BSC9132)
@ -2181,7 +2181,7 @@ typedef struct ccsr_gur {
#else #else
#define MPC85xx_PORDEVSR_IO_SEL 0x00780000 #define MPC85xx_PORDEVSR_IO_SEL 0x00780000
#define MPC85xx_PORDEVSR_IO_SEL_SHIFT 19 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT 19
#endif /* if defined(CONFIG_P1010) */ #endif /* if defined(CONFIG_ARCH_P1010) */
#endif #endif
#define MPC85xx_PORDEVSR_PCI2_ARB 0x00040000 #define MPC85xx_PORDEVSR_PCI2_ARB 0x00040000
#define MPC85xx_PORDEVSR_PCI1_ARB 0x00020000 #define MPC85xx_PORDEVSR_PCI1_ARB 0x00020000
@ -2222,7 +2222,7 @@ typedef struct ccsr_gur {
u32 gpindr; /* General-purpose input data */ u32 gpindr; /* General-purpose input data */
u8 res5[12]; u8 res5[12];
u32 pmuxcr; /* Alt. function signal multiplex control */ u32 pmuxcr; /* Alt. function signal multiplex control */
#if defined(CONFIG_P1010) || defined(CONFIG_P1014) #if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
#define MPC85xx_PMUXCR_TSEC1_0_1588 0x40000000 #define MPC85xx_PMUXCR_TSEC1_0_1588 0x40000000
#define MPC85xx_PMUXCR_TSEC1_0_RES 0xC0000000 #define MPC85xx_PMUXCR_TSEC1_0_RES 0xC0000000
#define MPC85xx_PMUXCR_TSEC1_1_1588_TRIG 0x10000000 #define MPC85xx_PMUXCR_TSEC1_1_1588_TRIG 0x10000000
@ -2350,7 +2350,7 @@ typedef struct ccsr_gur {
#define MPC85xx_PMUXCR_SPI_GPIO 0x00000100 #define MPC85xx_PMUXCR_SPI_GPIO 0x00000100
#endif #endif
u32 pmuxcr2; /* Alt. function signal multiplex control 2 */ u32 pmuxcr2; /* Alt. function signal multiplex control 2 */
#if defined(CONFIG_P1010) || defined(CONFIG_P1014) #if defined(CONFIG_ARCH_P1010) || defined(CONFIG_P1014)
#define MPC85xx_PMUXCR2_UART_GPIO 0x40000000 #define MPC85xx_PMUXCR2_UART_GPIO 0x40000000
#define MPC85xx_PMUXCR2_UART_TDM 0x80000000 #define MPC85xx_PMUXCR2_UART_TDM 0x80000000
#define MPC85xx_PMUXCR2_UART_RES 0xC0000000 #define MPC85xx_PMUXCR2_UART_RES 0xC0000000

1
include/configs/P1010RDB.h
View File

@ -11,7 +11,6 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_P1010
#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_E500 /* BOOKE e500 family */
#include <asm/config_mpc85xx.h> #include <asm/config_mpc85xx.h>
#define CONFIG_NAND_FSL_IFC #define CONFIG_NAND_FSL_IFC

1
scripts/config_whitelist.txt
View File

@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR
CONFIG_OS_ENV_ADDR CONFIG_OS_ENV_ADDR
CONFIG_OTHBOOTARGS CONFIG_OTHBOOTARGS
CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_OVERWRITE_ETHADDR_ONCE
CONFIG_P1010
CONFIG_P1010RDB_PA CONFIG_P1010RDB_PA
CONFIG_P1010RDB_PB CONFIG_P1010RDB_PB
CONFIG_P1020 CONFIG_P1020