Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: T2081QDS: Remove macro T2081QDS

Browse source 
Use TARGET_T2081QDS from Kconfig instead.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-12-28 08:43:38 -08:00 committed by Tom Rini
parent 86e0a31321
commit 146ded4d25
5 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/freescale/t208xqds/Makefile
View file

@ -8,7 +8,7 @@ ifdef CONFIG_SPL_BUILD
obj-y += spl.o obj-y += spl.o
else else
obj-$(CONFIG_TARGET_T2080QDS) += t208xqds.o eth_t208xqds.o obj-$(CONFIG_TARGET_T2080QDS) += t208xqds.o eth_t208xqds.o
obj-$(CONFIG_T2081QDS) += t208xqds.o eth_t208xqds.o obj-$(CONFIG_TARGET_T2081QDS) += t208xqds.o eth_t208xqds.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
endif endif

16
board/freescale/t208xqds/eth_t208xqds.c
View file

@ -38,7 +38,7 @@
#define EMI1_SLOT4 4 #define EMI1_SLOT4 4
#define EMI1_SLOT5 5 #define EMI1_SLOT5 5
#define EMI2 7 #define EMI2 7
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
#define EMI1_SLOT2 3 #define EMI1_SLOT2 3
#define EMI1_SLOT3 4 #define EMI1_SLOT3 4
#define EMI1_SLOT5 5 #define EMI1_SLOT5 5
@ -68,7 +68,7 @@ static const char * const mdio_names[] = {
"T2080QDS_MDIO_SLOT5", "T2080QDS_MDIO_SLOT5",
"T2080QDS_MDIO_SLOT2", "T2080QDS_MDIO_SLOT2",
"T2080QDS_MDIO_10GC", "T2080QDS_MDIO_10GC",
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
"T2081QDS_MDIO_RGMII1", "T2081QDS_MDIO_RGMII1",
"T2081QDS_MDIO_RGMII2", "T2081QDS_MDIO_RGMII2",
"T2081QDS_MDIO_SLOT1", "T2081QDS_MDIO_SLOT1",
@ -84,7 +84,7 @@ static const char * const mdio_names[] = {
/* Map SerDes1 8 lanes to default slot, will be initialized dynamically */ /* Map SerDes1 8 lanes to default slot, will be initialized dynamically */
#if defined(CONFIG_TARGET_T2080QDS) #if defined(CONFIG_TARGET_T2080QDS)
static u8 lane_to_slot[] = {3, 3, 3, 3, 1, 1, 1, 1}; static u8 lane_to_slot[] = {3, 3, 3, 3, 1, 1, 1, 1};
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
static u8 lane_to_slot[] = {2, 2, 2, 2, 1, 1, 1, 1}; static u8 lane_to_slot[] = {2, 2, 2, 2, 1, 1, 1, 1};
#endif #endif
@ -311,7 +311,7 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
fdt_status_okay_by_alias(fdt, "emi1_slot2"); fdt_status_okay_by_alias(fdt, "emi1_slot2");
} }
break; break;
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
case FM1_DTSEC1: case FM1_DTSEC1:
case FM1_DTSEC2: case FM1_DTSEC2:
case FM1_DTSEC5: case FM1_DTSEC5:
@ -481,7 +481,7 @@ static void initialize_lane_to_slot(void)
lane_to_slot[6] = 3; lane_to_slot[6] = 3;
lane_to_slot[7] = 3; lane_to_slot[7] = 3;
break; break;
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
case 0x6b: case 0x6b:
lane_to_slot[4] = 1; lane_to_slot[4] = 1;
lane_to_slot[5] = 3; lane_to_slot[5] = 3;
@ -556,7 +556,7 @@ int board_eth_init(bd_t *bis)
t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT4); t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT4);
#endif #endif
t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT5); t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT5);
#if defined(CONFIG_T2081QDS) #if defined(CONFIG_TARGET_T2081QDS)
t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT6); t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT6);
t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT7); t208xqds_mdio_init(DEFAULT_FM_MDIO_NAME, EMI1_SLOT7);
#endif #endif
@ -675,7 +675,7 @@ int board_eth_init(bd_t *bis)
fm_info_set_phy_address(FM1_DTSEC5, SGMII_CARD_PORT3_PHY_ADDR); fm_info_set_phy_address(FM1_DTSEC5, SGMII_CARD_PORT3_PHY_ADDR);
fm_info_set_phy_address(FM1_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR); fm_info_set_phy_address(FM1_DTSEC6, SGMII_CARD_PORT2_PHY_ADDR);
break; break;
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
case 0xca: case 0xca:
case 0xcb: case 0xcb:
/* SGMII in Slot3 */ /* SGMII in Slot3 */
@ -731,7 +731,7 @@ int board_eth_init(bd_t *bis)
fm_info_set_mdio(i, mii_dev_for_muxval( fm_info_set_mdio(i, mii_dev_for_muxval(
mdio_mux[i])); mdio_mux[i]));
break; break;
#if defined(CONFIG_T2081QDS) #if defined(CONFIG_TARGET_T2081QDS)
case 5: case 5:
mdio_mux[i] = EMI1_SLOT5; mdio_mux[i] = EMI1_SLOT5;
fm_info_set_mdio(i, mii_dev_for_muxval( fm_info_set_mdio(i, mii_dev_for_muxval(

2
board/freescale/t208xqds/t208xqds.c
View file

@ -191,7 +191,7 @@ int brd_mux_lane_to_slot(void)
*/ */
QIXIS_WRITE(brdcfg[12], 0x1a); QIXIS_WRITE(brdcfg[12], 0x1a);
break; break;
#elif defined(CONFIG_T2081QDS) #elif defined(CONFIG_TARGET_T2081QDS)
case 0x50: case 0x50:
case 0x51: case 0x51:
/* SD1(A:D) => SLOT2 XAUI /* SD1(A:D) => SLOT2 XAUI

1
include/configs/T208xQDS.h
View file

@ -19,7 +19,6 @@
#define CONFIG_SRIO1 /* SRIO port 1 */ #define CONFIG_SRIO1 /* SRIO port 1 */
#define CONFIG_SRIO2 /* SRIO port 2 */ #define CONFIG_SRIO2 /* SRIO port 2 */
#elif defined(CONFIG_ARCH_T2081) #elif defined(CONFIG_ARCH_T2081)
#define CONFIG_T2081QDS
#endif #endif
/* High Level Configuration Options */ /* High Level Configuration Options */

1
scripts/config_whitelist.txt
View file

@ -7792,7 +7792,6 @@ CONFIG_SYS_XWAY_EBU_BOOTCFG
CONFIG_SYS_ZYNQ_QSPI_WAIT CONFIG_SYS_ZYNQ_QSPI_WAIT
CONFIG_SYS_ZYNQ_SPI_WAIT CONFIG_SYS_ZYNQ_SPI_WAIT
CONFIG_SYS_i2C_FSL CONFIG_SYS_i2C_FSL
CONFIG_T2081QDS
CONFIG_TAM3517_SETTINGS CONFIG_TAM3517_SETTINGS
CONFIG_TAM3517_SW3_SETTINGS CONFIG_TAM3517_SW3_SETTINGS
CONFIG_TCA642X CONFIG_TCA642X