[PATCH 1/1] configs: visionfive2: enable CONFIG_DISTRO_DEFAULTS

[Loic Devulder]

Supported boot device types are MMC, USB, SF and DHCP.

Signed-off-by: Loic Devulder <ldevulder at suse.com>
---
 configs/starfive_visionfive2_defconfig |  1 +
 include/configs/starfive-visionfive2.h | 29 ++++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig
index 20f89ae6796..e817e63858b 100644
--- a/configs/starfive_visionfive2_defconfig
+++ b/configs/starfive_visionfive2_defconfig
@@ -41,6 +41,7 @@ CONFIG_SD_BOOT=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="nvme scan; usb start; setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
 CONFIG_SYS_CBSIZE=256
diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h
index 049b0a06301..7f187307ffe 100644
--- a/include/configs/starfive-visionfive2.h
+++ b/include/configs/starfive-visionfive2.h
@@ -15,14 +15,29 @@
 
 #define __io
 
+#ifdef CONFIG_DISTRO_DEFAULTS
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 1) \
+	func(MMC, mmc, 0) \
+	func(USB, usb, 0) \
+	func(SF, sf, 0) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+#include <env/distro/sf.h>
+#else
+#define BOOTENV
+#define BOOTENV_SF
+#endif
+
 #define TYPE_GUID_SPL		"2E54B353-1271-4842-806F-E436D6AF6985"
-#define TYPE_GUID_UBOOT	"BC13C2FF-59E6-4262-A352-B275FD6F7172"
+#define TYPE_GUID_UBOOT		"BC13C2FF-59E6-4262-A352-B275FD6F7172"
 #define TYPE_GUID_SYSTEM	"EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"
 
-#define PARTS_DEFAULT							\
-		"name=spl,start=2M,size=2M,type=${type_guid_gpt_loader1};" \
-		"name=uboot,size=4MB,type=${type_guid_gpt_loader2};"		\
-		"name=system,size=-,bootable,type=${type_guid_gpt_system};"
+#define PARTS_DEFAULT \
+	"name=spl,start=2M,size=2M,type=${type_guid_gpt_loader1};" \
+	"name=uboot,size=4MB,type=${type_guid_gpt_loader2};" \
+	"name=system,size=-,bootable,type=${type_guid_gpt_system};"
 
 #define CFG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x40200000\0" \
@@ -37,6 +52,8 @@
 	"type_guid_gpt_loader2=" TYPE_GUID_UBOOT "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
 	"partitions=" PARTS_DEFAULT "\0" \
-	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	BOOTENV \
+	BOOTENV_SF
 
 #endif /* _STARFIVE_VISIONFIVE2_H */
-- 
2.47.0