From 4bba40608bd2b9c05ee33cff62277a4efe7ebda7 Mon Sep 17 00:00:00 2001 From: Husky <57535444+hyy-666@users.noreply.github.com> Date: Mon, 17 Apr 2023 23:38:51 +0800 Subject: [PATCH] uboot-rockchip: revert use of standard boot (#11121) --- ...vert-rockchip-rk3399-Drop-altbootcmd.patch | 26 ++++++++++ ...Disable-DISTRO_DEFAULTS-for-rk3399-b.patch | 24 +++++++++ ...Convert-rockpro64-rk3399-to-use-stan.patch | 50 +++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch create mode 100644 package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch create mode 100644 package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch diff --git a/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch b/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch new file mode 100644 index 000000000..09df37fb0 --- /dev/null +++ b/package/boot/uboot-rockchip/patches/001-Revert-rockchip-rk3399-Drop-altbootcmd.patch @@ -0,0 +1,26 @@ +From 1ab5d2b9cf1b9c1c7ccb58243992fb163c64a14d Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 5 Apr 2023 21:06:19 +0800 +Subject: [PATCH 1/3] Revert "rockchip: rk3399: Drop altbootcmd" + +This reverts commit d00fb6421c8fad639f608f55f9291305061ffb17. + +Signed-off-by: Tianling Shen +--- + include/configs/rk3399_common.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/include/configs/rk3399_common.h ++++ b/include/configs/rk3399_common.h +@@ -52,7 +52,10 @@ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ROCKCHIP_DEVICE_SETTINGS \ +- "boot_targets=" BOOT_TARGETS "\0" ++ "boot_targets=" BOOT_TARGETS "\0" \ ++ "altbootcmd=" \ ++ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ ++ "run distro_bootcmd\0" + + #endif + diff --git a/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch b/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch new file mode 100644 index 000000000..a9dc5556a --- /dev/null +++ b/package/boot/uboot-rockchip/patches/002-Revert-rockchip-Disable-DISTRO_DEFAULTS-for-rk3399-b.patch @@ -0,0 +1,24 @@ +From 535b09f84be0660ef5e85431328746e74cc8e6b7 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 5 Apr 2023 21:08:21 +0800 +Subject: [PATCH 2/3] Revert "rockchip: Disable DISTRO_DEFAULTS for rk3399 + boards" + +This reverts commit 2b9cc7845cf96955db363519faab9a78e166c453. + +Signed-off-by: Tianling Shen +--- + arch/arm/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1955,7 +1955,7 @@ config ARCH_ROCKCHIP + imply ADC + imply CMD_DM + imply DEBUG_UART_BOARD_INIT +- imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399 ++ imply DISTRO_DEFAULTS + imply BOOTSTD_DEFAULTS if !DISTRO_DEFAULTS + imply FAT_WRITE + imply SARADC_ROCKCHIP diff --git a/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch b/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch new file mode 100644 index 000000000..2b7fb8dd6 --- /dev/null +++ b/package/boot/uboot-rockchip/patches/003-Revert-rockchip-Convert-rockpro64-rk3399-to-use-stan.patch @@ -0,0 +1,50 @@ +From 93ac12531f7c672ef1fe7689cf8b67ec2372efef Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 5 Apr 2023 21:08:27 +0800 +Subject: [PATCH 3/3] Revert "rockchip: Convert rockpro64-rk3399 to use + standard boot" + +This reverts commit 3891c68ef50eda38d78c95ecd03aed030aa6bb53. + +Signed-off-by: Tianling Shen +--- + include/configs/rk3399_common.h | 5 ++++- + include/configs/rockchip-common.h | 2 -- + 2 files changed, 4 insertions(+), 3 deletions(-) + +--- a/include/configs/rk3399_common.h ++++ b/include/configs/rk3399_common.h +@@ -47,12 +47,15 @@ + #define ROCKCHIP_DEVICE_SETTINGS + #endif + ++#include ++#include + #define CFG_EXTRA_ENV_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ROCKCHIP_DEVICE_SETTINGS \ +- "boot_targets=" BOOT_TARGETS "\0" \ ++ BOOTENV \ ++ BOOTENV_SF \ + "altbootcmd=" \ + "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ + "run distro_bootcmd\0" +--- a/include/configs/rockchip-common.h ++++ b/include/configs/rockchip-common.h +@@ -67,14 +67,12 @@ + 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