summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Ribeiro <git@mdrjr.net>2013-05-03 15:52:11 +0400
committerMauro Ribeiro <git@mdrjr.net>2013-05-03 15:52:11 +0400
commit8d816e8484280d9f212366d89fce445d5a8718ef (patch)
treee145a1a63c8a169563446ef705608915f0cd9264
parent681af1e734c111c104d99d821a03a26e30ca6405 (diff)
parent57f8f5ba1594d27921b4940c89751803e00d4190 (diff)
downloadu-boot-8d816e8484280d9f212366d89fce445d5a8718ef.tar.xz
Merge pull request #2 from tobetter/odroid-v2010.12
Odroid v2010.12
-rw-r--r--common/cmd_bootm.c6
-rw-r--r--include/configs/smdk4412.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index fe1117231b..638e4c889c 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -724,8 +724,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#if defined(CONFIG_ZIMAGE_BOOT)
after_header_check:
- images.os.os = hdr->ih_os;
- images.ep = image_get_ep (&images.legacy_hdr_os_copy);
+ if (hdr != NULL) {
+ images.os.os = hdr->ih_os;
+ images.ep = image_get_ep (&images.legacy_hdr_os_copy);
+ }
#endif
#ifdef CONFIG_SILENT_CONSOLE
diff --git a/include/configs/smdk4412.h b/include/configs/smdk4412.h
index 1eb6ca985d..ac8e03a44c 100644
--- a/include/configs/smdk4412.h
+++ b/include/configs/smdk4412.h
@@ -232,6 +232,8 @@
#define CONFIG_SERVERIP 192.168.0.10
#define CONFIG_GATEWAYIP 192.168.0.1
+#define CONFIG_OF_LIBFDT 1
+
#define CONFIG_BOOTDELAY 1
/* Default boot commands for Android booting. */
#if defined(CONFIG_HKDK4412) && defined(CONFIG_EXYNOS_PRIME)