Re: [U-Boot] [PATCH 03/11 v2] x86: conga: Add option to select different config headers for baseboards

22 Jul 2017

Hi Stefan,
On Tue, Jul 18, 2017 at 8:10 PM, Stefan Roese sr@denx.de wrote:
...
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.
Signed-off-by: Stefan Roese sr@denx.de
Cc: Simon Glass sjg@chromium.org
Reviewed-by: Bin Meng bmeng.cn@gmail.com


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  | 77 ++++++++++++++++++++++
 include/configs/theadorable-x86-conga-qa3-e3845.h  | 54 +++++++++++++++
 5 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 configs/theadorable-x86-conga-qa3-e3845_defconfig
 create mode 100644 include/configs/theadorable-x86-conga-qa3-e3845.h

diff --git a/board/congatec/Kconfig b/board/congatec/Kconfig
index 875d1ae07b..31c12028ee 100644
--- a/board/congatec/Kconfig
+++ b/board/congatec/Kconfig
@@ -23,6 +23,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"
diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
index 9f31238930..ac9ab90b8e 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig
+++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
@@ -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
@@ -24,5 +23,3 @@ config BOARD_SPECIFIC_OPTIONS # dummy
config PCIE_ECAM_BASE
        default 0xe0000000



-endif
diff --git a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS
index 3d7e8e2d61..6e065590ab 100644
--- a/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS
+++ b/board/congatec/conga-qeval20-qa3-e3845/MAINTAINERS
@@ -3,6 +3,8 @@ M:      Stefan Roese sr@denx.de
 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
diff --git a/configs/theadorable-x86-conga-qa3-e3845_defconfig b/configs/theadorable-x86-conga-qa3-e3845_defconfig
new file mode 100644
index 0000000000..5082dda0c1
--- /dev/null
+++ b/configs/theadorable-x86-conga-qa3-e3845_defconfig
@@ -0,0 +1,77 @@
+CONFIG_X86=y
+CONFIG_VENDOR_CONGATEC=y
+CONFIG_TARGET_THEADORABLE_X86_CONGA_QA3_E3845=y
+CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
+CONFIG_INTERNAL_UART=y
+CONFIG_HAVE_INTEL_ME=y
+CONFIG_ENABLE_MRC_CACHE=y
+CONFIG_SMP=y
+CONFIG_HAVE_VGA_BIOS=y
+CONFIG_VGA_BIOS_ADDR=0xfffa0000
+CONFIG_GENERATE_PIRQ_TABLE=y
+CONFIG_GENERATE_MP_TABLE=y
+CONFIG_GENERATE_ACPI_TABLE=y
+CONFIG_SEABIOS=y
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_BOOTSTAGE=y
+CONFIG_BOOTSTAGE_REPORT=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_ARCH_MISC_INIT=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_CPU=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+# CONFIG_CMD_NFS is not set
+CONFIG_CMD_PING=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_BOOTSTAGE=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_OF_CONTROL=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_CPU=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_INTEL=y
+CONFIG_WINBOND_W83627=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DM_ETH=y
+CONFIG_E1000=y
+CONFIG_DM_PCI=y
+CONFIG_DM_RTC=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0x3f8
+CONFIG_DEBUG_UART_CLOCK=1843200
+CONFIG_SYS_NS16550=y
+CONFIG_ICH_SPI=y
+CONFIG_TIMER=y
+CONFIG_USB=y
This is not needed now. Please see http://patchwork.ozlabs.org/patch/792443/.
...
+CONFIG_DM_USB=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_DM_VIDEO=y
+CONFIG_VIDEO_VESA=y
+CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
+CONFIG_FRAMEBUFFER_VESA_MODE_114=y
+CONFIG_CONSOLE_SCROLL_LINES=5
+CONFIG_USE_PRIVATE_LIBGCC=y
diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h
new file mode 100644
index 0000000000..072559ae79
--- /dev/null
+++ b/include/configs/theadorable-x86-conga-qa3-e3845.h
@@ -0,0 +1,54 @@
+/*


Copyright (C) 2016 Stefan Roese sr@denx.de







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_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_ARCH_EARLY_INIT_R
+#define CONFIG_ARCH_MISC_INIT



+#define CONFIG_PREBOOT



+#define CONFIG_STD_DEVICES_SETTINGS     "stdin=serial\0" \

                                  "stdout=serial\0" \


                                  "stderr=serial\0"




+#define CONFIG_SCSI_DEV_LIST           \

  {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \


  {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}




+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SDMA



+#undef CONFIG_USB_MAX_CONTROLLER_COUNT
+#define CONFIG_USB_MAX_CONTROLLER_COUNT                1
This should be removed as well. Please see
http://patchwork.ozlabs.org/patch/776750/.
...



+#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 */
Regards,
Bin

    