From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 27 May 2015 07:45:39 +0000 (+0200)
Subject: vexpress64: use uncompressed kernel by default
X-Git-Tag: v2015.07-rc2~63
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1fd0f92ee118bbb683b1f706edc2489f59d7dbf4;p=u-boot

vexpress64: use uncompressed kernel by default

The foundation model (FVP) emulator nominally boots using
a clean, uncompressed kernel and the "booti" command. Augment
the default U-Boot script to do this.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 2b41fc5e36..f7bb7236b7 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -220,7 +220,7 @@
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS	\
-				"kernel_name=uImage\0"		\
+				"kernel_name=Image\0"		\
 				"kernel_addr=0x80000000\0"	\
 				"initrd_name=ramdisk.img\0"	\
 				"initrd_addr=0x88000000\0"	\
@@ -234,11 +234,11 @@
 				"loglevel=9"
 
 #define CONFIG_BOOTCOMMAND	"smhload ${kernel_name} ${kernel_addr}; " \
-				"smhload ${fdt_name} $fdt_addr; " \
-				"smhload ${initrd_name} $initrd_addr initrd_end; " \
-				"fdt addr $fdt_addr; fdt resize; " \
-				"fdt chosen $initrd_addr $initrd_end; " \
-				"bootm $kernel_addr - $fdt_addr"
+				"smhload ${fdt_name} ${fdt_addr}; " \
+				"smhload ${initrd_name} ${initrd_addr} initrd_end; " \
+				"fdt addr ${fdt_addr}; fdt resize; " \
+				"fdt chosen ${initrd_addr} ${initrd_end}; " \
+				"booti $kernel_addr - $fdt_addr"
 
 #define CONFIG_BOOTDELAY		1