diff mbox series

[U-Boot,11/14] at91: ma5d4evk: Enable SPL_DM and SPL_OF_CONTROL

Message ID 20180314131644.9508-12-jagan@amarulasolutions.com
State Accepted
Commit 5a6eab8ab02aa3f2449eff80be9184a4e688f451
Delegated to: Tom Rini
Headers show
Series at91: Add boards with OF_CONTROL/DM/DM_SPI | expand

Commit Message

Jagan Teki March 14, 2018, 1:16 p.m. UTC
Enable SPL Driver model and FDT support for AT91 ma5d4evk boards.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 board/aries/ma5d4evk/ma5d4evk.c | 2 +-
 configs/ma5d4evk_defconfig      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Tom Rini April 6, 2018, 8:29 p.m. UTC | #1
On Wed, Mar 14, 2018 at 06:46:41PM +0530, Jagan Teki wrote:

> Enable SPL Driver model and FDT support for AT91 ma5d4evk boards.
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
index 46c11d1a12..9f8b8dc154 100644
--- a/board/aries/ma5d4evk/ma5d4evk.c
+++ b/board/aries/ma5d4evk/ma5d4evk.c
@@ -359,7 +359,7 @@  int board_eth_init(bd_t *bis)
 #ifdef CONFIG_SPL_BUILD
 void spl_board_init(void)
 {
-#ifdef CONFIG_ATMEL_SPI
+#ifndef CONFIG_DM_SPI
 	ma5d4evk_spi0_hw_init();
 #endif
 #ifdef CONFIG_GENERIC_ATMEL_MCI
diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
index cdea7dc123..57f896d630 100644
--- a/configs/ma5d4evk_defconfig
+++ b/configs/ma5d4evk_defconfig
@@ -9,6 +9,8 @@  CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3