diff options
| author | Simon Glass <sjg@chromium.org> | 2011-05-10 12:44:41 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-24 10:01:32 -0700 |
| commit | 9db0f13eec6529dbd7f717fc167e9d7f72523a04 (patch) | |
| tree | ad3e2b9d40dc28ac000dd4b11bdbeed48adb96f1 /arch/arm/lib | |
| parent | fb43a5f99b8d2e27229e4a6df93888e450505650 (diff) | |
fdt: config: enable device tree support on Seaboard
This adds a temporary option CONFIG_OF_NO_KERNEL to indicate that we don't
want to pass the FDT to the kernel. That is the normal behavior but we
are not ready yet.
BUG=chromium-os:11623
TEST=build and boot U-Boot on Seaboard
Change-Id: Id7cf508e1ba68d043a5a8a2beaf716bb8f579b73
Reviewed-on: http://gerrit.chromium.org/gerrit/623
Tested-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bootm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 617e181a0d..ec104a0737 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -60,7 +60,7 @@ static struct tag *params; #endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */ static ulong get_sp(void); -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL) static int bootm_linux_fdt(int machid, bootm_headers_t *images); #endif @@ -125,7 +125,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) show_boot_progress (15); -#ifdef CONFIG_OF_LIBFDT +#if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL) if (images->ft_len) return bootm_linux_fdt(machid, images); #endif @@ -173,7 +173,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) return 1; } -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL) static int fixup_memory_node(void *blob) { bd_t *bd = gd->bd; |