Skip to content

Commit 431f436

Browse files
rpardiniigorpecovnik
rpardini
authored and
igorpecovnik
committed
mekotronics 3588: squash u-boot patches
- same as before but not touching the same file twice+
1 parent b84990c commit 431f436

6 files changed

Lines changed: 50 additions & 166 deletions

patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee.patch renamed to patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Ricardo Pardini <ricardo@pardini.net>
33
Date: Sat, 1 Jul 2023 10:49:27 +0200
4-
Subject: rk3588_meko_defconfig - evb sans optee
4+
Subject: rk3588_meko_defconfig - evb sans optee (original-ish by Meko from
5+
EVB)
56

67
---
78
configs/rk3588_meko_defconfig | 238 ++++++++++

patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot.patch renamed to patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Ricardo Pardini <ricardo@pardini.net>
33
Date: Thu, 5 Oct 2023 15:31:11 +0200
4-
Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot
4+
Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot and working
5+
RECOVERY button
56

7+
- rk3588-blueberry-edge-v12.dts: add KEY_VOLUMEUP adc-keys for RECOVERY button to work again
8+
- rk3588_meko_r58x_defconfig: equalize with rk3588_meko_defconfig
69
---
7-
arch/arm/dts/rk3588-blueberry-edge-v12.dts | 142 ++++++
8-
configs/rk3588_meko_r58x_defconfig | 242 ++++++++++
9-
2 files changed, 384 insertions(+)
10+
arch/arm/dts/rk3588-blueberry-edge-v12.dts | 159 ++++++
11+
configs/rk3588_meko_r58x_defconfig | 248 ++++++++++
12+
2 files changed, 407 insertions(+)
1013

