Skip to contentSkip to conversation

rk3399: Enable SF distro bootcmd

PATCH New Jagan Teki 2 participants 3 messages Apr 29, 2020 – Apr 30, 2020 Arm Rockchip

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 rk3399: Enable SF distro bootcmd

Enable SPI flash(SF) distro boot command in rk3399.

This distro boot will read the boot script at specific location at the flash and start sourcing the same.

Included the SF device at the last of the target devices list since all the rest of the devices on the list have more possibility to boot the distribution due to the size of the SPI flash is concern.

---
 include/configs/rk3399_common.h   |  1 +
 include/configs/rockchip-common.h | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
include/configs/rk3399_common.h +1 -0
index 01a9174bd2..f0ae6e67a7 100644
@@ -60,6 +60,7 @@
 #endif
 
 #include <config_distro_bootcmd.h>
+#include <environment/distro/sf.h>
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	ENV_MEM_LAYOUT_SETTINGS \
 	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
include/configs/rockchip-common.h +15 -0
index b55e09a9ca..bf8c60d6dd 100644
@@ -41,11 +41,26 @@
 	#define BOOT_TARGET_DHCP(func)
 #endif
 
+#if CONFIG_IS_ENABLED(CMD_SF)
+	#define BOOT_TARGET_SF(func)	func(SF, sf, 0)
+#else
+	#define BOOT_TARGET_SF(func)
+#endif
+
+#ifdef CONFIG_ROCKCHIP_RK3399
+#define BOOT_TARGET_DEVICES(func) \
+	BOOT_TARGET_MMC(func) \
+	BOOT_TARGET_USB(func) \
+	BOOT_TARGET_PXE(func) \
+	BOOT_TARGET_DHCP(func) \
+	BOOT_TARGET_SF(func)
+#else
 #define BOOT_TARGET_DEVICES(func) \
 	BOOT_TARGET_MMC(func) \
 	BOOT_TARGET_USB(func) \
 	BOOT_TARGET_PXE(func) \
 	BOOT_TARGET_DHCP(func)
+#endif
 
 #ifdef CONFIG_ARM64
 #define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 rk3399: Enable SF distro bootcmd

Hi Jagan,

Previous patch will be drop and replace by this one, right?

rockchip: Enable SF distro bootcmd

Quoted 5 lines · Jagan Teki

Enable SPI flash(SF) distro boot command in rk3399.

This distro boot will read the boot script at specific location at the flash and start sourcing the same.

Quoted 7 lines

Included the SF device at the last of the target devices list since all the rest of the devices on the list have more possibility to boot the distribution due to the size of the SPI flash is concern.

Thanks,

- Kever

Quoted 48 lines
---
  include/configs/rk3399_common.h   |  1 +
  include/configs/rockchip-common.h | 15 +++++++++++++++
  2 files changed, 16 insertions(+)
include/configs/rk3399_common.h +1 -0
index 01a9174bd2..f0ae6e67a7 100644
@@ -60,6 +60,7 @@
  #endif
 
  #include <config_distro_bootcmd.h>
+#include <environment/distro/sf.h>
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	ENV_MEM_LAYOUT_SETTINGS \
  	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
include/configs/rockchip-common.h +15 -0
index b55e09a9ca..bf8c60d6dd 100644
@@ -41,11 +41,26 @@
  	#define BOOT_TARGET_DHCP(func)
  #endif
 
+#if CONFIG_IS_ENABLED(CMD_SF)
+	#define BOOT_TARGET_SF(func)	func(SF, sf, 0)
+#else
+	#define BOOT_TARGET_SF(func)
+#endif
+
+#ifdef CONFIG_ROCKCHIP_RK3399
+#define BOOT_TARGET_DEVICES(func) \
+	BOOT_TARGET_MMC(func) \
+	BOOT_TARGET_USB(func) \
+	BOOT_TARGET_PXE(func) \
+	BOOT_TARGET_DHCP(func) \
+	BOOT_TARGET_SF(func)
+#else
  #define BOOT_TARGET_DEVICES(func) \
  	BOOT_TARGET_MMC(func) \
  	BOOT_TARGET_USB(func) \
  	BOOT_TARGET_PXE(func) \
  	BOOT_TARGET_DHCP(func)
+#endif
 
  #ifdef CONFIG_ARM64
  #define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
author
#2 lore raw

PATCH 1/1 rk3399: Enable SF distro bootcmd

Quoted 6 lines · Kever Yang

Hi Jagan,

Previous patch will be drop and replace by this one, right?

rockchip: Enable SF distro bootcmd

Yes, I'll apply this via the spi tree since it has SF distro changes already.