From patchwork Sat Oct 5 19:15:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3549 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 C1C6D3F15E for ; Sat, 5 Oct 2024 21:15:36 +0200 (CEST) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cb2c5d634sf19865615e9.0 for ; Sat, 05 Oct 2024 12:15:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1728155736; cv=pass; d=google.com; s=arc-20240605; b=OthbdxmuBNea0m3VzMHocpPjb9Z2ujNkMH8ubdHIGJptXsCD1HD78eUySG/eiwkw4Z M2Q5y6QF3iBVqJvyry4F8eRQ9vg5Y34083OOz4bBW8ns69c4m8ZpQtvLPFbkC2oPdTNV dCwP6hio4l8x3jVujvHsOK32pATNgEEDOT+eJlMNh0Cm/sRTOyc2XQflzZClHnFLoJ3N TPoCQypZcYiux4PCia1Y/bkysSbFctpiFW2JyY5iCb/LIt51eW55ethZWB4EUGT9xSWi huUubXwOZ5EuSgh8nnVaQA4z6yXcblmzjPxF7Rtkt5WVa2zJ5VzOZqTFkb4MHUyrFJeS 5nEA== 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=RRLxKO9LqeBFvcGU29X2WLHQOxyjyICjaZytr6N5TkY=; fh=bR6o7rpeEBWmUE6j73XmkcNzgZM+9NiMigIGGD2OjR4=; b=Syr2NFTLoBdfw7I2FFMLvg424goEVAiqLTlO0ahSMUg8gR8Gyr/cozc2UuqUOhLfb4 o29asncax0W3BZvW2LyTq8fjtlbqManOTXIqZu+lGeG0ZT0tzn2U0aiaFs55R7xyoEz4 nEmc/DHV5/UGgrJRP7ME/yQxUWZhkh2diBnVMjdthG0crF4kBOBc/JEEP9eU0g+q42Jr JJzUUxPmlbR5YFkG/Y4NM8qA69xMwjYsAtVQabpUfyHex8w0Vtg0G4hvJxhOogieOG3E 9TJSEl3iITYSxdp5q867INQJ+FWovJuZ/y2DiW7L5RkMX90fuWxm94rU1qwXYBpjMPsC mdWg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RpfhvYQf; 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=1728155736; x=1728760536; 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=RRLxKO9LqeBFvcGU29X2WLHQOxyjyICjaZytr6N5TkY=; b=Bqdi7nOLlX0dWGgov+VfNWvkEjOz3GxY8pSXuXczsgmgKUxMt2o36MulRwC9RIFfQ3 PLMzeZuYT0nnbMU+GZupwYgfQ0x4HZz/9Id3ZyEogmzJmfoLIK9YeI7N4YkGSUBRow5z LOujjxPKSJ8CUIc2W3XqIYhRqZq/9v5NULhTU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728155736; x=1728760536; 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=RRLxKO9LqeBFvcGU29X2WLHQOxyjyICjaZytr6N5TkY=; b=BFIx4Moky77qIPnAzgEQCjSYn9K2nZ0ftjL24vc3JIEWHTG83t3dxZE7BcQ0KEKTNm 8SFjVKonXvmU36O46ZabFDCIYac651ZaMdkfPRVxYo1DhIxaKtbDaQlsinqyqrmjvSXl L2cAdn6XjTBSI/4BUwAlyvtU0ftO/PzKMefs95+AZ3N4uItpHS2S2fHxGtcsbWTjBPa3 JOBfpR4tNZoPk9SDE9cVpEOZNoz2wILm/L11gCAUyaLWm9N4wszmYfxikrs500/F1dOF RDa9VtkQJf3fhLb6XtL2zDkrCof7XvMEGFrHvrZafT3iWjzExkaPMPACVtNy/n59goOd 67Eg== X-Forwarded-Encrypted: i=2; AJvYcCVRRCe45l06/dSLdlZCZLXXPmSfH4P1zIOQZh9NdmX1qzfT/RwwKY4wYNjd3opvVG8fhabo5RiCf4gHEGHV@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwmGHddSpkGvYmqleklI36EKRSH0kDK6Q7wLXd3gB6BTW/4RsJ7 6uzvUkztLN7Kv9lmae/1WGKBUBvicHoAvjt5gT13dxuYxkKrEEuD9JvLsNR4KmFvhw== X-Google-Smtp-Source: AGHT+IGIH5hVTDdj0il2iHzIGAitU3+X2rZdlWsyG7taZQfev8u44Eu9VB2SHYuz13x1/Uef/ocnvQ== X-Received: by 2002:a05:600c:3583:b0:426:6e86:f82 with SMTP id 5b1f17b1804b1-42f85aeefd3mr47886435e9.22.1728155736185; Sat, 05 Oct 2024 12:15:36 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:1c01:b0:42c:af5b:fad2 with SMTP id 5b1f17b1804b1-42f7dfac487ls10097165e9.1.-pod-prod-04-eu; Sat, 05 Oct 2024 12:15:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXneItilA4zNxKLWCRfRKUqGWsuujjn1oHR1IulrQZHncbec7PsA+B5pPOx21j5nqOFN3yXJ1rdrqsaTZRE@amarulasolutions.com X-Received: by 2002:a05:600c:3b82:b0:42c:b9b1:8342 with SMTP id 5b1f17b1804b1-42f8dcb8ccamr9253055e9.19.1728155734563; Sat, 05 Oct 2024 12:15:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728155734; cv=none; d=google.com; s=arc-20240605; b=bwa5UPPYV9Wu9xeWJ8K0xGq+D9EnhI/1W1VSvXvV4NBmR4DZHZ4ZgMrRzLRV7wU3i7 jrNtDbgmiefGweTqQllvL8s76Y5FJTkhtio4qZXptBIrjAOJQz5yUFMUySnpgv5PXNef p8hZa+Va1D8k1QqrV6BjIUs4VNu9p4ppqQQywV+utB8xinztzKT3a7FATjJ00rx37Sv9 8NvMwG8YMVozYK7O9/D7XBIl7q1c4xos43pkVCfN2dMAOyQFlkNFc93DE7iJWWloeDvx 5zbwxOAZ3iXkfj68SfVBs2t5h4TcXaocRSDItIO9DcxAllF3BBWoLixqy2PNSbsp1ckb UZVw== 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=OMzjLe3QIioxL0y52eyK3WmPUMbZkYhmv4aCMJXdRck=; fh=WYV3eg7JZFQ4NMp9qzYiFkPOqiqKiRUxP4s6+2CBC5o=; b=JLGqgVxLOl9O7S2UuGd04RCoky4uR5Omc/bFI/BufxPHQLc01xGsVlO+Ux5NMT2kTF WWzRFxkKXmW4Oijgam/Fed7hkjZvxcOVaz8zKCo1SfhWVvzJq0VXb+vZnpDzeJ6hJpzm VIoRKFAJFYdi8k5tR59C1LeS7cXxbIYYzu2xfJq+EAJa5srZIam+IbEzdc4zDNzFahSE C6WbxBrDiPCiRYWSEeIk+GRitzTU4sMSRUZ/O485/OHiIEmavmLYIWm4k0fuPrq5hWpJ KkOCLDCUPwTuZ+86K7L99vNzr2r1sZ0X8THUHQU9g1ao+dhPolcfSS2gE/LQ20PQLr6V aHCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RpfhvYQf; 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-42f8a1a2a71sor5584405e9.7.2024.10.05.12.15.34 for (Google Transport Security); Sat, 05 Oct 2024 12:15:34 -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; AJvYcCXPZdYxEKAfYUDiO88ZC2O3MThoRlIv/bhT7WTqSOAORbSvjoms8P7EC257TNzcyvpMkCfqK3BGBrT/xP9Q@amarulasolutions.com X-Received: by 2002:a5d:5306:0:b0:37c:c842:a16e with SMTP id ffacd0b85a97d-37d0e6f28a5mr4083870f8f.5.1728155734009; Sat, 05 Oct 2024 12:15:34 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.43.248]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d16920be2sm2264398f8f.60.2024.10.05.12.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 12:15:32 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Dario Binacchi , linux-amarula@amarulasolutions.com, Thomas Petazzoni Subject: [PATCH 1/1] board/stm32f769-disco: move kernel and DTB to rootfs partition Date: Sat, 5 Oct 2024 21:15:28 +0200 Message-ID: <20241005191528.2142818-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=RpfhvYQf; 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 --- .../stm32f769-disco/extlinux.conf | 6 +++--- .../stm32f769-disco/genimage.cfg | 17 ----------------- .../stm32f769-disco/post-build.sh | 2 +- configs/stm32f769_disco_sd_defconfig | 3 +-- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/board/stmicroelectronics/stm32f769-disco/extlinux.conf b/board/stmicroelectronics/stm32f769-disco/extlinux.conf index 48483a01fc4e..edc1582615da 100644 --- a/board/stmicroelectronics/stm32f769-disco/extlinux.conf +++ b/board/stmicroelectronics/stm32f769-disco/extlinux.conf @@ -1,4 +1,4 @@ label stm32f769-disco-buildroot - kernel /zImage - devicetree /stm32f769-disco.dtb - append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel + kernel /boot/zImage + devicetree /boot/stm32f769-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext2 rootwait earlyprintk consoleblank=0 ignore_loglevel diff --git a/board/stmicroelectronics/stm32f769-disco/genimage.cfg b/board/stmicroelectronics/stm32f769-disco/genimage.cfg index 41f9da512489..e911a94e46b5 100644 --- a/board/stmicroelectronics/stm32f769-disco/genimage.cfg +++ b/board/stmicroelectronics/stm32f769-disco/genimage.cfg @@ -1,24 +1,7 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "stm32f769-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/stm32f769-disco/post-build.sh b/board/stmicroelectronics/stm32f769-disco/post-build.sh index c8cca3de8c9b..45100509411b 100755 --- a/board/stmicroelectronics/stm32f769-disco/post-build.sh +++ b/board/stmicroelectronics/stm32f769-disco/post-build.sh @@ -4,4 +4,4 @@ BOARD_DIR="$(dirname "$0")" # Kernel is built without devpts support sed -i '/^devpts/d' "${TARGET_DIR}"/etc/fstab -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/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ec2687334c1..386a5d68e82a 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_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="stm32f769-disco" +BR2_LINUX_KERNEL_INSTALL_TARGET=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" @@ -25,7 +26,5 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f769-disco" 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