From patchwork Sat Oct 5 19:10:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3548 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D29DE3F15E for ; Sat, 5 Oct 2024 21:10:52 +0200 (CEST) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cae209243sf19074355e9.1 for ; Sat, 05 Oct 2024 12:10:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1728155452; cv=pass; d=google.com; s=arc-20240605; b=VKb2T56CM73cC3MlzXwLfzD9FbKMGBUw8lZvOUoK7NkYSX4TgN+q4Xycn+OUqVXVZ0 iaS+jWO7BDMwEQx0YOK/wXibc9M/MU4IFjDgmnWK3l+NtIsjQjZTbjKoA8dHe18O4J4z fDBrKvGHrdVcpg7g+cFQzB7iLV1Sq5mwr3aAiwUaUzfY8NKA595xxNLTQ/mHJ8rvIuJq vbENsejFiuBiAcrwyHEYf9E8XF4uOIfQmfeuei5Y7w5otiR0MFtmerEiqp7B1hkD0ET+ 3Pthmq7FfqHJ759mHZiFxeVhJPZXuci07m5Z3nmvJ501TXne2uzZkFflFHRRWW1NwZeo BVSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=lUdtdW1MemXQUSxlDFnu0E+/o5QHnubN+BmKQyPV/Io=; fh=/hfveuuKoIf1asMjb48GNWsUbrcYOFTcyKldL9uy4mo=; b=HP/oOsN8Hjh68uHKShhZYBGV7ydHX8YNiWFC0fbR4C9rnfqop1Ke/C+zsWhOjv+1Ra bo8YHJxBfxlqa0Zz2scxQq46YimKH7R6Z3DYFQOjDLPfW6lGM2tUezFCYSGRIQgURFuL aUOfi6A83X4dFPtSjKKfjID9VAw7b5HxV3U3AU9wZX3QYqE4a1NVqBHaddRhB1HrAI+5 tzbMcBDVg/SvbiKFa37EHKagju1afK+qdEcwso6wzdzhrNgbEJSGxK6FkxkMcrmatf3Q 3MxGT2JXVDuaO5jfrqOBb1Ga21iovSAWSQain96bcO30UoymDbOgCKntxI7ZRuzMjrR8 N0tQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GRO9jeSH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1728155452; x=1728760252; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=lUdtdW1MemXQUSxlDFnu0E+/o5QHnubN+BmKQyPV/Io=; b=Ya+skV672EoxLz3w7raZQmUZM1iBrsIcd5Z/Jxxccz7HAxqWwsnWSk9I5yA4DJWxUF lQIzHyxEXT+TzAK+1DKBVpp1NN4LXE/ARg4QUK8w++aWQaZR6wGBLoZikWGqUkOXkl3F 8368DoBF7Rlr3f1uJNDI6aJGWEiHKt56f2w8Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728155452; x=1728760252; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lUdtdW1MemXQUSxlDFnu0E+/o5QHnubN+BmKQyPV/Io=; b=pq6ze3pW6ZGAsot3f8PEH4bR2w/AEAYIAt5ORzs5Do01gjouHFo9ENUhAKUgOsiXq6 zRKAMGHi8xSq+DSQqEdCfGCc71yOeTwIZX20hXxqw8w8ZhwM6em5c1z9Im7p2ir4etYV AwzWMzjzDxMPrA2E+RujlbmxOY4Xh5AIosiwWIiOwtBZpxM5u5PBvvZXURs3KW/u8DeV LoAqAviN8JrY64nABnP1idoG03ntHfiGUXKcNHGE7A7DfKNcNPiGgbYjgwwCUXTqBkuq XouWDhXGURk1Q6NVBHnQtxXuImb1G7ygDH3i6FV1FsY0mb4P4o14yZJakrIYH9yHTD6Y zZGQ== X-Forwarded-Encrypted: i=2; AJvYcCXUTcAinwsMfvGwiGyVXWs539V6kAAOW0MaaZyRXQnZAZCVhsajPbAtJ+Q3GGQV7gyP8Q7sdfciBsODM/Yk@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyvjaMppp5hqDv9VYP0WN/pzOjYWob9rLKCM1J66lX/L7B38ocx 7hfTHttLa93bMg8GbXh4yKQkQv5xhs5GQOwTpnjm/5SIolZCsV15cRHy0Ks2CZV7Fg== X-Google-Smtp-Source: AGHT+IFzN7Y9bIzx9j2GGX7xBn/5PSX2Nx5AmQqwNNseeTI+pC23/sXl4WzqxvWL7Sj4+vhc5A2NeA== X-Received: by 2002:a05:600c:524c:b0:426:5ef5:bcb1 with SMTP id 5b1f17b1804b1-42f85aa1987mr36671415e9.6.1728155451945; Sat, 05 Oct 2024 12:10:51 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:3553:b0:42c:af5b:fabd with SMTP id 5b1f17b1804b1-42f8dcc54aals1646305e9.1.-pod-prod-06-eu; Sat, 05 Oct 2024 12:10:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjizNNe6Sob1vqU5mXuDVwqmpoHxgzSzGfgiiw9EXGADtUKWSOXdgHWJNSM0I0TWr7LDEgq+JlAZOfbyFY@amarulasolutions.com X-Received: by 2002:a05:600c:3106:b0:426:6876:83bb with SMTP id 5b1f17b1804b1-42f85abeb0cmr48033945e9.17.1728155450409; Sat, 05 Oct 2024 12:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728155450; cv=none; d=google.com; s=arc-20240605; b=VjQDdVhAQzLWn0xCY5N8RFWsALdMFRdjs0PeWqe958twdPJf/YJu6G90RQ7dd5rxHb knLnxzmftL/sSdCbfnmrjaRQ1Yg5PJLP4o5eog+73bONfIx9sLX1S8B1SPDsiF25G5ar cPtfqMxjH/xHJd9Zgg8py+M15xW+EK75Z89hqd1d4BAF/98cxPhu8UnFiox4yccOZPzZ CzoUJPZtkIiQecOPr1g6FfXfsYyjWXBMyyPXjlwPDx1Rv3D8qeoufYaZsfAb5Ijm07rN M5VlEfrjqMMCRDzWlPlBo6Fftyuo6KyBus/YQIezwpJ0Qokx6G/UjJqVuz7YWRqIFgVh pFZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=B/71KmLBArBx7yyD33Zk3Zo/kTvk8Y3ZvXN6sBNALSM=; fh=44W692IODei3FlOqVVSFgs9JwKif5lFuWPuIArj3+9Y=; b=kIkiLFVtC07M23Hm4ISPoa2e4ZXGoRswA7FpNw8fezvLcpGE5SIBXlJhSqKXHqkgL2 BT0YchXhBFJ68cmEj6dOe1sAu5ju6KoZLbqYWivsjNFxpz0/qrt9hf4PfXgFxYbEik5z eblo4TAEFNZgfonOfJss6bwF46xrAP35tszYpLOQcUCDynYsMYwAJyyGNmqfrwwEK9RJ nr0GJVR+l9e5FgMg6vzrJrCtSXcUx3YBQSoTP2EVyIf84LqQLpETsEWJAgDAM0Lq6fA0 KNAHNwMS8laAjtgiLMRCmBxlu2NeFetvhoP5GRy7XKtKO8k5iI5q8FdJWsnedFmSUhJD noJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GRO9jeSH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-42f8a1cd359sor5403105e9.13.2024.10.05.12.10.50 for (Google Transport Security); Sat, 05 Oct 2024 12:10:50 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCW+7RX7lovZcHT1gmuaBLFKArUDNZJVCm9JtJH95nYgWE2HhXqLkCicIUwM7Qr5HaIsK9qcDXaRnUwWDCwn@amarulasolutions.com X-Received: by 2002:a05:600c:45c6:b0:426:51dc:f6cd with SMTP id 5b1f17b1804b1-42f85abebdcmr43204185e9.18.1728155449778; Sat, 05 Oct 2024 12:10:49 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.43.248]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f89ed957asm28805865e9.44.2024.10.05.12.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 12:10:48 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Christophe Priouzeau , linux-amarula@amarulasolutions.com, Dario Binacchi , Thomas Petazzoni Subject: [PATCH 1/1] board/stm32f469-disco: move kernel and DTB to rootfs partition Date: Sat, 5 Oct 2024 21:10:43 +0200 Message-ID: <20241005191043.2141597-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GRO9jeSH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The patch, following the suggestion expressed in the review [1] for the stm32f746-disco board support, moves the Linux kernel and the related device tree to the ext4 rootfs partition. By doing so, the vfat partition, improperly called u-boot, no longer makes sense and can therefore be removed. From now on, U-Boot will load the kernel and the device tree from the ext4 rootfs partition. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20240822183742.3550055-3-dario.binacchi@amarulasolutions.com/ Suggested-by: Thomas Petazzoni Signed-off-by: Dario Binacchi --- .../stm32f469-disco/extlinux.conf | 6 +++--- .../stm32f469-disco/genimage.cfg | 17 ----------------- .../stm32f469-disco/post-build.sh | 2 +- configs/stm32f469_disco_sd_defconfig | 3 +-- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/board/stmicroelectronics/stm32f469-disco/extlinux.conf b/board/stmicroelectronics/stm32f469-disco/extlinux.conf index 1c2db4383ba5..65aa286a7a9d 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 517ead7751e6..e911a94e46b5 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 ec20fca7d964..c4d155f350d7 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)" -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 c00c043896a3..97dbce5d46c1 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