board/bananapi/bananapi-m2-berry: switch to use extlinux.conf

While switching bump Linux version to 6.1.57 and U-Boot version to
2023.10.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Giulio Benetti 2023-10-13 23:08:40 +02:00 committed by Thomas Petazzoni
parent e60fde3451
commit 7aa75f9d16
5 changed files with 14 additions and 30 deletions

View File

@ -1,7 +0,0 @@
setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait
mmc dev 0
fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $fdt_addr_r sun8i-v40-bananapi-m2-berry.dtb
bootz $kernel_addr_r - $fdt_addr_r

View File

@ -0,0 +1,4 @@
label Bananapi M2 Berry linux
kernel /boot/zImage
devicetree /boot/sun8i-v40-bananapi-m2-berry.dtb
append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait

View File

@ -1,15 +1,3 @@
image boot.vfat {
vfat {
files = {
"zImage",
"sun8i-v40-bananapi-m2-berry.dtb",
"boot.scr"
}
}
size = 64M
}
image sdcard.img {
hdimage {
}
@ -21,12 +9,6 @@ image sdcard.img {
size = 1016K # 1MB - 8KB
}
partition boot {
partition-type = 0xC
bootable = "true"
image = "boot.vfat"
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"

View File

@ -0,0 +1,6 @@
#!/bin/sh
BOARD_DIR="$(dirname "$0")"
install -m 644 -D "${BOARD_DIR}"/extlinux.conf \
"${TARGET_DIR}"/boot/extlinux/extlinux.conf

View File

@ -2,21 +2,23 @@ BR2_arm=y
BR2_cortex_a7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Berry"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/bananapi/bananapi-m2-berry/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-berry/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.38"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.57"
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v40-bananapi-m2-berry"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@ -26,6 +28,3 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m2-berry/boot.cmd"