diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-16 21:30:06 (GMT) |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-24 07:42:07 (GMT) |
| commit | 7601686c6039cde149086986dd2bc7e8e83b6b07 (patch) | |
| tree | ac19fb7d20d6e668eacbe399c39b6d6c60438e59 /board | |
| parent | 7d5f9f84f1767c5f9669d9db7fbbb825623b67a3 (diff) | |
| download | u-boot-7601686c6039cde149086986dd2bc7e8e83b6b07.tar.xz | |
powerpc: P1010RDB: Remove macros CONFIG_P1010RDB_PA and CONFIG_P1010RDB_PB
Remove CONFIG_P1010RDB_PA and CONFIG_P1010RDB_PB and split TARGET_P1010RDB
to TARGET_P1010RDB_PA and TARGET_P1010RDB_PB in Kconfig.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/p1010rdb/Kconfig | 2 | ||||
| -rw-r--r-- | board/freescale/p1010rdb/p1010rdb.c | 20 | ||||
| -rw-r--r-- | board/freescale/p1010rdb/spl.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/board/freescale/p1010rdb/Kconfig b/board/freescale/p1010rdb/Kconfig index b0a7a8d..159bcc4 100644 --- a/board/freescale/p1010rdb/Kconfig +++ b/board/freescale/p1010rdb/Kconfig @@ -1,4 +1,4 @@ -if TARGET_P1010RDB +if TARGET_P1010RDB_PA || TARGET_P1010RDB_PB config SYS_BOARD default "p1010rdb" diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 8eecb06..65bb575 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -54,7 +54,7 @@ static uint sd_ifc_mux; struct cpld_data { u8 cpld_ver; /* cpld revision */ -#if defined(CONFIG_P1010RDB_PA) +#if defined(CONFIG_TARGET_P1010RDB_PA) u8 pcba_ver; /* pcb revision number */ u8 twindie_ddr3; u8 res1[6]; @@ -69,7 +69,7 @@ struct cpld_data { u8 por1; /* POR Options */ u8 por2; /* POR Options */ u8 por3; /* POR Options */ -#elif defined(CONFIG_P1010RDB_PB) +#elif defined(CONFIG_TARGET_P1010RDB_PB) u8 rom_loc; #endif }; @@ -135,7 +135,7 @@ int config_board_mux(int ctrl_type) ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); u8 tmp; -#if defined(CONFIG_P1010RDB_PA) +#if defined(CONFIG_TARGET_P1010RDB_PA) struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); switch (ctrl_type) { @@ -171,7 +171,7 @@ int config_board_mux(int ctrl_type) default: break; } -#elif defined(CONFIG_P1010RDB_PB) +#elif defined(CONFIG_TARGET_P1010RDB_PB) uint orig_bus = i2c_get_bus_num(); i2c_set_bus_num(I2C_PCA9557_BUS_NUM); @@ -245,7 +245,7 @@ int config_board_mux(int ctrl_type) return 0; } -#ifdef CONFIG_P1010RDB_PB +#ifdef CONFIG_TARGET_P1010RDB_PB int i2c_pca9557_read(int type) { u8 val; @@ -275,9 +275,9 @@ int checkboard(void) u8 val; cpu = gd->arch.cpu; -#if defined(CONFIG_P1010RDB_PA) +#if defined(CONFIG_TARGET_P1010RDB_PA) printf("Board: %sRDB-PA, ", cpu->name); -#elif defined(CONFIG_P1010RDB_PB) +#elif defined(CONFIG_TARGET_P1010RDB_PB) printf("Board: %sRDB-PB, ", cpu->name); i2c_set_bus_num(I2C_PCA9557_BUS_NUM); i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_FSL_I2C_SLAVE); @@ -290,10 +290,10 @@ int checkboard(void) config_board_mux(MUX_TYPE_IFC); #endif -#if defined(CONFIG_P1010RDB_PA) +#if defined(CONFIG_TARGET_P1010RDB_PA) val = (in_8(&cpld_data->pcba_ver) & 0xf); printf("PCB: v%x.0\n", val); -#elif defined(CONFIG_P1010RDB_PB) +#elif defined(CONFIG_TARGET_P1010RDB_PB) val = in_8(&cpld_data->cpld_ver); printf("CPLD: v%x.%x, ", val >> 4, val & 0xf); printf("PCB: v%x.0, ", i2c_pca9557_read(I2C_READ_PCB_VER)); @@ -544,7 +544,7 @@ int misc_init_r(void) else if (hwconfig("ifc")) config_board_mux(MUX_TYPE_IFC); -#ifdef CONFIG_P1010RDB_PB +#ifdef CONFIG_TARGET_P1010RDB_PB setbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_GPIO01_DRVVBUS); #endif return 0; diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c index 9844194..c22e215 100644 --- a/board/freescale/p1010rdb/spl.c +++ b/board/freescale/p1010rdb/spl.c @@ -32,7 +32,7 @@ void board_init_f(ulong bootflag) /* Clock configuration to access CPLD using IFC(GPCM) */ setbits_be32(&ifc.gregs->ifc_gcr, 1 << IFC_GCR_TBCTL_TRN_TIME_SHIFT); -#ifdef CONFIG_P1010RDB_PB +#ifdef CONFIG_TARGET_P1010RDB_PB setbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_GPIO01_DRVVBUS); #endif |