Skip to contentSkip to conversation

x86: conga: Add option to select different config headers for baseboards

PATCH Superseded Stefan Roese 1 participant 1 message Aug 6, 2017

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 2/6 x86: conga: Add option to select different config headers for baseboards

This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added.

---
v4:
- Remove Gigadevice and Macronix flash support

v3:
- Rebased on latest master
- Removed unused macros from config headers

v2:
- Added Bin's reviewed-by

 board/congatec/Kconfig                             | 11 +++++
 board/congatec/conga-qeval20-qa3-e3845/Kconfig     |  7 +--
 board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS |  2 +
 configs/theadorable-x86-conga-qa3-e3845_defconfig  | 56 ++++++++++++++++++++++
 include/configs/theadorable-x86-conga-qa3-e3845.h  | 38 +++++++++++++++
 5 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig
 create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h
board/congatec/Kconfig +11 -0
index ff5a1d84a1..fb341bf24c 100644
@@ -24,6 +24,17 @@ config TARGET_CONGA_QEVAL20_QA3_E3845
 	  Note that PCIE_ECAM_BASE is set up by the FSP so the value used
 	  by U-Boot matches that value.
 
+config TARGET_THEADORABLE_X86_CONGA_QA3_E3845
+	bool "theadorable-x86 baseboard & conga-QA3/E3845"
+	help
+	  This is the theadorable-x86 baseboard board equipped with the
+	  conga-QA3/E3845-4G SoM. It contains an Atom E3845 with Ethernet,
+	  micro-SD, USB 2, USB 3, SATA, serial console and HDMI 1.3 video
+	  out. It requires some binary blobs - see README.x86 for details.
+
+	  Note that PCIE_ECAM_BASE is set up by the FSP so the value used
+	  by U-Boot matches that value.
+
 endchoice
 
 source "board/congatec/conga-qeval20-qa3-e3845/Kconfig"
board/congatec/conga-qeval20-qa3-e3845/Kconfig +2 -5
index c2649d299f..a3673a66bd 100644
@@ -1,5 +1,3 @@
-if TARGET_CONGA_QEVAL20_QA3_E3845
-
 config SYS_BOARD
 	default "conga-qeval20-qa3-e3845"
 
@@ -10,7 +8,8 @@ config SYS_SOC
 	default "baytrail"
 
 config SYS_CONFIG_NAME
-	default "conga-qeval20-qa3-e3845"
+	default "conga-qeval20-qa3-e3845" if TARGET_CONGA_QEVAL20_QA3_E3845
+	default "theadorable-x86-conga-qa3-e3845" if TARGET_THEADORABLE_X86_CONGA_QA3_E3845
 
 config SYS_TEXT_BASE
 	default 0xfff00000 if !EFI_STUB
@@ -27,5 +26,3 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 
 config PCIE_ECAM_BASE
 	default 0xe0000000
-
-endif
board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS +2 -0
index 3d7e8e2d61..6e065590ab 100644
@@ -3,6 +3,8 @@ M:	Stefan Roese <[email protected]>
 S:	Maintained
 F:	board/congatec/conga-qeval20-qa3-e3845
 F:	include/configs/conga-qeval20-qa3-e3845.h
+F:	include/configs/theadorable-x86-conga-qa3-e3845.h
 F:	configs/conga-qeval20-qa3-e3845_defconfig
 F:	configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+F:	configs/theadorable-x86-conga-qa3-e3845_defconfig
 F:	arch/x86/dts/conga-qeval20-qa3-e3845.dts
configs/theadorable-x86-conga-qa3-e3845_defconfig new file +56 -0

56 lines not on this page · raw message

include/configs/theadorable-x86-conga-qa3-e3845.h new file +38 -0
new file mode 100644
index 0000000000..17aee1a0d2
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Stefan Roese <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * board/config.h - configuration options, board specific
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/x86-common.h>
+
+#define CONFIG_SYS_MONITOR_LEN		(1 << 20)
+
+#define CONFIG_PREBOOT
+
+#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \
+					"stdout=serial\0" \
+					"stderr=serial\0"
+
+#define VIDEO_IO_OFFSET				0
+#define CONFIG_X86EMU_RAW_IO
+#define CONFIG_CMD_BMP
+#define CONFIG_BMP_16BPP
+
+/* Environment settings */
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#undef CONFIG_ENV_SIZE
+#define CONFIG_ENV_SIZE			0x2000
+#define CONFIG_ENV_SECT_SIZE		0x1000
+#define CONFIG_ENV_OFFSET		0x006ec000
+#define CONFIG_ENV_OFFSET_REDUND	\
+	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+
+#endif	/* __CONFIG_H */
Signature · 1 line
2.14.0