vexpress64: juno: use /dev/sda2

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

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 6107c64dd2a6d3c4d801661f20d45620611177b6..ef3014d68b142201f8852658ed0331a8c7b94f6d 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -30,7 +30,8 @@
 #define CONFIG_BOOTP_VCI_STRING                "U-boot.armv8.vexpress_aemv8a"
 
 /* Link Definitions */
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
+       defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
 /* ATF loads u-boot here for BASE_FVP model */
 #define CONFIG_SYS_TEXT_BASE           0x88000000
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
@@ -41,6 +42,8 @@
 #error "Unknown board variant"
 #endif
 
+#define CONFIG_SYS_BOOTM_LEN (64 << 20)      /* Increase max gunzip size */
+
 /* Flat Device Tree Definitions */
 #define CONFIG_OF_LIBFDT
 
@@ -101,7 +104,8 @@
 #define GICR_BASE                      (0x2f100000)
 #else
 
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
+       defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM)
 #define GICD_BASE                      (0x2f000000)
 #define GICC_BASE                      (0x2c000000)
 #elif CONFIG_TARGET_VEXPRESS64_JUNO
@@ -183,25 +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 "\
+                               "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
 
@@ -222,13 +247,33 @@
 
 #define CONFIG_BOOTCOMMAND     "smhload ${kernel_name} ${kernel_addr}; " \
                                "smhload ${fdt_name} ${fdt_addr}; " \
-                               "smhload ${initrd_name} ${initrd_addr} initrd_end; " \
+                               "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
 
+#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM
+#define CONFIG_EXTRA_ENV_SETTINGS      \
+                               "kernel_addr=0x80080000\0"      \
+                               "initrd_addr=0x84000000\0"      \
+                               "fdt_addr=0x83000000\0"         \
+                               "fdt_high=0xffffffffffffffff\0" \
+                               "initrd_high=0xffffffffffffffff\0"
+
+#define CONFIG_BOOTARGS                "console=ttyAMA0 earlyprintk=pl011,"\
+                               "0x1c090000 debug user_debug=31 "\
+                               "androidboot.hardware=fvpbase "\
+                               "root=/dev/vda2 rw "\
+                               "rootwait "\
+                               "loglevel=9"
+
+#define CONFIG_BOOTCOMMAND     "booti $kernel_addr $initrd_addr $fdt_addr"
+
+#define CONFIG_BOOTDELAY               1
+
 #else
 #error "Unknown board variant"
 #endif