[PATCH v2 71/71] rockchip: Convert rockpro64-rk3399 to use standard boot
Kever Yang
kever.yang at rock-chips.com
Mon Jan 16 10:54:33 CET 2023
On 2023/1/8 10:50, Simon Glass wrote:
> Drop the use of scripts and rely on standard boot for all operation.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
>
> Changes in v2:
> - Rebase to -next
>
> include/configs/rk3399_common.h | 5 +----
> 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 f0a9ab8f83c..daa8803bbf4 100644
> --- a/include/configs/rk3399_common.h
> +++ b/include/configs/rk3399_common.h
> @@ -58,15 +58,12 @@
> #define ROCKCHIP_DEVICE_SETTINGS
> #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" \
> "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 4c964cc3770..5a06365c760 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -67,12 +67,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
More information about the U-Boot-Custodians
mailing list