From 9523967449276a5c1ca3760eb06cdc131b6ce85b Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Tue, 2 Jul 2024 23:07:58 +0200 Subject: [PATCH] mixtile-blade3: rk3588: u-boot: bump to `next-dev-v2024.03` - drop 0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch - rebase the others --- config/boards/mixtile-blade3.csc | 2 +- ...Fixed-restart-issues-with-pd-adapter.patch | 2 +- ...ver-affects-adb-to-enter-loader-mode.patch | 2 +- ...the-command-source-failed-to-execute.patch | 25 ------------------- ...lot-of-debugging-adapted-for-Mixtile.patch | 24 +++++++++--------- 5 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch diff --git a/config/boards/mixtile-blade3.csc b/config/boards/mixtile-blade3.csc index b62d8de9e8..2270a0ea0a 100644 --- a/config/boards/mixtile-blade3.csc +++ b/config/boards/mixtile-blade3.csc @@ -21,7 +21,7 @@ declare -g BL31_BLOB='rk35/rk3588_bl31_v1.38.elf' function post_family_config__uboot_mixtile() { display_alert "$BOARD" "Configuring Mixtile u-boot" "info" declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git' - declare -g BOOTBRANCH="commit:ddc91cd08c10f625f7a7c93033042aa4071c78a8" # specific commit in next-dev branch + declare -g BOOTBRANCH='branch:next-dev-v2024.03' declare -g OVERLAY_PREFIX='rockchip-rk3588' declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g BOOTPATCHDIR="legacy/u-boot-mixtile-rk3588" # Few patches in there; defconfig & PD hacks diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch index 27d454b3a8..ea0dbf58c6 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0002-Fixed-restart-issues-with-pd-adapter.patch @@ -13,7 +13,7 @@ diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c -@@ -414,8 +414,17 @@ static void cmdline_handle(void) +@@ -452,8 +452,17 @@ static void scan_run_cmd(void) } } diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch index 904ecbf44c..a29e10ca22 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0003-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch @@ -11,7 +11,7 @@ diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c -@@ -424,7 +424,14 @@ static void power_delivery_func(void) +@@ -462,7 +462,14 @@ static void power_delivery_func(void) int board_late_init(void) { diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch deleted file mode 100644 index b56c1f2504..0000000000 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0004-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Fri, 30 Jun 2023 00:02:51 +0200 -Subject: cmd: source: fix the error that the command source failed to execute - ---- - cmd/source.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/source.c b/cmd/source.c -index 111111111111..222222222222 100644 ---- a/cmd/source.c -+++ b/cmd/source.c -@@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname) - * past the zero-terminated sequence of image lengths to get - * to the actual image data - */ -- while (*data++ != IMAGE_PARAM_INVAL); -+ while (*data++); - break; - #endif - #if defined(CONFIG_FIT) --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch index 94b1cdfa05..dcfad84c3e 100644 --- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch +++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0009-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c -@@ -109,15 +109,55 @@ static int rockchip_set_ethaddr(void) +@@ -113,15 +113,55 @@ static int rockchip_set_ethaddr(void) char buf[ARP_HLEN_ASCII + 1], mac[16]; u8 ethaddr[ARP_HLEN * MAX_ETHERNET] = {0}; int i, ret = -EINVAL; @@ -69,7 +69,7 @@ index 111111111111..222222222222 100644 } else { if (i > 0) { memcpy(ðaddr[i * ARP_HLEN], -@@ -128,6 +168,7 @@ static int rockchip_set_ethaddr(void) +@@ -132,6 +172,7 @@ static int rockchip_set_ethaddr(void) } } @@ -77,7 +77,7 @@ index 111111111111..222222222222 100644 need_write = true; } -@@ -137,14 +178,18 @@ static int rockchip_set_ethaddr(void) +@@ -141,14 +182,18 @@ static int rockchip_set_ethaddr(void) memcpy(mac, "ethaddr", sizeof("ethaddr")); else sprintf(mac, "eth%daddr", i); @@ -96,7 +96,7 @@ index 111111111111..222222222222 100644 if (ret < 0) printf("%s: vendor_storage_write failed %d\n", __func__, ret); -@@ -162,6 +207,7 @@ static int rockchip_set_serialno(void) +@@ -166,6 +211,7 @@ static int rockchip_set_serialno(void) char serialno_str[VENDOR_SN_MAX]; int ret = 0, i; u64 serialno; @@ -104,7 +104,7 @@ index 111111111111..222222222222 100644 /* Read serial number from vendor storage part */ memset(serialno_str, 0, VENDOR_SN_MAX); -@@ -171,6 +217,7 @@ static int rockchip_set_serialno(void) +@@ -175,6 +221,7 @@ static int rockchip_set_serialno(void) ret = vendor_storage_read(SN_ID, serialno_str, (VENDOR_SN_MAX-1)); if (ret > 0) { @@ -112,7 +112,7 @@ index 111111111111..222222222222 100644 j = strlen(serialno_str); for (i = 0; i < j; i++) { if ((serialno_str[i] >= 'a' && serialno_str[i] <= 'z') || -@@ -185,11 +232,16 @@ static int rockchip_set_serialno(void) +@@ -192,11 +239,16 @@ static int rockchip_set_serialno(void) if (i > 0) { serialno_str[i + 1] = 0x0; env_set("serial#", serialno_str); @@ -129,7 +129,7 @@ index 111111111111..222222222222 100644 struct udevice *dev; /* retrieve the device */ -@@ -203,10 +255,13 @@ static int rockchip_set_serialno(void) +@@ -210,10 +262,13 @@ static int rockchip_set_serialno(void) &dev); if (ret) { @@ -142,9 +142,9 @@ index 111111111111..222222222222 100644 + printf("%s: serial gonna try read fuses\n", __func__); + /* read the cpu_id range from the efuses */ - ret = misc_read(dev, CPUID_OFF, &cpuid, sizeof(cpuid)); + ret = misc_read(dev, CFG_CPUID_OFFSET, &cpuid, sizeof(cpuid)); if (ret) { -@@ -214,12 +269,18 @@ static int rockchip_set_serialno(void) +@@ -221,12 +276,18 @@ static int rockchip_set_serialno(void) __func__, ret); return ret; } @@ -163,7 +163,7 @@ index 111111111111..222222222222 100644 for (i = 0; i < 8; i++) { low[i] = cpuid[1 + (i << 1)]; high[i] = cpuid[i << 1]; -@@ -230,6 +291,7 @@ static int rockchip_set_serialno(void) +@@ -237,6 +298,7 @@ static int rockchip_set_serialno(void) snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno); env_set("serial#", serialno_str); @@ -171,7 +171,7 @@ index 111111111111..222222222222 100644 } return ret; -@@ -432,11 +494,11 @@ int board_late_init(void) +@@ -470,11 +532,11 @@ int board_late_init(void) power_delivery_func(); } @@ -185,7 +185,7 @@ index 111111111111..222222222222 100644 + rockchip_set_ethaddr(); #endif setup_download_mode(); - + scan_run_cmd(); -- Armbian