public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: Dave Martin <Dave.Martin@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH] Makefile: Ensure initrd parameters in /chosen are up-to-date
Date: Mon, 12 May 2025 16:09:44 +0100	[thread overview]
Message-ID: <20250512150944.38322-1-Dave.Martin@arm.com> (raw)

The initrd parameters in the FDT /chosen node are fixed when the device
tree blob is generated, so it is important to regenerate the device
tree if the initrd image has been updated.

Currently this does not happen, so the parameters can be stale.
In particular, if the initrd image is bigger than it was when the
device tree was first generated then the value of the linux,initrd-end
parameter is too small, leading to truncation of the initrd image on
boot even though the whole image is present in linux-system.axf.

Make $(FILESYSTEM) a dependency of fdt.dtb so that the parameters are
refreshed properly based on the current initrd image (if any).

Without --with-initrd, FILESYSTEM is the empty string and the
dependency evaporates, which is just fine.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index a8d5c1b..0178e5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,7 +185,7 @@ model.lds: $(LD_SCRIPT) Makefile
 DTC_NOWARN  = $(call test-dtc-option,-Wno-clocks_property)
 DTC_NOWARN += $(call test-dtc-option,-Wno-gpios_property)
 
-fdt.dtb: $(KERNEL_DTB) Makefile
+fdt.dtb: $(KERNEL_DTB) Makefile $(FILESYSTEM)
 	( $(DTC) -O dts -I dtb $(KERNEL_DTB) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) }; $(CPU_NODES)" ) | $(DTC) -O dtb -o $@ $(DTC_NOWARN) -
 
 # The filesystem archive might not exist if INITRD is not being used
-- 
2.34.1



             reply	other threads:[~2025-05-12 15:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-12 15:09 Dave Martin [this message]
2025-05-12 15:51 ` [PATCH] Makefile: Ensure initrd parameters in /chosen are up-to-date Mark Rutland
2025-05-13 13:45   ` Dave Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250512150944.38322-1-Dave.Martin@arm.com \
    --to=dave.martin@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox