boards: x86: make up_squared default to x86_64

This makes the up_squared board default to x86_64. This also adds a new board, up_squared_32, for when 32-bit is desired. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
zephyrproject-rtos · May 19, 2020 · ec9a413 · ec9a413
1 parent 51c5c50
commit ec9a413
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 4 deletions.
diff --git a/boards/x86/up_squared/Kconfig.board b/boards/x86/up_squared/Kconfig.board
@@ -2,5 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_UP_SQUARED
-	bool "UP Squared"
+	bool "UP Squared (x86_64)"
+	depends on SOC_APOLLO_LAKE
+	select X86_64
+
+config BOARD_UP_SQUARED_32
+	bool "UP Squared (x86)"
 	depends on SOC_APOLLO_LAKE
diff --git a/boards/x86/up_squared/Kconfig.defconfig b/boards/x86/up_squared/Kconfig.defconfig
@@ -8,7 +8,24 @@ config BOARD
 config BUILD_OUTPUT_STRIPPED
 	default y
 
+config MP_NUM_CPUS
+	default 2
+
 config X86_MMU_PAGE_POOL_PAGES
 	default 3072 if X86_MMU
 
 endif # BOARD_UP_SQUARED
+
+
+if BOARD_UP_SQUARED_32
+
+config BOARD
+	default "up_squared_32"
+
+config BUILD_OUTPUT_STRIPPED
+	default y
+
+config X86_MMU_PAGE_POOL_PAGES
+	default 3072 if X86_MMU
+
+endif # BOARD_UP_SQUARED_32
diff --git a/boards/x86/up_squared/up_squared.yaml b/boards/x86/up_squared/up_squared.yaml
@@ -1,5 +1,5 @@
 identifier: up_squared
-name: UP Squared
+name: UP Squared (x86_64)
 type: mcu
 arch: x86
 toolchain:

diff --git a/boards/x86/up_squared/up_squared_32.dts b/boards/x86/up_squared/up_squared_32.dts
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018,2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <mem.h>
+
+#define DT_SRAM_SIZE		DT_SIZE_M(2048)
+
+#include <apollo_lake.dtsi>
+
+/ {
+	model = "up_squared_32";
+	compatible = "intel,apollo_lake";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,bt-uart = &uart1;
+		zephyr,uart-pipe = &uart1;
+		zephyr,bt-mon-uart = &uart1;
+	};
+};
diff --git a/boards/x86/up_squared/up_squared_32.yaml b/boards/x86/up_squared/up_squared_32.yaml
@@ -0,0 +1,11 @@
+identifier: up_squared_32
+name: UP Squared (x86)
+type: mcu
+arch: x86
+toolchain:
+  - zephyr
+ram: 2048
+testing:
+  ignore_tags:
+     - net
+     - bluetooth
diff --git a/boards/x86/up_squared/up_squared_32_defconfig b/boards/x86/up_squared/up_squared_32_defconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_SOC_APOLLO_LAKE=y
+CONFIG_BOARD_UP_SQUARED_32=y
+CONFIG_PIC_DISABLE=y
+CONFIG_LOAPIC=y
+CONFIG_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_NS16550=y
+CONFIG_UART_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_X2APIC=y
diff --git a/samples/boards/up_squared/gpio_counter/sample.yaml b/samples/boards/up_squared/gpio_counter/sample.yaml
@@ -3,5 +3,5 @@ sample:
   name: Example of using GPIOs on UP Squared board
 tests:
   sample.board.up_squared.gpio_counter:
-    platform_whitelist: up_squared
+    platform_whitelist: up_squared up_squared_32
     tags: gpio
diff --git a/tests/arch/x86/info/testcase.yaml b/tests/arch/x86/info/testcase.yaml
@@ -1,7 +1,7 @@
 tests:
   arch.x86.info:
     arch_whitelist: x86
-    platform_whitelist: up_squared
+    platform_whitelist: up_squared up_squared_32
     harness: console
     harness_config:
         type: one_line