Added changes for Wandboard

Kconfig

@@ -92,6 +92,13 @@ menu "seL4 System"
        help
           Common flag for Exynos 54210 and 5422
 
+    config PLAT_IMX6
+       bool
+       default n
+       help
+          Common flag for SabreLight and Wandboard Quad
+
+
     choice
         prompt "Platform Type"
         help
@@ -155,13 +162,22 @@ menu "seL4 System"
             help
                 Support for Qualcomm Snapdragon S4 APQ8064 platforms (Inforce IFC6410).
 
-        config PLAT_IMX6
+        config PLAT_SABRE
             bool "iMX6 (Sabre Lite)"
             depends on ARCH_ARM
             depends on ARM_CORTEX_A9
+            select PLAT_IMX6
             help
                 Support for iMX6 platform (Sabre Lite).
 
+        config PLAT_WANDQ
+            bool "iMX6 (Wandboard Quad)"
+            depends on ARCH_ARM
+            depends on ARM_CORTEX_A9
+            select PLAT_IMX6
+            help
+                Support for iMX6 platform (Wandboard Quad).
+
         config PLAT_ZYNQ7000
             bool "Zynq-7000 (Xilinx ZC706)"
             depends on ARCH_ARM

include/arch/arm/armv/armv7-a/armv/benchmark.h

@@ -13,7 +13,7 @@
 
 #if CONFIG_MAX_NUM_TRACE_POINTS > 0
 
-#if defined(CONFIG_PLAT_IMX6) || defined(CONFIG_PLAT_EXYNOS5410)
+#if defined(CONFIG_PLAT_SABRE) || defined(CONFIG_PLAT_EXYNOS5410)
 #define KS_LOG_PADDR 0xffe00000
 #else
 //TODO test/implement this for other platforms

include/plat/imx6/plat/machine/devices.h

@@ -12,7 +12,13 @@
 #define __PLAT_MACHINE_DEVICES_H
 
 /* These devices are used by the seL4 kernel. */
+#ifdef CONFIG_PLAT_SABRE
 #define UART_PADDR                  UART2_PADDR
+#elif CONFIG_PLAT_WANDQ
+#define UART_PADDR                  UART1_PADDR
+#else
+#error "unknown imx6 platform selected!"
+#endif
 
 #define UART_PPTR                   0xfff01000
 #define WDT_PPTR                    0xfff02000

src/plat/imx6/machine/hardware.c

@@ -21,13 +21,26 @@
 /* Available physical memory regions on platform (RAM) */
 /* NOTE: Regions are not allowed to be adjacent! */
 const p_region_t BOOT_RODATA avail_p_regs[] = {
-    /* 1 GiB */
+#if defined(CONFIG_PLAT_SABRE)
+    /* Sabre has 1 GiB */
 #if CONFIG_MAX_NUM_TRACE_POINTS > 0
     /* 1MB stolen for logging */
     { /* .start = */ 0x10000000, /* .end = */ 0x2fd00000 }
 #else
     { /* .start = */ 0x10000000, /* .end = */ 0x50000000 }
 #endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
+#elif defined(CONFIG_PLAT_WANDQ)
+    /* Wandboard Quad: 2 GiB */
+#if CONFIG_MAX_NUM_TRACE_POINTS > 0
+#warning "NOTE: logging is currently untested on WandBoard"
+    /* 1MB stolen for logging */
+    { /* .start = */ 0x10000000, /* .end = */ 0x6fd00000 }
+#else
+    { /* .start = */ 0x10000000, /* .end = */ 0x90000000 }
+#endif /* CONFIG_MAX_NUM_TRACE_POINTS > 0 */
+#else
+#error "unknown imx6 platform selected!"
+#endif
 };
 
 BOOT_CODE int