diff options
| author | Grant Likely <grant.likely@linaro.org> | 2011-03-28 09:58:49 +0000 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2011-04-25 21:11:20 -0400 |
| commit | ed59e58786cae9f8afcb575649afc65985beed4d (patch) | |
| tree | 3d0ee0a5313796c1e3569e626a0b17d9c1db3850 | |
| parent | c3624e6ed0a36f54aa0b3e7f32d30a6fde434f51 (diff) | |
| download | u-boot-imx-ed59e58786cae9f8afcb575649afc65985beed4d.zip u-boot-imx-ed59e58786cae9f8afcb575649afc65985beed4d.tar.gz u-boot-imx-ed59e58786cae9f8afcb575649afc65985beed4d.tar.bz2 | |
Remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ
The previous patch makes u-boot use the full accessible size of ram as
the default boot mapped size if CONFIG_SYS_BOOTMAPSZ is not defined,
which means boot_relocate_fdt() can be changed to depend solely on
CONFIG_OF_LIBFDT.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
| -rw-r--r-- | arch/powerpc/lib/bootm.c | 4 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | common/image.c | 4 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 7 |
4 files changed, 5 insertions, 12 deletions
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 02e544f..6be22c4 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -254,7 +254,7 @@ static int boot_body_linux(bootm_headers_t *images) if (ret) return ret; -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ) +#if defined(CONFIG_OF_LIBFDT) ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size); if (ret) return ret; @@ -293,7 +293,7 @@ static int boot_body_linux(bootm_headers_t *images) if (*initrd_start && *initrd_end) fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); } -#endif /* CONFIG_OF_LIBFDT && CONFIG_SYS_BOOTMAPSZ */ +#endif /* CONFIG_OF_LIBFDT */ return 0; } diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 989bf73..a23e465 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -544,7 +544,7 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv } break; #endif -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ) +#if defined(CONFIG_OF_LIBFDT) case BOOTM_STATE_FDT: { ret = boot_relocate_fdt(&images.lmb, diff --git a/common/image.c b/common/image.c index d8ba2ab..5ce4b1b 100644 --- a/common/image.c +++ b/common/image.c @@ -1202,7 +1202,7 @@ static int fit_check_fdt (const void *fit, int fdt_noffset, int verify) * 0 - success * 1 - failure */ -#if defined(CONFIG_SYS_BOOTMAPSZ) +#if defined(CONFIG_OF_LIBFDT) int boot_relocate_fdt (struct lmb *lmb, char **of_flat_tree, ulong *of_size) { void *fdt_blob = *of_flat_tree; @@ -1252,7 +1252,7 @@ int boot_relocate_fdt (struct lmb *lmb, char **of_flat_tree, ulong *of_size) error: return 1; } -#endif /* CONFIG_SYS_BOOTMAPSZ */ +#endif /* CONFIG_OF_LIBFDT */ /** * boot_get_fdt - main fdt handling routine diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 5cfa4cb..a0f6829 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -56,13 +56,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_OF_LIBFDT 1 -/* - * The early kernel mapping on ARM currently only maps from the base of DRAM - * to the end of the kernel image. The kernel is loaded at DRAM base + 0x8000. - * The early kernel pagetable uses DRAM base + 0x4000 to DRAM base + 0x8000, - * so that leaves DRAM base to DRAM base + 0x4000 available. - */ -#define CONFIG_SYS_BOOTMAPSZ 0x4000 #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 |