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

[platform/kernel/u-boot.git] / include / configs / vexpress_aemv8a.h

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 047514a..9ddb594 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -17,20 +17,11 @@
 #ifndef CONFIG_SEMIHOSTING
 #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING
 #endif
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_ARMV8_SWITCH_TO_EL1
 #endif
 
 #define CONFIG_REMAKE_ELF
 
-#if !defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && \
-    !defined(CONFIG_TARGET_VEXPRESS64_JUNO)
-/* Base FVP and Juno not using GICv3 yet */
-#define CONFIG_GICV3
-#endif
-
-/*#define CONFIG_ARMV8_SWITCH_TO_EL1*/
-
 #define CONFIG_SUPPORT_RAW_INITRD
 
 /* Cache Definitions */
@@ -49,8 +40,7 @@
 #define CONFIG_SYS_TEXT_BASE           0xe0000000
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 #else
-#define CONFIG_SYS_TEXT_BASE           0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
+#error "Unknown board variant"
 #endif
 
 /* Flat Device Tree Definitions */
@@ -120,10 +110,9 @@
 #define GICD_BASE                      (0x2C010000)
 #define GICC_BASE                      (0x2C02f000)
 #else
-#define GICD_BASE                      (0x2C001000)
-#define GICC_BASE                      (0x2C002000)
-#endif
+#error "Unknown board variant"
 #endif
+#endif /* !CONFIG_GICV3 */
 
 #define CONFIG_SYS_MEMTEST_START       V2M_BASE
 #define CONFIG_SYS_MEMTEST_END         (V2M_BASE + 0x80000000)
@@ -211,12 +200,12 @@
 /* Initial environment variables */
 #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS      \
-                               "kernel_name=uImage\0"  \
-                               "kernel_addr_r=0x80000000\0"    \
+                               "kernel_name=uImage\0"          \
+                               "kernel_addr=0x80000000\0"      \
                                "initrd_name=ramdisk.img\0"     \
-                               "initrd_addr_r=0x88000000\0"    \
-                               "fdt_name=devtree.dtb\0"                \
-                               "fdt_addr_r=0x83000000\0"               \
+                               "initrd_addr=0x88000000\0"      \
+                               "fdt_name=devtree.dtb\0"        \
+                               "fdt_addr=0x83000000\0"         \
                                "fdt_high=0xffffffffffffffff\0" \
                                "initrd_high=0xffffffffffffffff\0"
 
@@ -224,24 +213,17 @@
                                "0x1c090000 debug user_debug=31 "\
                                "loglevel=9"
 
-#define CONFIG_BOOTCOMMAND     "fdt addr $fdt_addr_r; fdt resize; " \
-                               "fdt chosen $initrd_addr_r $initrd_end; " \
-                               "bootm $kernel_addr_r - $fdt_addr_r"
+#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"
 
 #define CONFIG_BOOTDELAY               1
 
 #else
-
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-                                       "kernel_addr_r=0x80000000\0"    \
-                                       "initrd_addr_r=0x88000000\0"    \
-                                       "fdt_addr_r=0x83000000\0"               \
-                                       "fdt_high=0xa0000000\0"
-
-#define CONFIG_BOOTARGS                        "console=ttyAMA0,115200n8 root=/dev/ram0"
-#define CONFIG_BOOTCOMMAND             "bootm $kernel_addr_r " \
-                                       "$initrd_addr_r:$initrd_size $fdt_addr_r"
-#define CONFIG_BOOTDELAY               -1
+#error "Unknown board variant"
 #endif
 
 /* Do not preserve environment */