diff --git a/.checkpackageignore b/.checkpackageignore index 0cc742bf09..c213baf258 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -85,7 +85,6 @@ board/stmicroelectronics/common/stm32mp1xx/post-image.sh Shellcheck board/stmicroelectronics/stm32f429-disco/flash.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_sd.sh Shellcheck board/stmicroelectronics/stm32f469-disco/flash_xip.sh Shellcheck -board/stmicroelectronics/stm32f469-disco/post-build.sh Shellcheck board/synopsys/axs10x/post-build.sh Shellcheck board/technologic/ts4900/post-image.sh Shellcheck board/toradex/apalis-imx6/post-image.sh Shellcheck diff --git a/board/stmicroelectronics/stm32f469-disco/extlinux.conf b/board/stmicroelectronics/stm32f469-disco/extlinux.conf index 1c2db4383b..65aa286a7a 100644 --- a/board/stmicroelectronics/stm32f469-disco/extlinux.conf +++ b/board/stmicroelectronics/stm32f469-disco/extlinux.conf @@ -1,4 +1,4 @@ label stm32f469-disco-buildroot - kernel /zImage - devicetree /stm32f469-disco.dtb - append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel + kernel /boot/zImage + devicetree /boot/stm32f469-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/board/stmicroelectronics/stm32f469-disco/genimage.cfg b/board/stmicroelectronics/stm32f469-disco/genimage.cfg index 517ead7751..e911a94e46 100644 --- a/board/stmicroelectronics/stm32f469-disco/genimage.cfg +++ b/board/stmicroelectronics/stm32f469-disco/genimage.cfg @@ -1,24 +1,7 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "stm32f469-disco.dtb", - "extlinux" - } - } - - size = 16M -} - image sdcard.img { hdimage { } - partition u-boot { - partition-type = 0xC - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/stmicroelectronics/stm32f469-disco/post-build.sh b/board/stmicroelectronics/stm32f469-disco/post-build.sh index ec20fca7d9..03e9dcae82 100755 --- a/board/stmicroelectronics/stm32f469-disco/post-build.sh +++ b/board/stmicroelectronics/stm32f469-disco/post-build.sh @@ -1,4 +1,4 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${TARGET_DIR}"/boot/extlinux/extlinux.conf diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index c00c043896..97dbce5d46 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -15,6 +15,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y @@ -26,7 +27,5 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_OPENOCD=y