update panther x2

jianyun8023 · Jun 19, 2024 · 3649a11 · 3649a11
1 parent 84d8044
commit 3649a11
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/buildroot-external/board/panther/x2/cmdline.txt b/buildroot-external/board/panther/x2/cmdline.txt
@@ -0,0 +1 @@
+console=tty0
diff --git a/buildroot-external/board/panther/x2/hassos-hook.sh b/buildroot-external/board/panther/x2/hassos-hook.sh
@@ -3,18 +3,12 @@
 
 function hassos_pre_image() {
     local BOOT_DATA="$(path_boot_dir)"
-    local SPL_IMG="$(path_spl_img)"
 
     cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr"
     cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
 
     cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
     cp "${BOARD_DIR}/cmdline.txt" "${BOOT_DATA}/cmdline.txt"
-
-    # SPL
-    create_spl_image
-
-    dd if="${BINARIES_DIR}/u-boot-rockchip.bin" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
 }
 
 

diff --git a/buildroot-external/board/panther/x2/image-spl-spl.cfg b/buildroot-external/board/panther/x2/image-spl-spl.cfg
@@ -0,0 +1,13 @@
+image spl.img {
+	size = ${BOOT_SPL_SIZE}
+
+	hdimage {
+		partition-table-type = "none"
+		fill = "yes"
+	}
+
+	partition uboot {
+		offset = 32k
+		image = "u-boot-rockchip.bin"
+	}
+}
diff --git a/buildroot-external/board/panther/x2/partition-spl-spl.cfg b/buildroot-external/board/panther/x2/partition-spl-spl.cfg
@@ -0,0 +1,7 @@
+partition spl {
+	size = ${BOOT_SPL_SIZE}
+	image = "spl.img"
+	in-partition-table = "no"
+	offset = 0
+	holes = {"(0; 17k)"}
+}
diff --git a/buildroot-external/configs/panther_x2_defconfig b/buildroot-external/configs/panther_x2_defconfig
@@ -16,7 +16,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/panther/x2 $(BR2_EXTERNAL_HASSOS_PATH)/board/panther/x2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.29"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.33"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/kernel-arm64-rockchip.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/v6.6.y/device-support-wireless.config $(BR2_EXTERNAL_HASSOS_PATH)/board/panther/x2/kernel.config"
@@ -137,9 +137,8 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/u-boot/u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2024.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="panther-x2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config"
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -151,6 +150,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y