rockchip: Convert rockpro64-rk3399 to use standard boot

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>

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 95cb27c..3ef9ffa 100644 (file)
--- 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 (file)
--- 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