Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mksklipad50: Switch to u-boot v2025.01 (resend) #7936

Merged
merged 6 commits into from
Mar 12, 2025
Merged

mksklipad50: Switch to u-boot v2025.01 (resend) #7936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
750c986
mksklipad50: devicetree cleanups
torte71 Mar 7, 2025
13d2c52
mksklipad50: switch to uboot v2025.01
torte71 Mar 7, 2025
8bd7049
mksklipad50: uboot2025: generate trust.ini (bl31.elf)
torte71 Mar 6, 2025
4f56ac2
mksklipad50: uboot2025: fix usb dwc2-otg/dwc3-host compile
torte71 Mar 6, 2025
0719fae
mksklipad50: uboot2025: enable usb for serial access
torte71 Mar 6, 2025
f630070
mksklipad50: uboot2025: add boot delay (for uart to come up)
torte71 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions config/boards/mksklipad50.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ BOOT_LOGO="desktop"
MODULES="pinctrl-rk805 ads7846 spidev"
BOOTFS_TYPE="fat"
PACKAGE_LIST_BOARD="build-essential usb-modeswitch"

BOOTBRANCH='tag:v2025.01'
BOOTPATCHDIR='v2025.01'

function post_family_config__uboot_config() {
BOOTDELAY=1 # Wait for UART
}
8 changes: 4 additions & 4 deletions patch/kernel/archive/rockchip64-6.12/dt/rk3328-mksklipad50.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";

aliases {
ethernet0 = "/ethernet@ff540000";
ethernet1 = "/ethernet@ff550000";
ethernet0 = &gmac2io;
ethernet1 = &gmac2phy;
mmc0 = &sdmmc;
mmc1 = &emmc;
};
Expand Down Expand Up @@ -314,7 +314,7 @@
compatible = "rockchip,rk805";
reg = <0x18>;
interrupt-parent = <&gpio1>;
interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
#clock-cells = <1>;
clock-output-names = "xin32k", "rk805-clkout2";
gpio-controller;
Expand Down Expand Up @@ -423,7 +423,7 @@
};

&pwm3 {
interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
};

&io_domains {
Expand Down
8 changes: 4 additions & 4 deletions patch/kernel/archive/rockchip64-6.14/dt/rk3328-mksklipad50.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";

aliases {
ethernet0 = "/ethernet@ff540000";
ethernet1 = "/ethernet@ff550000";
ethernet0 = &gmac2io;
ethernet1 = &gmac2phy;
mmc0 = &sdmmc;
mmc1 = &emmc;
};
Expand Down Expand Up @@ -314,7 +314,7 @@
compatible = "rockchip,rk805";
reg = <0x18>;
interrupt-parent = <&gpio1>;
interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
#clock-cells = <1>;
clock-output-names = "xin32k", "rk805-clkout2";
gpio-controller;
Expand Down Expand Up @@ -423,7 +423,7 @@
};

&pwm3 {
interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
};

&io_domains {
Expand Down
2 changes: 1 addition & 1 deletion ...01-rk3328-mksklipad50-add-defconfig.patch → ...01-rk3328-mksklipad50-add-defconfig.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 0000000000..1514ee63bb
+CONFIG_SPL_GPIO=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-mksklipad50"
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-mksklipad50"
+CONFIG_ROCKCHIP_RK3328=y
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
Expand Down
20 changes: 11 additions & 9 deletions ...02-rk3328-mksklipad50-add-uboot-dts.patch → ...02-rk3328-mksklipad50-add-uboot-dts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thorsten Maerz <info@netztorte.de>
Date: Fri, 31 Jan 2025 10:35:20 +0100
Date: Thu, 06 Mar 2025 18:25:31 +0100
Subject: feat: Add u-boot dts for MKSKLIPAD50 board
---

diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad50.dts
--- a/arch/arm/dts/rk3328-mksklipad50.dts 1970-01-01 01:00:00.000000000 +0100
+++ b/arch/arm/dts/rk3328-mksklipad50.dts 2025-01-31 10:35:20.328782652 +0100
@@ -0,0 +1,569 @@
diff --git a/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts b/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts
--- a/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts 1970-01-01 01:00:00.000000000 +0100
+++ b/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts 2025-03-06 18:25:31.937819640 +0100
@@ -0,0 +1,571 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Based on rk3328-roc-cc.dtb from original MKS-Klipad50 image
Expand All @@ -23,8 +23,8 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
+ compatible = "mks,rk3328-mksklipad50", "mks,rk3328-mkspi", "rockchip,rk3328";
+
+ aliases {
+ ethernet0 = "/ethernet@ff540000";
+ ethernet1 = "/ethernet@ff550000";
+ ethernet0 = &gmac2io;
+ ethernet1 = &gmac2phy;
+ mmc0 = &sdmmc;
+ mmc1 = &emmc;
+ };
Expand Down Expand Up @@ -286,7 +286,7 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
+ compatible = "rockchip,rk805";
+ reg = <0x18>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <RK_PD0 IRQ_TYPE_LEVEL_LOW>;
+ interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
+ #clock-cells = <1>;
+ clock-output-names = "xin32k", "rk805-clkout2";
+ gpio-controller;
Expand Down Expand Up @@ -395,7 +395,7 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
+};
+
+&pwm3 {
+ interrupts = <GIC_SPI SCLK_TIMER3 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+};
+
+&io_domains {
Expand Down Expand Up @@ -556,10 +556,12 @@ diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad
+};
+
+&usb_host0_ehci {
+ bootph-all;
+ status = "okay";
+};
+
+&usb_host0_ohci {
+ bootph-all;
+ status = "okay";
+};
+
Expand Down
37 changes: 37 additions & 0 deletions patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thorsten Maerz <info@netztorte.de>
Date: Thu, 06 Mar 2025 11:09:00 +0100
Subject: Fix multiple dwc2/dwc3 definitions

Fixes "multiple definition of 'dm_usb_gadget_handle_interrupts'"
See https://lore.kernel.org/u-boot/7805b8d0-fb7c-41d5-8d74-f85dfd40233a@kwiboo.se/
---

diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 2ab41cbae4..ccc1803fb3 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -192,7 +192,7 @@ static int dwc3_generic_of_to_plat(struct udevice *dev)
return 0;
}

-#if CONFIG_IS_ENABLED(DM_USB_GADGET)
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && CONFIG_IS_ENABLED(DM_USB_GADGET)
static int dwc3_generic_peripheral_probe(struct udevice *dev)
{
struct dwc3_generic_priv *priv = dev_get_priv(dev);


diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a35b8c2f64..9bd06afe0a 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -988,7 +988,7 @@ MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");

-#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET)
__weak int dwc3_uboot_interrupt_status(struct udevice *dev)
{
return 1;
29 changes: 29 additions & 0 deletions patch/u-boot/v2025.01/board_mksklipad50/04-rk3328-mksklipad50-add-trust-ini.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thorsten Maerz <info@netztorte.de>
Date: Thu, 06 Mar 2025 11:09:00 +0100
Subject: Add uboot trust.ini (bl31.elf)

Build trust.ini (required for uboot)
---

diff --git a/trust.ini b/trust.ini
new file mode 100644
index 0000000..4af021a
--- /dev/null
+++ b/trust.ini
@@ -0,0 +1,15 @@
+[VERSION]
+MAJOR=1
+MINOR=0
+[BL30_OPTION]
+SEC=0
+[BL31_OPTION]
+SEC=1
+PATH=bl31.elf
+ADDR=0x10000
+[BL32_OPTION]
+SEC=0
+[BL33_OPTION]
+SEC=0
+[OUTPUT]
+PATH=trust.bin
Loading