diff options
| author | Simon Glass <sjg@chromium.org> | 2023-01-17 10:48:20 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-23 18:11:41 -0500 |
| commit | 3891c68ef50eda38d78c95ecd03aed030aa6bb53 (patch) | |
| tree | 1dc9e793258c5a4a1be4d5e6d554f7f1a82450f3 | |
| parent | 1bdda5fd727dbce58d09846956ae8a21621b4082 (diff) | |
| download | u-boot-3891c68ef50eda38d78c95ecd03aed030aa6bb53.zip u-boot-3891c68ef50eda38d78c95ecd03aed030aa6bb53.tar.gz u-boot-3891c68ef50eda38d78c95ecd03aed030aa6bb53.tar.bz2 | |
rockchip: Convert rockpro64-rk3399 to use standard bootWIP/2022-01-23-bootstd-allow-migration-from-distro_bootcmd-script
Drop the use of scripts and rely on standard boot for all operation.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| -rw-r--r-- | include/configs/rk3399_common.h | 5 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 95cb27c..3ef9ffa 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -48,15 +48,12 @@ #define ROCKCHIP_DEVICE_SETTINGS #endif -#include <config_distro_bootcmd.h> -#include <environment/distro/sf.h> #define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV \ - BOOTENV_SF \ + "boot_targets=" BOOT_TARGETS "\0" \ "altbootcmd=" \ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ "run distro_bootcmd\0" diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 1f6b82f..0b23e4c 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -65,12 +65,14 @@ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) \ BOOT_TARGET_SF(func) +#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" #else #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) \ BOOT_TARGET_USB(func) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) +#define BOOT_TARGETS "mmc1 mmc0 usb pxe dhcp" #endif #ifdef CONFIG_ARM64 |