Skip to content

Commit 13d2c52

Browse files
committed
mksklipad50: switch to uboot v2025.01
Fixes loading initramfs into EFI memory region, leading to errors "efi_free_pool: illegal free". Which may be the cause for these bootloops: armbian#7883 (comment) See also: https://lore.kernel.org/all/d3f3fc7f-b29a-4503-9fe0-97468bbe1f71@gmx.de/
1 parent 750c986 commit 13d2c52

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

config/boards/mksklipad50.conf

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ BOOT_LOGO="desktop"
1010
MODULES="pinctrl-rk805 ads7846 spidev"
1111
BOOTFS_TYPE="fat"
1212
PACKAGE_LIST_BOARD="build-essential usb-modeswitch"
13+
14+
BOOTBRANCH='tag:v2025.01'
15+
BOOTPATCHDIR='v2025.01'

patch/u-boot/u-boot-rockchip64/board_mksklipad50/01-rk3328-mksklipad50-add-defconfig.patch patch/u-boot/v2025.01/board_mksklipad50/01-rk3328-mksklipad50-add-defconfig.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ index 0000000000..1514ee63bb
2121
+CONFIG_SPL_GPIO=y
2222
+CONFIG_NR_DRAM_BANKS=1
2323
+CONFIG_ENV_OFFSET=0x3F8000
24-
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-mksklipad50"
24+
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3328-mksklipad50"
2525
+CONFIG_ROCKCHIP_RK3328=y
2626
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
2727
+CONFIG_TPL_LIBCOMMON_SUPPORT=y

patch/u-boot/u-boot-rockchip64/board_mksklipad50/02-rk3328-mksklipad50-add-uboot-dts.patch patch/u-boot/v2025.01/board_mksklipad50/02-rk3328-mksklipad50-add-uboot-dts.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Date: Thu, 06 Mar 2025 18:25:31 +0100
44
Subject: feat: Add u-boot dts for MKSKLIPAD50 board
55
---
66

7-
diff --git a/arch/arm/dts/rk3328-mksklipad50.dts b/arch/arm/dts/rk3328-mksklipad50.dts
8-
--- a/arch/arm/dts/rk3328-mksklipad50.dts 1970-01-01 01:00:00.000000000 +0100
9-
+++ b/arch/arm/dts/rk3328-mksklipad50.dts 2025-03-06 18:25:31.937819640 +0100
10-
@@ -0,0 +1,569 @@
7+
diff --git a/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts b/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts
8+
--- a/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts 1970-01-01 01:00:00.000000000 +0100
9+
+++ b/dts/upstream/src/arm64/rockchip/rk3328-mksklipad50.dts 2025-03-06 18:25:31.937819640 +0100
10+
@@ -0,0 +1,571 @@
1111
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1212
+/*
1313
+ * Based on rk3328-roc-cc.dtb from original MKS-Klipad50 image

0 commit comments

Comments
 (0)