powerpc: B4860QDS: Remove macro CONFIG_B4860QDS

Use CONFIG_TARGET_B4860QDS instead.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index d31193467714a4fa127794e6ecb17f45653cbdd4..402a1ff33c6936808e8c8da2c2ffa52f20c1eff2 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -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))
                puts("Work-around for Erratum A-008044 enabled\n");
 #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");
 #endif
 #ifdef CONFIG_SYS_FSL_ERRATUM_A009663

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 7de554ac304d096d5eb94bb442a389135546ae71..d0fef32de5b5892a85c99b022cd3258165a7fdb8 100644 (file)
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -25,7 +25,8 @@
 #endif
 #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_T2080QDS) || \
        defined(CONFIG_T2080RDB) || \
@@ -134,7 +135,7 @@
 /* The bootscript header address is different for B4860 because the NOR
  * 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
 #elif defined(CONFIG_FSL_CORENET)
 #define CONFIG_BOOTSCRIPT_HDR_ADDR     0xe8e00000

diff --git a/board/freescale/b4860qds/Makefile b/board/freescale/b4860qds/Makefile
index 673d2ea56ae5a1e62bb296982f4c4ff1f1cf2f5a..c032242f229a2642504a72be4d9c0b44c85a7dc5 100644 (file)
--- a/board/freescale/b4860qds/Makefile
+++ b/board/freescale/b4860qds/Makefile
@@ -8,7 +8,8 @@ ifdef CONFIG_SPL_BUILD
 obj-y  += spl.o
 else
 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
 endif
 

diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index eb058c9c3d6d26a905a49a7895b22baf1e32fd9f..5aeeb872824826b4c5fb8a243487d604e1e6c453 100644 (file)
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -47,7 +47,7 @@ void fman_enable_port(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;
        char buffer[HWCONFIG_BUFFER_SIZE];
        char *buf = NULL;
@@ -60,7 +60,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
        /*B4860 has two 10Gig Mac*/
        if ((port == FM1_10GEC1 || port == FM1_10GEC2)  &&
            ((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_MAC10))      ||
             #endif
@@ -68,7 +69,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
             ))
                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]) &
                        FSL_CORENET2_RCWSR4_SRDS2_PRTCL;
 

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 66000d204ba8a2f3082c1dbbd5093101182fee74..a1468b87ac5ffa88e15adf5852be96891db49057 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -10,8 +10,6 @@
 /*
  * B4860 QDS board configuration file
  */
-#define CONFIG_B4860QDS
-
 #ifdef CONFIG_RAMBOOT_PBL
 #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

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b3ab977a63ef16eb0ac86eb55dd4e29b4fa06edc..4e77f7078a4b84534a2812c9610aa4ba0362d68c 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -291,7 +291,6 @@ CONFIG_AUTOCALIB
 CONFIG_AUTONEG_TIMEOUT
 CONFIG_AUTO_COMPLETE
 CONFIG_AUTO_ZRELADDR
-CONFIG_B4860QDS
 CONFIG_BACKSIDE_L2_CACHE
 CONFIG_BAMBOO
 CONFIG_BAMBOO_NAND