1114
diff --git a/arch/arm/dts/rk3588-blueberry-edge-v12.dts b/arch/arm/dts/rk3588-blueberry-edge-v12.dts
1215
new file mode 100644
13-
index 00000000000..27ea53a7f93
16+
index 00000000000..5dd31189e3d
1417
--- /dev/null
1518
+++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts
16-
@@ -0,0 +1,142 @@
19+
@@ -0,0 +1,159 @@
1720
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1821
+/*
1922
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd
@@ -29,6 +32,23 @@ index 00000000000..27ea53a7f93
2932
+ model = "Mekotronics R58X-4G (RK3588 EDGE LP4x V1.2 BlueBerry Board)";
3033
+ compatible = "rockchip,rk3588-blueberry-edge-v12-linux", "rockchip,rk3588";
3134
+
35+
+ // This is needed for the RECOVERY button to actually trigger LOADER mode when pressed during boot
36+
+ adc-keys {
37+
+ compatible = "adc-keys";
38+
+ io-channels = <&saradc 1>;
39+
+ io-channel-names = "buttons";
40+
+ keyup-threshold-microvolt = <1800000>;
41+
+ u-boot,dm-pre-reloc;
42+
+ status = "okay";
43+
+
44+
+ volumeup-key {
45+
+ u-boot,dm-pre-reloc;
46+
+ linux,code = <KEY_VOLUMEUP>;
47+
+ label = "volume up";
48+
+ press-threshold-microvolt = <1750>;
49+
+ };
50+
+ };
51+
+
3252
+ vcc12v_dcin: vcc12v-dcin {
3353
+ u-boot,dm-pre-reloc;
3454
+ compatible = "regulator-fixed";
@@ -158,10 +178,10 @@ index 00000000000..27ea53a7f93
158178
+
159179
diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig
160180
new file mode 100644
161-
index 00000000000..21d768e5777
181+
index 00000000000..b03ffa9437c
162182
--- /dev/null
163183
+++ b/configs/rk3588_meko_r58x_defconfig
164-
@@ -0,0 +1,242 @@
184+
@@ -0,0 +1,248 @@
165185
+CONFIG_ARM=y
166186
+CONFIG_ARCH_ROCKCHIP=y
167187
+CONFIG_SPL_GPIO_SUPPORT=y
@@ -170,7 +190,6 @@ index 00000000000..21d768e5777
170190
+CONFIG_SYS_MALLOC_F_LEN=0x80000
171191
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
172192
+CONFIG_ROCKCHIP_RK3588=y
173-
+CONFIG_ROCKCHIP_USB_BOOT=y
174193
+CONFIG_ROCKCHIP_FIT_IMAGE=y
175194
+CONFIG_ROCKCHIP_HWID_DTB=y
176195
+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
@@ -197,6 +216,10 @@ index 00000000000..21d768e5777
197216
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
198217
+CONFIG_BOOTDELAY=1
199218
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
219+
+CONFIG_LOG=y
220+
+CONFIG_SPL_LOG=y
221+
+CONFIG_LOG_MAX_LEVEL=7
222+
+CONFIG_SPL_LOG_MAX_LEVEL=6
200223
+# CONFIG_DISPLAY_CPUINFO is not set
201224
+CONFIG_ANDROID_BOOTLOADER=y
202225
+CONFIG_ANDROID_AVB=y
@@ -210,8 +233,9 @@ index 00000000000..21d768e5777
210233
+CONFIG_SPL_MMC_WRITE=y
211234
+CONFIG_SPL_MTD_SUPPORT=y
212235
+CONFIG_SPL_ATF=y
236+
+CONFIG_SPL_AB=y
213237
+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
214-
+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
238+
+CONFIG_FASTBOOT_BUF_SIZE=0x07000000
215239
+CONFIG_FASTBOOT_FLASH=y
216240
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
217241
+CONFIG_CMD_BOOTZ=y
@@ -248,6 +272,7 @@ index 00000000000..21d768e5777
248272
+CONFIG_SPL_DTB_MINIMUM=y
249273
+CONFIG_OF_LIVE=y
250274
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
275+
+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
251276
+# CONFIG_NET_TFTP_VARS is not set
252277
+CONFIG_REGMAP=y
253278
+CONFIG_SPL_REGMAP=y
@@ -303,7 +328,6 @@ index 00000000000..21d768e5777
303328
+CONFIG_SPI_FLASH_XMC=y
304329
+CONFIG_SPI_FLASH_XTX=y
305330
+CONFIG_SPI_FLASH_MTD=y
306-
+CONFIG_PHY_REALTEK=y
307331
+CONFIG_DM_ETH=y
308332
+CONFIG_DM_ETH_PHY=y
309333
+CONFIG_DWC_ETH_QOS=y
@@ -380,6 +404,8 @@ index 00000000000..21d768e5777
380404
+CONFIG_DRM_ROCKCHIP=y
381405
+CONFIG_DRM_MAXIM_MAX96745=y
382406
+CONFIG_DRM_MAXIM_MAX96755F=y
407+
+CONFIG_DRM_PANEL_ROHM_BU18RL82=y
408+
+CONFIG_DRM_PANEL_MAXIM_MAX96752F=y
383409
+CONFIG_DRM_ROHM_BU18XL82=y
384410
+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
385411
+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y

patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-add-debugs-for-download-button-not-working.patch renamed to patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Ricardo Pardini <ricardo@pardini.net>
33
Date: Sun, 18 Feb 2024 14:33:37 +0100
4-
Subject: boot_rkimg: add debugs for download button not working
4+
Subject: boot_rkimg: don't try rockchip_u2phy_vbus_detect when RECOVERY button
5+
pressed
56

7+
- boot_rkimg: add debugs for download button not working
68
---
7-
arch/arm/mach-rockchip/boot_rkimg.c | 7 +++++--
8-
1 file changed, 5 insertions(+), 2 deletions(-)
9+
arch/arm/mach-rockchip/boot_rkimg.c | 9 ++++++---
10+
1 file changed, 6 insertions(+), 3 deletions(-)
911

1012
diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c
11-
index 9e6c3556a9e..f1a683d4e8e 100644
13+
index 9e6c3556a9e..f79aed467bc 100644
1214
--- a/arch/arm/mach-rockchip/boot_rkimg.c
1315
+++ b/arch/arm/mach-rockchip/boot_rkimg.c
14-
@@ -322,6 +322,9 @@ void setup_download_mode(void)
16+
@@ -322,14 +322,17 @@ void setup_download_mode(void)
1517

1618
boot_devtype_init();
1719

18-
+ printf("setup_download_mode checking if download %skey pressed... ",
20+
+ printf("setup_download_mode checking if download %skey pressed...\n",
1921
+ is_hotkey(HK_ROCKUSB_DNL) ? "is HOT YES" : "is NOT HOT");
2022
+
2123
if (rockchip_dnl_key_pressed() || is_hotkey(HK_ROCKUSB_DNL)) {
2224
printf("download %skey pressed... ",
2325
is_hotkey(HK_ROCKUSB_DNL) ? "hot" : "");
24-
@@ -329,7 +332,7 @@ void setup_download_mode(void)
25-
vbus = rockchip_u2phy_vbus_detect();
26+
#ifdef CONFIG_CMD_ROCKUSB
27+
- vbus = rockchip_u2phy_vbus_detect();
28+
+ // vbus = rockchip_u2phy_vbus_detect(); // rpardini: don't do this, it fails with -19
2629
#endif
2730
if (vbus > 0) {
2831
- printf("%sentering download mode...\n",

‎patch/u-boot/legacy/u-boot-meko-rk3588/0006-rk3588_meko_r58x_defconfig-equalize-with-rk3588_meko_defconfig.patch‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎patch/u-boot/legacy/u-boot-meko-rk3588/0007-rk3588-blueberry-edge-v12.dts-add-KEY_VOLUMEUP-adc-keys-for-RECOVERY-button-to-work-again.patch‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎patch/u-boot/legacy/u-boot-meko-rk3588/0008-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)