configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01
The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am62x_sk_defconfig expect the "gp" one Tested on SK-AM62B-P1. Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> Tested-by: Michael Trimarchi <michael@amarulasolutions.com> Tested-by: Andreas Dannenberg <dannenberg@ti.com> Tested-by: Gero Schwäricke <gero.schwaericke@grandcentrix.net> Tested-by: Bryan Brattlof <bb@ti.com> Reviewed-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Dario Binacchi
Romain Naour
parent
6439a10e98
commit
0059e3c555
@ -4,10 +4,15 @@ image boot.vfat {
|
||||
"tiboot3.bin",
|
||||
"tispl.bin",
|
||||
"u-boot.img",
|
||||
"k3-am625-sk.dtb",
|
||||
"Image"
|
||||
}
|
||||
file extlinux/extlinux.conf {
|
||||
image = extlinux.conf
|
||||
}
|
||||
}
|
||||
|
||||
size = 16M
|
||||
size = 64M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2
|
||||
sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
|
||||
|
||||
54
board/ti/am62x-sk/post-build.sh
Executable file
54
board/ti/am62x-sk/post-build.sh
Executable file
@ -0,0 +1,54 @@
|
||||
#!/bin/sh -x
|
||||
|
||||
# genimage will need to find the extlinux.conf
|
||||
# in the binaries directory
|
||||
|
||||
die() {
|
||||
cat <<EOF >&2
|
||||
Error: $@
|
||||
|
||||
Usage: ${0} -c <console> -r <root> [-x <extra-args>]
|
||||
EOF
|
||||
exit 1
|
||||
}
|
||||
|
||||
o='c:d:r:x:'
|
||||
O='console:,devicetree:,root:,extra-args:'
|
||||
opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
|
||||
eval set -- "${opts}"
|
||||
while [ ${#} -gt 0 ]; do
|
||||
case "${1}" in
|
||||
(-c|--console)
|
||||
CONSOLE="${2}"; shift 2
|
||||
;;
|
||||
(-d|--devicetree)
|
||||
DEVICETREE="${2}"; shift 2
|
||||
;;
|
||||
(-r|--root)
|
||||
ROOT="${2}"; shift 2
|
||||
;;
|
||||
(-x|--extra-args)
|
||||
EXTRA_ARGS="${2}"; shift 2
|
||||
;;
|
||||
(--)
|
||||
shift 1; break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
[ -n "${CONSOLE}" ] || die "Missing \`console' argument"
|
||||
[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
|
||||
[ -n "${ROOT}" ] || die "Missing \`root' argument"
|
||||
append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
|
||||
if [ -n "${EXTRA_ARGS}" ]; then
|
||||
append="${append} ${EXTRA_ARGS}"
|
||||
fi
|
||||
|
||||
mkdir -p "${BINARIES_DIR}"
|
||||
cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
|
||||
label am62x-sk-buildroot
|
||||
kernel /Image
|
||||
fdtdir /
|
||||
devicetree /${DEVICETREE}
|
||||
append ${append}
|
||||
__HEADER_EOF
|
||||
@ -1,15 +1,16 @@
|
||||
BR2_aarch64=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
|
||||
BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE=y
|
||||
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
@ -23,21 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite"
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
|
||||
BR2_TARGET_OPTEE_OS=y
|
||||
BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"
|
||||
BR2_TARGET_TI_K3_IMAGE_GEN=y
|
||||
BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y
|
||||
BR2_TARGET_TI_K3_R5_LOADER=y
|
||||
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
|
||||
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
|
||||
BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
|
||||
BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
|
||||
BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
|
||||
BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
|
||||
BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
|
||||
BR2_TARGET_UBOOT_USE_BINMAN=y
|
||||
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
|
||||
Loading…
Reference in New Issue
Block a user