diff options
| author | Nam Cao <namcao@linutronix.de> | 2024-02-21 13:00:14 +0100 |
|---|---|---|
| committer | Leo Yu-Chi Liang <ycliang@andestech.com> | 2024-03-12 14:36:13 +0800 |
| commit | e3a904a6906870fb472dafbf3e2c99449653b304 (patch) | |
| tree | 2ab26eb662f7052c3740053e23054e604086a357 | |
| parent | f3c979dd0053c082d2df170446923e7ce5edbc2d (diff) | |
| download | u-boot-e3a904a6906870fb472dafbf3e2c99449653b304.zip u-boot-e3a904a6906870fb472dafbf3e2c99449653b304.tar.gz u-boot-e3a904a6906870fb472dafbf3e2c99449653b304.tar.bz2 | |
starfive: visionfive2: switch to standard boot
Distro boot scripts are deprecated. Use standard boot instead.
Signed-off-by: Nam Cao <namcao@linutronix.de>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
| -rw-r--r-- | configs/starfive_visionfive2_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/starfive-visionfive2.h | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index c68f3c2..7a3f1d4 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -30,8 +30,8 @@ CONFIG_RISCV_SMODE=y # CONFIG_OF_BOARD_FIXUP is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_FIT=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_SYS_BOOTM_LEN=0x4000000 -CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTSTAGE=y CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h index 29c7447..049b0a0 100644 --- a/include/configs/starfive-visionfive2.h +++ b/include/configs/starfive-visionfive2.h @@ -15,17 +15,6 @@ #define __io -/* Environment options */ - -#define BOOT_TARGET_DEVICES(func) \ - func(NVME, nvme, 0) \ - func(USB, usb, 0) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> - #define TYPE_GUID_SPL "2E54B353-1271-4842-806F-E436D6AF6985" #define TYPE_GUID_UBOOT "BC13C2FF-59E6-4262-A352-B275FD6F7172" #define TYPE_GUID_SYSTEM "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7" @@ -48,7 +37,6 @@ "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" \ - BOOTENV + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" #endif /* _STARFIVE_VISIONFIVE2_H */ |