From patchwork Fri Oct 13 21:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1848535 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S6fJC2jBFz1ypX for ; Sat, 14 Oct 2023 08:08:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9B40160F0B; Fri, 13 Oct 2023 21:08:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9B40160F0B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gb8g9gOD4IfT; Fri, 13 Oct 2023 21:08:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id F1AB860FB5; Fri, 13 Oct 2023 21:08:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F1AB860FB5 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2D1951BF3C0 for ; Fri, 13 Oct 2023 21:08:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 06FFD60F28 for ; Fri, 13 Oct 2023 21:08:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 06FFD60F28 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YXMScw6vwz1Z for ; Fri, 13 Oct 2023 21:08:46 +0000 (UTC) Received: from smtpdh16-2.aruba.it (smtpdh16-2.aruba.it [62.149.155.101]) by smtp3.osuosl.org (Postfix) with ESMTPS id DEEBF60F88 for ; Fri, 13 Oct 2023 21:08:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DEEBF60F88 Received: from localhost.localdomain ([146.241.127.78]) by Aruba Outgoing Smtp with ESMTPSA id rPOkqOJuYfJOlrPOkq5PxC; Fri, 13 Oct 2023 23:08:42 +0200 From: Giulio Benetti To: buildroot@buildroot.org Date: Fri, 13 Oct 2023 23:08:41 +0200 Message-Id: <20231013210841.153788-2-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231013210841.153788-1-giulio.benetti@benettiengineering.com> References: <20231013210841.153788-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4xfMvoDhHwK2FwXF02jecPkaslaW4+n1pFOces/H26qxyUuNcnTnINRzytmHw5FkJ9z5D9tyii4WCsege7XdziOsr5YtqVualuszVfr0ikq9kGqgvtYHX0 9OF7kyh0J70JBcHXHkTMGl6SizmZVyq3q/3M7KcbYR+zBnzL9IJLVKCDLm2F1w84gEY+qVkMOzk9lwauH7myfbw6UsarlDyQnq9gk3y/31fj4LMchSvrV4jD hND3R1MFZBmWhdzgcTjY+3Z9GbKoyxCFpz8d7gTZ19G4oej8oMoY/dMgdkEHbLd4iiDtysRo8FMW1Z66vkFxjk7HdqqqGiavbJgjCJ4t33+4iIIrMh/lWWIo iIoNd0iz X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1697231322; bh=wtHx+yFYeMvHImTx+Qxp5OeG+oFF+pO6OSdMIfKjsyg=; h=From:To:Subject:Date:MIME-Version; b=YcL/bj58w7ekWlPXn0jpRIrAo1aLliMKrh33JW+4hPX2kEuSYOswHOg6EmrWmaGa1 F1cIidSqiRlreJ4r6X+wdPLBzEV2wEGjaIgsdO9CG8cYKzsi1KRIxtX+tSm6ZwhGnT 0An2Wq/bQ+U7CrDfXjmi67AGjKCt5S+ldPAhADe2lvgmvIC1aAwrwd960BYh4mUl8z e+gzp3zbBoR7Sv728yO1mD94PK8/u/Ju3htWMhjHYbkF5RmHB0dMQ2UJIk2oY27lcL 9sltX/rFli3VTvBGauzaDO9bhjjSWx2noiKbc57TWbsT1G3KQ6OXRlAEdg5YweIVJO HDiGPlh8fKaag== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=YcL/bj58 Subject: [Buildroot] [PATCH 2/2] board/bananapi/bananapi-m2-ultra: switch to use extlinux.conf X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Giulio Benetti , Jagan Teki , Lothar Felten Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" While switching bump Linux version to 6.1.57 and U-Boot version to 2023.10. Signed-off-by: Giulio Benetti --- board/bananapi/bananapi-m2-ultra/boot.cmd | 7 ------- board/bananapi/bananapi-m2-ultra/extlinux.conf | 4 ++++ board/bananapi/bananapi-m2-ultra/genimage.cfg | 18 ------------------ board/bananapi/bananapi-m2-ultra/post-build.sh | 5 +++++ configs/bananapi_m2_ultra_defconfig | 9 ++++----- 5 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 board/bananapi/bananapi-m2-ultra/boot.cmd create mode 100644 board/bananapi/bananapi-m2-ultra/extlinux.conf create mode 100755 board/bananapi/bananapi-m2-ultra/post-build.sh diff --git a/board/bananapi/bananapi-m2-ultra/boot.cmd b/board/bananapi/bananapi-m2-ultra/boot.cmd deleted file mode 100644 index 9c24eabff6..0000000000 --- a/board/bananapi/bananapi-m2-ultra/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-r40-bananapi-m2-ultra.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m2-ultra/extlinux.conf b/board/bananapi/bananapi-m2-ultra/extlinux.conf new file mode 100644 index 0000000000..f5f35c1d8f --- /dev/null +++ b/board/bananapi/bananapi-m2-ultra/extlinux.conf @@ -0,0 +1,4 @@ +label Bananapi M2 Ultra linux + kernel /boot/zImage + devicetree /boot/sun8i-r40-bananapi-m2-ultra.dtb + append console=ttyS0,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/bananapi/bananapi-m2-ultra/genimage.cfg b/board/bananapi/bananapi-m2-ultra/genimage.cfg index 88324f1f24..92c8677545 100644 --- a/board/bananapi/bananapi-m2-ultra/genimage.cfg +++ b/board/bananapi/bananapi-m2-ultra/genimage.cfg @@ -1,15 +1,3 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-r40-bananapi-m2-ultra.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" diff --git a/board/bananapi/bananapi-m2-ultra/post-build.sh b/board/bananapi/bananapi-m2-ultra/post-build.sh new file mode 100755 index 0000000000..1f5ff6a611 --- /dev/null +++ b/board/bananapi/bananapi-m2-ultra/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 0f267021f8..6b2ba13e41 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -2,21 +2,23 @@ BR2_arm=y BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bananapi/bananapi-m2-ultra/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" +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-r40-bananapi-m2-ultra" +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.01" +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_PYTHON3=y @@ -27,6 +29,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-ultra/boot.cmd"