On 2022-12-07, Simon Glass wrote:
Drop the use of scripts and rely on standard boot for all operation.
This patch, applied as 3891c68ef50eda38d78c95ecd03aed030aa6bb53 broke booting on pinebook-pro-rk3399, which still tries to "run distro_bootcmd" but distro_bootcmd is no longer defined... probably several other rk3399 systems are similarly affected? Maybe other rockchip systems as well? Reverting the patch fixes booting on the pinebook-pro-rk3399, at least.
It seems that rockpro64-rk3399 was used as an example, so that presumably works, but in actuality, this commit only modifies common files for many rockchip and rk3399 boards and nothing rockpro64-rk3399 specific, so the commit message is a bit misleading.
I am not sure what the best way forward is; to quickly convert all the other boards in a new patch series, or incrementally shift one system at a time over (and somehow restore previous behavior in the meantime?)... as it stands it appears we are left with rk3399 boards partially converted but broken...
FWIW, I have not confirmed for sure that other boards are broken, so it might just be pinebook-pro-rk3399 for some reason. I have a few rk3399 based boards I can test to confirm...
live well, vagrant
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 2f9aee58197..f2c231dd978 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -42,15 +42,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
2.39.0.rc0.267.gcb52ba06e7-goog