From patchwork Tue Jul 20 04:36:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1507375 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=bdxK2kng; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GTQsR4tKXz9s24 for ; Tue, 20 Jul 2021 14:36:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 512A582969; Tue, 20 Jul 2021 04:36:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PBQSl_ooxP5H; Tue, 20 Jul 2021 04:36:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 829D68303C; Tue, 20 Jul 2021 04:36:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3F9C41BF37F for ; Tue, 20 Jul 2021 04:36:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2EC5B8303C for ; Tue, 20 Jul 2021 04:36:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xzTmT2zfmcSz for ; Tue, 20 Jul 2021 04:36:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 10D5082969 for ; Tue, 20 Jul 2021 04:36:32 +0000 (UTC) Received: by mail-wm1-x32f.google.com with SMTP id f10-20020a05600c4e8ab029023e8d74d693so1207017wmq.3 for ; Mon, 19 Jul 2021 21:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T0SsMyuyErqlTdW/CQ3C/a4advyE2SjCD8ud7cnRRZE=; b=bdxK2kngDtMMfKcTCljgZYVzJvUjNNRMZZR3jFMfqGAFZ811db2koHvj4vI15D7iyj ShWwOBCIlEu6GvQcf6O9Em9UdwQAL8PJuDY/3BzogTqlh9LhvukIrs+XLxTycXdRTVuW dUTHx2E7BbXd5M0m/5wDIUjBmP7IS7pLDZMI1j/Wr9GEjIKzG5TtD7veF1yAHS91HHo9 /PbZv3oti9kqWbbI6cgYA3NAEpN04zWslQmvg9TB+KkYx+nbVdrlowHOdCSGK8rdBnvV uswR5DZrEP5pcYcrz6twnLsdFWEpySpgNCtIBm98+Sbj6OshXsmeiirUVJJM9FQxQAWA RmLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=T0SsMyuyErqlTdW/CQ3C/a4advyE2SjCD8ud7cnRRZE=; b=P1uuGX18H0kl8/0qLO/3vt1NWRjNPZwHiUn6PF5T0a7GyKKwNKPFofTDWSuuEBNWle 8PJQScl/vjfOdpDNq33hBihJAKfuivs9hk4/bDAxuqb7aU1IoNNbd3EX3eLuW2/bYYh0 N5AjEGiYLCs4MsG3uV3Aj57HV+xTLZiY4bZoEXPV5IEZRAeLpcKcvN5hoeMWyp5dIWNr ZkjDaIad+7K3a/vmP9rTdnjy92xN/I1+VTl0rQfWdOSnxgWKdCxEeXo3oBrew3rulpUe Pxn6YYw15VCOSpozhs2DzOd9n1sGXeu1RuwQ/BxruEQkvy0EopyC0Z3SthjmIBa/+Fsw rrXg== X-Gm-Message-State: AOAM531dkuIOs6Ibk376Z3r7Btl+TBbdO6v+3v3Zj7sLI/Lam4UT5/Z3 31b9kjETMhHHL83eCW564GCiQtCXfOs= X-Google-Smtp-Source: ABdhPJwsoTaQNswiMX+Gv2ywXMyVKvaY/vzeBjdwZPRVP1ezigUAgOyb0+8wD3QOIi6Kbv9i507fYQ== X-Received: by 2002:a7b:c1c2:: with SMTP id a2mr28138029wmj.15.1626755791065; Mon, 19 Jul 2021 21:36:31 -0700 (PDT) Received: from vm-user.. (12.197.24.93.rev.sfr.net. [93.24.197.12]) by smtp.gmail.com with ESMTPSA id o15sm1263577wmh.40.2021.07.19.21.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 21:36:30 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Tue, 20 Jul 2021 06:36:07 +0200 Message-Id: <20210720043607.2325813-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] board/olimex/a20_olinuxino: switch to extlinux.conf X-BeenThere: buildroot@busybox.net 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: Leon Anavi Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" a10_olinuxino is not switched, so broken links are replaced by the previous content Signed-off-by: Francois Perrad --- board/olimex/a10_olinuxino/boot.cmd | 6 +++++- board/olimex/a10_olinuxino/post-build.sh | 4 +++- board/olimex/a20_olinuxino/boot.cmd | 5 ----- board/olimex/a20_olinuxino/post-build.sh | 3 --- .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++++ configs/olimex_a20_olinuxino_lime2_defconfig | 4 +--- configs/olimex_a20_olinuxino_lime_defconfig | 4 +--- 7 files changed, 14 insertions(+), 16 deletions(-) mode change 120000 => 100644 board/olimex/a10_olinuxino/boot.cmd mode change 120000 => 100755 board/olimex/a10_olinuxino/post-build.sh delete mode 100644 board/olimex/a20_olinuxino/boot.cmd delete mode 100755 board/olimex/a20_olinuxino/post-build.sh create mode 100644 board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd deleted file mode 120000 index 612c74550..000000000 --- a/board/olimex/a10_olinuxino/boot.cmd +++ /dev/null @@ -1 +0,0 @@ -../a20_olinuxino/boot.cmd \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/boot.cmd b/board/olimex/a10_olinuxino/boot.cmd new file mode 100644 index 000000000..44d9239a9 --- /dev/null +++ b/board/olimex/a10_olinuxino/boot.cmd @@ -0,0 +1,5 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} +ext4load mmc 0 0x49000000 /boot/${fdtfile} +ext4load mmc 0 0x46000000 /boot/zImage +env set fdt_high ffffffff +bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh deleted file mode 120000 index b34689602..000000000 --- a/board/olimex/a10_olinuxino/post-build.sh +++ /dev/null @@ -1 +0,0 @@ -../a20_olinuxino/post-build.sh \ No newline at end of file diff --git a/board/olimex/a10_olinuxino/post-build.sh b/board/olimex/a10_olinuxino/post-build.sh new file mode 100755 index 000000000..d3f612f81 --- /dev/null +++ b/board/olimex/a10_olinuxino/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/olimex/a20_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd deleted file mode 100644 index 44d9239a9..000000000 --- a/board/olimex/a20_olinuxino/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} -ext4load mmc 0 0x49000000 /boot/${fdtfile} -ext4load mmc 0 0x46000000 /boot/zImage -env set fdt_high ffffffff -bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh deleted file mode 100755 index d3f612f81..000000000 --- a/board/olimex/a20_olinuxino/post-build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000..f754da362 --- /dev/null +++ b/board/olimex/a20_olinuxino/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label Olinuxino + kernel /boot/zImage + fdtdir /boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 84582dc25..213e38cc9 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -54,8 +54,6 @@ BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index df07e5f4b..6d383f286 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -17,7 +17,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -54,8 +54,6 @@ BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd" # Additional tools BR2_PACKAGE_HOST_GENIMAGE=y