diff options
| author | Tom Rini <[email protected]> | 2019-02-05 08:37:21 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-02-05 12:29:59 -0500 |
| commit | bdac5e18a80427e1f44413dce78aefece956ffc2 (patch) | |
| tree | 769c69845b4e6643209b60d3959db2616159d4af /board | |
| parent | c0bf3968d7fffa135305ba58644773d32f51090a (diff) | |
| parent | f18220919079eeb8e79f4791e152f1db073574a8 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Move Armada XP / 38x PCIe driver to DM_PCI from me
- Move Armada XP / 38x LCD driver to DM_VIDEO from me
- Add uDPU board (Armada-3720) from Vladimir
[trini: Fix warning in pci-uclass.c by removing ret from
pci_uclass_child_post_bind as it no longer calls functions with
a return code to catch.]
Signed-off-by: Tom Rini <[email protected]>II
Diffstat (limited to 'board')
| -rw-r--r-- | board/Marvell/mvebu_armada-37xx/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/theadorable/theadorable.c | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/board/Marvell/mvebu_armada-37xx/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS index 9b0afeef106..f2c0a582d71 100644 --- a/board/Marvell/mvebu_armada-37xx/MAINTAINERS +++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS @@ -9,3 +9,8 @@ ESPRESSOBin BOARD M: Konstantin Porotchkin <[email protected]> S: Maintained F: configs/mvebu_espressobin-88f3720_defconfig + +uDPU BOARD +M: Vladimir Vid <[email protected]> +S: Maintained +F: configs/uDPU_defconfig diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index b59589ae829..dd6def5e6e7 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -218,22 +218,6 @@ int board_eth_init(bd_t *bis) } #endif -int board_video_init(void) -{ - struct mvebu_lcd_info lcd_info; - - /* Reserved memory area via CONFIG_SYS_MEM_TOP_HIDE */ - lcd_info.fb_base = gd->ram_size; - lcd_info.x_res = 240; - lcd_info.x_fp = 1; - lcd_info.x_bp = 45; - lcd_info.y_res = 320; - lcd_info.y_fp = 1; - lcd_info.y_bp = 3; - - return mvebu_lcd_register_init(&lcd_info); -} - #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { |