From patchwork Sat Oct 10 06:30:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1379915 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=If65oUlj; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C7Zft5CLrz9sSG for ; Sat, 10 Oct 2020 17:24:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0300B87726; Sat, 10 Oct 2020 06:24:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q6IjJ5LDkspe; Sat, 10 Oct 2020 06:24:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5DD6F8784A; Sat, 10 Oct 2020 06:24:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 51F941BF84C for ; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4883A8778C for ; Sat, 10 Oct 2020 06:24:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L-UG+vesS6kw for ; Sat, 10 Oct 2020 06:24:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id BEF978776C for ; Sat, 10 Oct 2020 06:24:39 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id l2so12996577lfk.0 for ; Fri, 09 Oct 2020 23:24:39 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=xbwNL3lZYVDNe2H5VTd3WpKusf3u7DLdaESAFSt6bjA=; b=If65oUlj5rl3+gV29SGPdS8f1A7zFZWya+8z1Wxjm8xrOE1ZGj8BsWCN6JMv+8T0mw 60Bz1TwIgb2wdmBAZQFFhNDjgyR99/Ejxbnc8a1PN3FL4kz9hNkyyFWackRFSX2lWsM2 8bHcBRJC34PIvzkE1HZyvkMLkcyNRf1qrs2Dwf3qLBBUWjQr3nNY0X6ic2m1OUJpdv3s padVEhr2eAdSGUCnyPUN4W8gbfVu94vkG6KeHEIXzO4oRvhP6gwhW5bituDaY00i5ite GufWIJoia63ZKHcdA0C7eEpRNu9x/qn2iCXNVjDq+TAZLqJFcnxV4JKkf+zFHOsmzMmA GWtg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=xbwNL3lZYVDNe2H5VTd3WpKusf3u7DLdaESAFSt6bjA=; b=Ghf8K3WK3SDcz5Tqm+yDjc4AQamef/cc9juNwte74yQB5hfXMRyyZrjhTVjv/O0gaN HOHK1LXOa+/pTP2dadhTFtTJOcfahM1Ijn99hl08mYWtQHpeC48U7xBJrx4c8UHQ+Q8E adg9EyaRcg6nQvxqfApSWOSv7eaggMZ/0Cyd9gfL6GA8OCogJJ8kRZ5v12IS5iFAstes PI9/+HAFBQFEmCzEpv38poazPVIb3/hX0CJ5T3NTTv7nhkeNA/Mi7nr2dT7Q53lO8WOz l1ei0zSn9UUGIikIZkugBx1arafed5V95Hyb/lSu/URpRovtX/oBYrdO0sCuh3MNoVjW IshQ== X-Gm-Message-State: AOAM533wXYKabX24MubyXYChBXJ1vkT9xADOGYmGFS0lMZDyH8l3oSku y+MFMsY+4JfGEez1JzkXOUsccCLrAHs= X-Google-Smtp-Source: ABdhPJyIzzLEhZDumDiqXijpSAKke1m6w4qGp1xMchqEJYuMVL2PR2wWiDElGnSBAc/JBFZbxdo0Kw== X-Received: by 2002:a05:6512:2fc:: with SMTP id m28mr4972924lfq.100.1602311077564; Fri, 09 Oct 2020 23:24:37 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z21sm1943870lfb.20.2020.10.09.23.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 23:24:37 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sat, 10 Oct 2020 09:30:20 +0300 Message-Id: <20201010063022.448414-4-geomatsi@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201010063022.448414-1-geomatsi@gmail.com> References: <20201010063022.448414-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] board/udoo: use common image generation files 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: Fabio Estevam , Sergey Matyukevich Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Both Udoo boards use the same set of boot scripts and image generation scripts. Move all such scripts and files to common directory in order to avoid duplication. Signed-off-by: Sergey Matyukevich --- board/udoo/{mx6qdl => common}/boot.scr.txt | 0 board/udoo/{neo => common}/genimage.cfg | 9 ------ board/udoo/{mx6qdl => common}/post-build.sh | 0 board/udoo/{mx6qdl => common}/post-image.sh | 0 board/udoo/mx6qdl/genimage.cfg | 32 --------------------- board/udoo/mx6qdl/readme.txt | 2 +- board/udoo/neo/boot.scr.txt | 7 ----- board/udoo/neo/post-build.sh | 7 ----- board/udoo/neo/post-image.sh | 15 ---------- board/udoo/neo/readme.txt | 2 +- configs/mx6sx_udoo_neo_defconfig | 4 +-- configs/mx6udoo_defconfig | 4 +-- 12 files changed, 6 insertions(+), 76 deletions(-) rename board/udoo/{mx6qdl => common}/boot.scr.txt (100%) rename board/udoo/{neo => common}/genimage.cfg (50%) rename board/udoo/{mx6qdl => common}/post-build.sh (100%) rename board/udoo/{mx6qdl => common}/post-image.sh (100%) delete mode 100644 board/udoo/mx6qdl/genimage.cfg delete mode 100644 board/udoo/neo/boot.scr.txt delete mode 100755 board/udoo/neo/post-build.sh delete mode 100755 board/udoo/neo/post-image.sh diff --git a/board/udoo/mx6qdl/boot.scr.txt b/board/udoo/common/boot.scr.txt similarity index 100% rename from board/udoo/mx6qdl/boot.scr.txt rename to board/udoo/common/boot.scr.txt diff --git a/board/udoo/neo/genimage.cfg b/board/udoo/common/genimage.cfg similarity index 50% rename from board/udoo/neo/genimage.cfg rename to board/udoo/common/genimage.cfg index 46209120f0..79d3ba6fee 100644 --- a/board/udoo/neo/genimage.cfg +++ b/board/udoo/common/genimage.cfg @@ -1,12 +1,3 @@ -# Minimal SD card image for the MX6SX Udoo Neo board -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - image sdcard.img { hdimage { } diff --git a/board/udoo/mx6qdl/post-build.sh b/board/udoo/common/post-build.sh similarity index 100% rename from board/udoo/mx6qdl/post-build.sh rename to board/udoo/common/post-build.sh diff --git a/board/udoo/mx6qdl/post-image.sh b/board/udoo/common/post-image.sh similarity index 100% rename from board/udoo/mx6qdl/post-image.sh rename to board/udoo/common/post-image.sh diff --git a/board/udoo/mx6qdl/genimage.cfg b/board/udoo/mx6qdl/genimage.cfg deleted file mode 100644 index 46209120f0..0000000000 --- a/board/udoo/mx6qdl/genimage.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# Minimal SD card image for the MX6SX Udoo Neo board -# -# The SD card must have at least 1 MB free at the beginning. -# U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext4 in this case). -# -# For details about the layout, see: -# http://wiki.wandboard.org/index.php/Boot-process - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "SPL" - offset = 1K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.img" - offset = 69K - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - offset = 1M - size = 512M - } -} diff --git a/board/udoo/mx6qdl/readme.txt b/board/udoo/mx6qdl/readme.txt index cf1a610421..2e439ffa4c 100644 --- a/board/udoo/mx6qdl/readme.txt +++ b/board/udoo/mx6qdl/readme.txt @@ -14,4 +14,4 @@ directory, ready to be dumped on a micro SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/mx6qdl/genimage.cfg. +board/udoo/common/genimage.cfg. diff --git a/board/udoo/neo/boot.scr.txt b/board/udoo/neo/boot.scr.txt deleted file mode 100644 index 7a8aa4bd54..0000000000 --- a/board/udoo/neo/boot.scr.txt +++ /dev/null @@ -1,7 +0,0 @@ -setenv finduuid "part uuid mmc 0:1 uuid" -run finduuid -run findfdt -setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage -bootz ${loadaddr} - ${fdt_addr} diff --git a/board/udoo/neo/post-build.sh b/board/udoo/neo/post-build.sh deleted file mode 100755 index 6ccd87fafd..0000000000 --- a/board/udoo/neo/post-build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -d -m 755 $TARGET_DIR/boot -$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none \ - -n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr diff --git a/board/udoo/neo/post-image.sh b/board/udoo/neo/post-image.sh deleted file mode 100755 index 18e76aa40d..0000000000 --- a/board/udoo/neo/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index f037ad484a..4d9659e02f 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -13,4 +13,4 @@ directory, ready to be dumped on an SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/neo/genimage.cfg. +board/udoo/common/genimage.cfg. diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 57b9562c06..bec87561bb 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 2cf13ae559..bd0583b955 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -6,8 +6,8 @@ BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/mx6qdl/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y