diff mbox series

rk3399: Enable SF distro bootcmd

Message ID 20200429193928.11592-1-jagan@amarulasolutions.com
State Accepted
Commit f263b860acf82de85e4d61ac67b1e4f62efcf1cc
Headers show
Series rk3399: Enable SF distro bootcmd | expand

Commit Message

Jagan Teki April 29, 2020, 7:39 p.m. UTC
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.

Cc: Kever Yang <kever.yang at rock-chips.com>
Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
 include/configs/rk3399_common.h   |  1 +
 include/configs/rockchip-common.h | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

Comments

Kever Yang April 30, 2020, 9:11 a.m. UTC | #1
Hi Jagan,

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

rockchip: Enable SF distro bootcmd

On 2020/4/30 ??3:39, Jagan Teki wrote:
> 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.
>
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>


Thanks,

- Kever

> ---
>   include/configs/rk3399_common.h   |  1 +
>   include/configs/rockchip-common.h | 15 +++++++++++++++
>   2 files changed, 16 insertions(+)
>
> diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
> index 01a9174bd2..f0ae6e67a7 100644
> --- a/include/configs/rk3399_common.h
> +++ b/include/configs/rk3399_common.h
> @@ -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" \
> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> index b55e09a9ca..bf8c60d6dd 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -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"
Jagan Teki April 30, 2020, 9:39 a.m. UTC | #2
On Thu, Apr 30, 2020 at 2:41 PM Kever Yang <kever.yang at rock-chips.com> wrote:
>
> 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.
diff mbox series

Patch

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 01a9174bd2..f0ae6e67a7 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -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" \
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index b55e09a9ca..bf8c60d6dd 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -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"