From: Michal Simek <monstr@monstr.eu>
To: linuxppc-dev@ozlabs.org
Cc: arnd@arndb.de, tmarri@apm.com, suzuki@in.ibm.com,
john.williams@petalogix.com
Subject: [RFC PATCH 6/7] powerpc: Update the default FIT image to use the correct load/boot addresses
Date: Thu, 16 Jun 2011 16:14:27 +0200 [thread overview]
Message-ID: <1308233668-24166-7-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1308233668-24166-6-git-send-email-monstr@monstr.eu>
From: John Williams <john.williams@petalogix.com>
The default kernel_fdt.its hard codes zero load/start addresses, but this may
no longer be true.
As we copy the FIT tree descriptor, update these values based on the incoming
ELF payload.
Signed-off-by: John Williams <john.williams@petalogix.com>
---
arch/powerpc/boot/wrapper | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 594aa02..54fbc2e 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -281,7 +281,11 @@ uboot-fit)
rm -f "$ofile"
#[ "$vmz" != vmlinux.bin.gz ] && mv "$vmz" "vmlinux.bin.gz"
mv "$dtb" "target.dtb"
- cp arch/powerpc/boot/kernel_fdt.its .
+ # Check the ELF file for a non-zero load/entry address
+ membase=${membase:2:8}
+ sed -e "s/load = <.*$/load = <${membase}>;/g" \
+ -e "s/entry = <.*$/entry = <${membase}>;/g" \
+ arch/powerpc/boot/kernel_fdt.its > kernel_fdt.its
mkimage -f kernel_fdt.its "$ofile"
#rm kernet_fdt.its
exit 0
--
1.5.5.6
next prev parent reply other threads:[~2011-06-16 14:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 14:14 [RFC] Relocatable kernel for ppc44x Michal Simek
2011-06-16 14:14 ` [RFC PATCH 1/7] powerpc: ppc440 remove zero physical memory base assumption Michal Simek
2011-06-16 14:14 ` [RFC PATCH 2/7] powerpc: Permit non-zero physical start address for PPC44x Michal Simek
2011-06-16 14:14 ` [RFC PATCH 3/7] powerpc: simpleboot get load address from ELF instead of assuming zero Michal Simek
2011-06-16 14:14 ` [RFC PATCH 4/7] powerpc: Let simpleboot function with non zero-based memory maps Michal Simek
2011-06-16 14:14 ` [RFC PATCH 5/7] powerpc: Consider a non-zero boot address when computing the bootwrapper start Michal Simek
2011-06-16 14:14 ` Michal Simek [this message]
2011-06-16 14:14 ` [RFC PATCH 7/7] powerpc: Support RELOCATABLE kernel for PPC44x Michal Simek
2011-07-12 11:09 ` Suzuki Poulose
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=1308233668-24166-7-git-send-email-monstr@monstr.eu \
--to=monstr@monstr.eu \
--cc=arnd@arndb.de \
--cc=john.williams@petalogix.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=suzuki@in.ibm.com \
--cc=tmarri@apm.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;
as well as URLs for NNTP newsgroup(s).