try 2024.01 defconfig

Author: nberlee

artifacts/turingrk1/u-boot/patches/0002-load-kernel-dtb-file-correctly.patch

@@ -1,13 +1,69 @@
 diff --git a/configs/turing-rk1-rk3588_defconfig b/configs/turing-rk1-rk3588_defconfig
-index 05ef5bf..038b147 100644
+index 05ef5bf5..8ff10b76 100644
 --- a/configs/turing-rk1-rk3588_defconfig
 +++ b/configs/turing-rk1-rk3588_defconfig
-@@ -5,7 +5,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
- CONFIG_ARCH_ROCKCHIP=y
- CONFIG_SF_DEFAULT_SPEED=24000000
- CONFIG_SF_DEFAULT_MODE=0x2000
--CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-turing-rk1"
-+CONFIG_DEFAULT_DEVICE_TREE="rk3588-turing-rk1"
- CONFIG_ROCKCHIP_RK3588=y
- CONFIG_ROCKCHIP_SPI_IMAGE=y
- CONFIG_SPL_SERIAL=y
+@@ -23,6 +23,7 @@ CONFIG_FIT_VERBOSE=y
+ CONFIG_SPL_FIT_SIGNATURE=y
+ CONFIG_SPL_LOAD_FIT=y
+ CONFIG_LEGACY_IMAGE_FORMAT=y
++CONFIG_OF_BOARD_SETUP=y
+ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-turing-rk1.dtb"
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_DISPLAY_BOARDINFO_LATE=y
+diff --git a/board/turing/turing-rk1-rk3588/Makefile b/board/turing/turing-rk1-rk3588/Makefile
+new file mode 100644
+index 0000000000..a979d8023a
+--- /dev/null
++++ b/board/turing/turing-rk1-rk3588/Makefile
+@@ -0,0 +1,6 @@
++# SPDX-License-Identifier:     GPL-2.0+
++#
++# Copyright (c) 2023 Rockchip Electronics Co,. Ltd.
++#
++
++obj-y += turing-rk1-rk3588.o
+diff --git a/board/turing/turing-rk1-rk3588/turing-rk1-rk3588.c b/board/turing/turing-rk1-rk3588/turing-rk1-rk3588.c
+new file mode 100644
+index 0000000000..e2338a2a35
+--- /dev/null
++++ b/board/turing/turing-rk1-rk3588/turing-rk1-rk3588.c
+@@ -0,0 +1,39 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright (c) 2023 Rockchip Electronics Co,. Ltd.
++ */
++
++#include <fdtdec.h>
++#include <fdt_support.h>
++
++#ifdef CONFIG_OF_BOARD_SETUP
++int turing_rk1_add_reserved_memory_fdt_nodes(void *new_blob)
++{
++	struct fdt_memory gap1 = {
++		.start = 0x3fc000000,
++		.end = 0x3fc4fffff,
++	};
++	struct fdt_memory gap2 = {
++		.start = 0x3fff00000,
++		.end = 0x3ffffffff,
++	};
++	unsigned long flags = FDTDEC_RESERVED_MEMORY_NO_MAP;
++	unsigned int ret;
++
++	/*
++	 * Inject the reserved-memory nodes into the DTS
++	 */
++	ret = fdtdec_add_reserved_memory(new_blob, "gap1", &gap1,  NULL, 0,
++					 NULL, flags);
++	if (ret)
++		return ret;
++
++	return fdtdec_add_reserved_memory(new_blob, "gap2", &gap2,  NULL, 0,
++					  NULL, flags);
++}
++
++int ft_board_setup(void *blob, struct bd_info *bd)
++{
++	return turing_rk1_add_reserved_memory_fdt_nodes(blob);
++}
++#endif

artifacts/turingrk1/u-boot/pkg.yaml

@@ -31,7 +31,7 @@ steps:
           echo "Applying $patch"
           patch -p1 < $patch || (echo "Failed to apply patch $patch" && exit 1)
         done
-        cp /pkg/*_defconfig configs
+        #cp /pkg/*_defconfig configs
 
         cp -f /pkg/rkbin/*.bin .
       - |
@@ -42,7 +42,8 @@ steps:
     install:
       - |
         mkdir -p /rootfs/artifacts/arm64/u-boot/turingrk1
-        cp -v -t /rootfs/artifacts/arm64/u-boot/turingrk1 u-boot-rockchip.bin u-boot-rockchip-spi.bin
+        cp -v -t /rootfs/artifacts/arm64/u-boot/turingrk1 u-boot-rockchip.bin 
+        #u-boot-rockchip-spi.bin
 finalize:
   - from: /rootfs
     to: /rootfs