Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / vexpress_aemv8a.h

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index c1e2e111c94186e1645ad3d4c8cf22233f356145..ef3014d68b142201f8852658ed0331a8c7b94f6d 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -187,26 +187,46 @@
  * be copied into DRAM
  */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-                               "kernel_name=Image\0"   \
+                               "kernel_name=norkern\0" \
+                               "kernel_alt_name=Image\0"       \
                                "kernel_addr=0x80000000\0" \
-                               "fdt_name=juno\0" \
+                               "initrd_name=ramdisk.img\0"     \
+                               "initrd_addr=0x84000000\0"      \
+                               "fdt_name=board.dtb\0" \
+                               "fdt_alt_name=juno\0" \
                                "fdt_addr=0x83000000\0" \
                                "fdt_high=0xffffffffffffffff\0" \
                                "initrd_high=0xffffffffffffffff\0" \
 
 /* Assume we boot with root on the first partition of a USB stick */
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200n8 " \
-                               "root=/dev/sda1 rw " \
+                               "root=/dev/sda2 rw " \
                                "rootwait "\
                                "earlyprintk=pl011,0x7ff80000 debug "\
                                "user_debug=31 "\
+                               "androidboot.hardware=juno "\
                                "loglevel=9"
 
 /* Copy the kernel and FDT to DRAM memory and boot */
 #define CONFIG_BOOTCOMMAND     "afs load ${kernel_name} ${kernel_addr} ; " \
+                               "if test $? -eq 1; then "\
+                               "  echo Loading ${kernel_alt_name} instead of "\
+                               "${kernel_name}; "\
+                               "  afs load ${kernel_alt_name} ${kernel_addr};"\
+                               "fi ; "\
                                "afs load  ${fdt_name} ${fdt_addr} ; " \
+                               "if test $? -eq 1; then "\
+                               "  echo Loading ${fdt_alt_name} instead of "\
+                               "${fdt_name}; "\
+                               "  afs load ${fdt_alt_name} ${fdt_addr}; "\
+                               "fi ; "\
                                "fdt addr ${fdt_addr}; fdt resize; " \
-                               "booti ${kernel_addr} - ${fdt_addr}"
+                               "if afs load  ${initrd_name} ${initrd_addr} ; "\
+                               "then "\
+                               "  setenv initrd_param ${initrd_addr}; "\
+                               "  else setenv initrd_param -; "\
+                               "fi ; " \
+                               "booti ${kernel_addr} ${initrd_param} ${fdt_addr}"
 
 #define CONFIG_BOOTDELAY               1