diff options
| author | Tom Rini | 2020-09-24 08:30:25 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-09-24 08:30:25 -0400 |
| commit | e119de72e3ae3accf831b5541d83d5c2faf031ff (patch) | |
| tree | 03b10913c10426c8930c5eac3b3fd14c08260843 /board/freescale/p1010rdb | |
| parent | 3c1e6a6c2300e0458a28bcfb1a5d3b52926bd33d (diff) | |
| parent | 893cdf0b7f68b8cabcd04f8026c03bff7c78e267 (diff) | |
Merge branch 'mpc85xx-for-v2021.01' into next
- Add DM_SPI, DM_SPI_FLASH support for powerpc platforms
- Add DM_ETH support on P1010RDB, P1020RDB, P2020RDB
- Remove some un-maintained powerpc platforms
- Add USB_STORAGE support in config
Diffstat (limited to 'board/freescale/p1010rdb')
| -rw-r--r-- | board/freescale/p1010rdb/MAINTAINERS | 12 | ||||
| -rw-r--r-- | board/freescale/p1010rdb/p1010rdb.c | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/board/freescale/p1010rdb/MAINTAINERS b/board/freescale/p1010rdb/MAINTAINERS index c9f7fa3e2a1..6e940dd8759 100644 --- a/board/freescale/p1010rdb/MAINTAINERS +++ b/board/freescale/p1010rdb/MAINTAINERS @@ -4,30 +4,18 @@ S: Maintained F: board/freescale/p1010rdb/ F: include/configs/P1010RDB.h F: configs/P1010RDB-PA_36BIT_NAND_defconfig -F: configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig F: configs/P1010RDB-PA_36BIT_NOR_defconfig -F: configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig F: configs/P1010RDB-PA_36BIT_SDCARD_defconfig F: configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig -F: configs/P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig F: configs/P1010RDB-PA_NAND_defconfig -F: configs/P1010RDB-PA_NAND_SECBOOT_defconfig F: configs/P1010RDB-PA_NOR_defconfig -F: configs/P1010RDB-PA_NOR_SECBOOT_defconfig F: configs/P1010RDB-PA_SDCARD_defconfig F: configs/P1010RDB-PA_SPIFLASH_defconfig -F: configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig F: configs/P1010RDB-PB_36BIT_NAND_defconfig -F: configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig F: configs/P1010RDB-PB_36BIT_NOR_defconfig -F: configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig F: configs/P1010RDB-PB_36BIT_SDCARD_defconfig F: configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig -F: configs/P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig F: configs/P1010RDB-PB_NAND_defconfig -F: configs/P1010RDB-PB_NAND_SECBOOT_defconfig F: configs/P1010RDB-PB_NOR_defconfig -F: configs/P1010RDB-PB_NOR_SECBOOT_defconfig F: configs/P1010RDB-PB_SDCARD_defconfig F: configs/P1010RDB-PB_SPIFLASH_defconfig -F: configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index accf2f24e51..4c3a03e7cd9 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -484,6 +484,7 @@ int checkboard(void) return 0; } +#ifndef CONFIG_DM_ETH int board_eth_init(struct bd_info *bis) { #ifdef CONFIG_TSEC_ENET @@ -524,6 +525,7 @@ int board_eth_init(struct bd_info *bis) return pci_eth_init(bis); } +#endif #if defined(CONFIG_OF_BOARD_SETUP) void fdt_del_flexcan(void *blob) |