colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: Convert rockpro64-rk3399 to use standard boot

Browse Source 
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>
This commit is contained in:
Simon Glass
2023-01-17 10:48:20 -07:00
committed by Tom Rini
parent 1bdda5fd72
commit 3891c68ef5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/configs/rk3399_common.h
View File

@@ -48,15 +48,12 @@
#define ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS
#endif #endif
#include <config_distro_bootcmd.h>
#include <environment/distro/sf.h>
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
ENV_MEM_LAYOUT_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"partitions=" PARTS_DEFAULT \ "partitions=" PARTS_DEFAULT \
ROCKCHIP_DEVICE_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \
BOOTENV \ "boot_targets=" BOOT_TARGETS "\0" \
BOOTENV_SF \
"altbootcmd=" \ "altbootcmd=" \
"setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \
"run distro_bootcmd\0" "run distro_bootcmd\0"

2
include/configs/rockchip-common.h
View File

@@ -65,12 +65,14 @@
BOOT_TARGET_PXE(func) \ BOOT_TARGET_PXE(func) \
BOOT_TARGET_DHCP(func) \ BOOT_TARGET_DHCP(func) \
BOOT_TARGET_SF(func) BOOT_TARGET_SF(func)
#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
#else #else
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
BOOT_TARGET_MMC(func) \ BOOT_TARGET_MMC(func) \
BOOT_TARGET_USB(func) \ BOOT_TARGET_USB(func) \
BOOT_TARGET_PXE(func) \ BOOT_TARGET_PXE(func) \
BOOT_TARGET_DHCP(func) BOOT_TARGET_DHCP(func)
#define BOOT_TARGETS "mmc1 mmc0 usb pxe dhcp"
#endif #endif
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64