On Tue, Oct 12, 2010 at 3:29 PM, Wolfgang Denk wd@denx.de wrote:
Dear John Rigby,
In message 1285775292-15060-6-git-send-email-john.rigby@linaro.org you wrote:
Based on other architectures already supported.
Signed-off-by: John Rigby john.rigby@linaro.org
arch/arm/include/asm/config.h | 2 + arch/arm/lib/bootm.c | 137 ++++++++++++++++++++++++++++++++++++----- common/image.c | 2 + 3 files changed, 125 insertions(+), 16 deletions(-)
diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index 4e8dfd7..d85a396 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -25,4 +25,6 @@ /* Relocation to SDRAM works on all ARM boards */ #define CONFIG_RELOC_FIXUP_WORKS #endif +#define CONFIG_LMB +#define CONFIG_BOOT_RAMDISK_HIGH #endif
These should be CONFIG_SYS_ instead.
These are not new. Do you want me to submit a patch changing all existing instances to CONFIG_SYS_*?
diff --git a/common/image.c b/common/image.c index 0562e3b..7b181cc 100644 --- a/common/image.c +++ b/common/image.c @@ -1214,9 +1214,11 @@ int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, if (fdt_blob < (char *)bootmap_base) relocate = 1;
+#ifdef CONFIG_SYS_BOOTMAPSZ if ((fdt_blob + *of_size + CONFIG_SYS_FDT_PAD) >= ((char *)CONFIG_SYS_BOOTMAPSZ + bootmap_base)) relocate = 1; +#endif
What is the impact of this on other architectures?
This ifdef is not needed I will remove it. It is an artifact of trying to make the code work without CONFIG_SYS_BOOTMAPSZ which I subsequently abandoned.
On which systems / architectures has this been tested?
Best regards,
Wolfgang Denk
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de I wish I had a bronze torc for every user who didn't read the manual. - Terry Pratchett, _The Light Fantastic_