V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

powerpc: B4860QDS: Remove macro CONFIG_B4860QDS 

Use CONFIG_TARGET_B4860QDS instead.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-18 11:47:35 -08:00
parent 3006ebc37e
commit d46a4a1378
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/cpu/mpc85xx/cmd_errata.c
View File

@ -323,7 +323,8 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (IS_SVR_REV(svr, 1, 0)) if (IS_SVR_REV(svr, 1, 0))
puts("Work-around for Erratum A-008044 enabled\n"); puts("Work-around for Erratum A-008044 enabled\n");
#endif #endif
#if defined(CONFIG_SYS_FSL_B4860QDS_XFI_ERR) && defined(CONFIG_B4860QDS) #if defined(CONFIG_SYS_FSL_B4860QDS_XFI_ERR) && \
(defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS))
puts("Work-around for Erratum XFI on B4860QDS enabled\n"); puts("Work-around for Erratum XFI on B4860QDS enabled\n");
#endif #endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A009663 #ifdef CONFIG_SYS_FSL_ERRATUM_A009663

5
arch/powerpc/include/asm/fsl_secure_boot.h
View File

@ -25,7 +25,8 @@
#endif #endif
#define CONFIG_SYS_PBI_FLASH_WINDOW 0xcff80000 #define CONFIG_SYS_PBI_FLASH_WINDOW 0xcff80000
#if defined(CONFIG_B4860QDS) || \ #if defined(CONFIG_TARGET_B4860QDS) || \
defined(CONFIG_TARGET_B4420QDS) || \
defined(CONFIG_T4240QDS) || \ defined(CONFIG_T4240QDS) || \
defined(CONFIG_T2080QDS) || \ defined(CONFIG_T2080QDS) || \
defined(CONFIG_T2080RDB) || \ defined(CONFIG_T2080RDB) || \
@ -134,7 +135,7 @@
/* The bootscript header address is different for B4860 because the NOR /* The bootscript header address is different for B4860 because the NOR
* mapping is different on B4 due to reduced NOR size. * mapping is different on B4 due to reduced NOR size.
*/ */
#if defined(CONFIG_B4860QDS) #if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS)
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0xecc00000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xecc00000
#elif defined(CONFIG_FSL_CORENET) #elif defined(CONFIG_FSL_CORENET)
#define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000

3
board/freescale/b4860qds/Makefile
View File

@ -8,7 +8,8 @@ ifdef CONFIG_SPL_BUILD
obj-y += spl.o obj-y += spl.o
else else
obj-y += b4860qds.o obj-y += b4860qds.o
obj-$(CONFIG_B4860QDS) += eth_b4860qds.o obj-$(CONFIG_TARGET_B4860QDS) += eth_b4860qds.o
obj-$(CONFIG_TARGET_B4420QDS) += eth_b4860qds.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
endif endif

7
drivers/net/fm/b4860.c
View File

@ -47,7 +47,7 @@ void fman_enable_port(enum fm_port port)
phy_interface_t fman_port_enet_if(enum fm_port port) phy_interface_t fman_port_enet_if(enum fm_port port)
{ {
#if defined(CONFIG_B4860QDS) #if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS)
u32 serdes2_prtcl; u32 serdes2_prtcl;
char buffer[HWCONFIG_BUFFER_SIZE]; char buffer[HWCONFIG_BUFFER_SIZE];
char *buf = NULL; char *buf = NULL;
@ -60,7 +60,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
/*B4860 has two 10Gig Mac*/ /*B4860 has two 10Gig Mac*/
if ((port == FM1_10GEC1 || port == FM1_10GEC2) && if ((port == FM1_10GEC1 || port == FM1_10GEC2) &&
((is_serdes_configured(XAUI_FM1_MAC9)) || ((is_serdes_configured(XAUI_FM1_MAC9)) ||
#if !defined(CONFIG_B4860QDS) #if (!defined(CONFIG_TARGET_B4860QDS) && \
!defined(CONFIG_TARGET_B4R420QDS))
(is_serdes_configured(XFI_FM1_MAC9)) || (is_serdes_configured(XFI_FM1_MAC9)) ||
(is_serdes_configured(XFI_FM1_MAC10)) || (is_serdes_configured(XFI_FM1_MAC10)) ||
#endif #endif
@ -68,7 +69,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
)) ))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
#if defined(CONFIG_B4860QDS) #if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS)
serdes2_prtcl = in_be32(&gur->rcwsr[4]) & serdes2_prtcl = in_be32(&gur->rcwsr[4]) &
FSL_CORENET2_RCWSR4_SRDS2_PRTCL; FSL_CORENET2_RCWSR4_SRDS2_PRTCL;

2
include/configs/B4860QDS.h
View File

@ -10,8 +10,6 @@
/* /*
* B4860 QDS board configuration file * B4860 QDS board configuration file
*/ */
#define CONFIG_B4860QDS
#ifdef CONFIG_RAMBOOT_PBL #ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg #define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg
#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg

1
scripts/config_whitelist.txt
View File

@ -291,7 +291,6 @@ CONFIG_AUTOCALIB
CONFIG_AUTONEG_TIMEOUT CONFIG_AUTONEG_TIMEOUT
CONFIG_AUTO_COMPLETE CONFIG_AUTO_COMPLETE
CONFIG_AUTO_ZRELADDR CONFIG_AUTO_ZRELADDR
CONFIG_B4860QDS
CONFIG_BACKSIDE_L2_CACHE CONFIG_BACKSIDE_L2_CACHE
CONFIG_BAMBOO CONFIG_BAMBOO
CONFIG_BAMBOO_NAND CONFIG_BAMBOO_NAND