diff --git a/.checkpackageignore b/.checkpackageignore index 6599435b62..a708b081e7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -70,7 +70,6 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch lib_patch.Upstream boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch lib_patch.Upstream boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch lib_patch.Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch lib_patch.Upstream -configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash configs/asus_tinker-s_rk3288_defconfig lib_defconfig.ForceCheckHash diff --git a/board/ti/am574x-idk/extlinux.conf b/board/ti/am574x-idk/extlinux.conf index 29e0ecfa14..4faa8f7eed 100644 --- a/board/ti/am574x-idk/extlinux.conf +++ b/board/ti/am574x-idk/extlinux.conf @@ -1,4 +1,4 @@ label am5749-idk-buildroot kernel /zImage fdtdir / - append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait + append console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg index 02a9ffe013..e7ab22f29b 100644 --- a/board/ti/am574x-idk/genimage.cfg +++ b/board/ti/am574x-idk/genimage.cfg @@ -4,9 +4,11 @@ image boot.vfat { "MLO", "u-boot.img", "zImage", - "am574x-idk.dtb", + "ti", "extlinux" } + + label = "boot" } size = 16M @@ -25,6 +27,5 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 1G } } diff --git a/board/ti/am574x-idk/patches/linux/linux.hash b/board/ti/am574x-idk/patches/linux/linux.hash new file mode 100644 index 0000000000..020dc72386 --- /dev/null +++ b/board/ti/am574x-idk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 f4855f382c1b735c84072bdef36db5bcd5dc7b0c37e42f5104317149a0a486ef linux-6.18.18.tar.xz diff --git a/board/ti/am574x-idk/patches/uboot/uboot.hash b/board/ti/am574x-idk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..36322a6a90 --- /dev/null +++ b/board/ti/am574x-idk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd u-boot-2026.04.tar.bz2 diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig index 5d3ec12ad6..3ec8829ff7 100644 --- a/configs/am574x_idk_defconfig +++ b/configs/am574x_idk_defconfig @@ -1,26 +1,33 @@ BR2_arm=y BR2_cortex_a15=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y +BR2_GLOBAL_PATCH_DIR="board/ti/am574x-idk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.18" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y