[v1,02/17] rockchip: spl: allow more boot devices

Message ID	20220508150825.21711-3-jbx6244@gmail.com
State	Changes Requested
Delegated to:	Kever Yang
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Johan Jonker <jbx6244@gmail.com> To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, lukma@denx.de, marex@denx.de, u-boot@lists.denx.de Subject: [PATCH v1 02/17] rockchip: spl: allow more boot devices Date: Sun, 8 May 2022 17:08:10 +0200 Message-Id: <20220508150825.21711-3-jbx6244@gmail.com> In-Reply-To: <20220508150825.21711-1-jbx6244@gmail.com> References: <20220508150825.21711-1-jbx6244@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Add rk3066 ADC and USB support \| expand [v1,00/17] Add rk3066 ADC and USB support [v1,01/17] rockchip: spl: fix reloc gd and FDT blob pointer [v1,02/17] rockchip: spl: allow more boot devices [v1,03/17] rockchip: spl-boot-order: add usb boot option [v1,04/17] rockchip: board: allow spl compile for usb init functions [v1,05/17] rockchip: usb: gadget: rockusb: enable spl compile [v1,06/17] rockchip: configs: mk808: add spl usb configs [v1,07/17] arm: dts: rockchip: mk808: add adc usb required properties for spl [v1,08/17] rockchip: adc: enable spl compile class driver [v1,09/17] rockchip: adc: reduce error notifications from class driver [v1,10/17] rockchip: adc: enable spl compile rockchip-saradc driver [v1,11/17] rockchip: adc: fix adc timer [v1,12/17] rockchip: adc: fix the hangups [v1,13/17] rockchip: adc: make adc branch compile in SPL [v1,14/17] rockchip: adc: move config items in a sub menu [v1,15/17] rockchip: rk3066: config nand data pins in spl [v1,16/17] rockchip: rk3066: add recovery mode in spl [v1,17/17] rockchip: configs: mk808: enable usb support

Message ID

20220508150825.21711-3-jbx6244@gmail.com

State

Changes Requested

Delegated to:

Kever Yang

Headers

From: Johan Jonker <jbx6244@gmail.com>
To: kever.yang@rock-chips.com
Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, lukma@denx.de, marex@denx.de,
 u-boot@lists.denx.de
Subject: [PATCH v1 02/17] rockchip: spl: allow more boot devices
Date: Sun,  8 May 2022 17:08:10 +0200
Message-Id: <20220508150825.21711-3-jbx6244@gmail.com>
In-Reply-To: <20220508150825.21711-1-jbx6244@gmail.com>
References: <20220508150825.21711-1-jbx6244@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Add rk3066 ADC and USB support | expand

Commit Message

Johan Jonker May 8, 2022, 3:08 p.m. UTC

Rockchip SoCs have more boot device options then currently
included in the function spl_boot_device().
Make this function generic for SPI and NAND.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 arch/arm/mach-rockchip/spl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index ceef9d91..968f896a 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -53,13 +53,16 @@  u32 spl_boot_device(void)
 {
 	u32 boot_device = BOOT_DEVICE_MMC1;
 
-#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY) || \
+#if defined(CONFIG_SPI_BOOT) || \
+		defined(CONFIG_TARGET_CHROMEBOOK_JERRY) || \
 		defined(CONFIG_TARGET_CHROMEBIT_MICKEY) || \
 		defined(CONFIG_TARGET_CHROMEBOOK_MINNIE) || \
 		defined(CONFIG_TARGET_CHROMEBOOK_SPEEDY) || \
 		defined(CONFIG_TARGET_CHROMEBOOK_BOB) || \
 		defined(CONFIG_TARGET_CHROMEBOOK_KEVIN)
 	return BOOT_DEVICE_SPI;
+#elseif defined(CONFIG_NAND_BOOT)
+	return BOOT_DEVICE_NAND;
 #endif
 	if (CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM))
 		return BOOT_DEVICE_BOOTROM;

[v1,02/17] rockchip: spl: allow more boot devices

Commit Message

Patch