From: Simon Glass <sjg@chromium.org>
Date: Mon, 21 Jan 2019 21:53:28 +0000 (-0700)
Subject: rockchip: Allow booting from SPI
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=3523c07867b403d5b3b68812aebac8a5afa5be4c;p=u-boot.git

rockchip: Allow booting from SPI

The u-boot,spl-boot-device property only allows MMC at present. Add SPI as
well for boards that boot from SPI flash.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c
index 81a72cc263..0e485deda2 100644
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@@ -61,6 +61,9 @@ static int spl_node_to_boot_device(int node)
 		default:
 			return -ENOSYS;
 		}
+	} else if (!uclass_get_device_by_of_offset(UCLASS_SPI_FLASH, node,
+		&parent)) {
+		return BOOT_DEVICE_SPI;
 	}
 
 	/*