Skip to content

Commit

Permalink
genimage adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@citruz
citruz committed Jun 22, 2024
1 parent 6c76c85 commit 79181b2
Show file tree
Hide file tree
Showing 18 changed files with 50 additions and 29 deletions.
1 change: 1 addition & 0 deletions buildroot-external/board/radxa/cmdline.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200n8
9 changes: 1 addition & 8 deletions buildroot-external/board/radxa/hassos-hook.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -x

function hassos_pre_image() {
local BOOT_DATA="$(path_boot_dir)"
local SPL_IMG="$(path_spl_img)"

cp -t "${BOOT_DATA}" \
"${BINARIES_DIR}/boot.scr" \
Expand All @@ -14,13 +13,7 @@ function hassos_pre_image() {

cp "${BOARD_DIR}/../boot-env-common.txt" "${BOOT_DATA}/haos-config.txt"
cat "${BOARD_DIR}/boot-env.txt" >> "${BOOT_DATA}/haos-config.txt"

echo "earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200n8" > "${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 # 0x8000
cp "${BOARD_DIR}/../cmdline.txt" "${BOOT_DATA}/cmdline.txt"
}


Expand Down
13 changes: 13 additions & 0 deletions buildroot-external/board/radxa/image-spl-spl.cfg
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
7 changes: 7 additions & 0 deletions buildroot-external/board/radxa/partition-spl-spl.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
partition spl {
size = ${BOOT_SPL_SIZE}
image = "spl.img"
in-partition-table = "no"
offset = 0
holes = {"(0; 17k)"}
}
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rock-4c-plus/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock 4C+"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rock-4se/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock 4SE"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rockpi-4a-plus/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock Pi 4A+"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rockpi-4a/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock Pi 4A"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rockpi-4b-plus/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock Pi 4B+"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rockpi-4b/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock Pi 4B"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
4 changes: 2 additions & 2 deletions buildroot-external/board/radxa/rockpi-4c/meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ BOARD_NAME="Rock Pi 4C"
CHASSIS=embedded
BOOTLOADER=uboot
KERNEL_FILE=Image
BOOT_SYS=gpt
PARTITION_TABLE_TYPE=gpt
BOOT_SIZE=24M
BOOT_SPL=true
BOOT_SPL_SIZE=8M
BOOT_ENV_SIZE=0x8000
SUPERVISOR_MACHINE=qemuarm-64
SUPERVISOR_ARCH=aarch64
DISK_SIZE=2
DISK_SIZE=2G
3 changes: 2 additions & 1 deletion buildroot-external/configs/rock_4c_plus_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rock_4se_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rockpi_4a_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rockpi_4a_plus_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rockpi_4b_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rockpi_4b_plus_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down
3 changes: 2 additions & 1 deletion buildroot-external/configs/rockpi_4c_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-rockchip.bin"
# Kernel
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/radxa/kernel.config"
Expand All @@ -66,6 +66,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Host Packages
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
Expand Down

0 comments on commit 79181b2

Please sign in to comment.