Hi Bin,

On 06.08.2017 02:48, Bin Meng wrote:
On Sun, Aug 6, 2017 at 12:49 AM, Stefan Roese <s...@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-dfi-bt700 is also added.

Signed-off-by: Stefan Roese <s...@denx.de>
Cc: Simon Glass <s...@chromium.org>
Cc: Bin Meng <bmeng...@gmail.com>
---
v3:
- Rebased on latest master
- Removed unused macros from config headers


Sorry for your rebase due to the u-boot-x86/master changes.

v2:
- Added Bin's reviewed-by

  board/dfi/Kconfig                           | 18 +++++++++--
  board/dfi/dfi-bt700/Kconfig                 |  7 ++---
  board/dfi/dfi-bt700/MAINTAINERS             |  1 +
  configs/dfi-bt700-q7x-151_defconfig         |  4 ++-
  configs/theadorable-x86-dfi-bt700_defconfig |  5 ++-
  include/configs/theadorable-x86-dfi-bt700.h | 47 +++++++++++++++++++++++++++++
  6 files changed, 72 insertions(+), 10 deletions(-)
  create mode 100644 include/configs/theadorable-x86-dfi-bt700.h

diff --git a/board/dfi/Kconfig b/board/dfi/Kconfig
index d2a1d78783..5488f68ed2 100644
--- a/board/dfi/Kconfig
+++ b/board/dfi/Kconfig
@@ -8,10 +8,9 @@ if VENDOR_DFI

  choice
         prompt "Mainboard model"
-       optional

-config TARGET_DFI_BT700
-       bool "DFI BT700 BayTrail"
+config TARGET_Q7X_151_DFI_BT700
+       bool "DFI BT700 BayTrail on DFI Q7X-151 baseboard"
         imply SCSI
         help
           This is the DFI Q7X-151 baseboard equipped with the
@@ -23,6 +22,19 @@ config TARGET_DFI_BT700
           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_DFI_BT700
+       bool "DFI BT700 BayTrail on theadorable-x86 baseboard"
+       imply SCSI
+       help
+         This is the theadorable-x86 baseboard equipped with the
+         DFI BayTrail Bt700 SoM. It contains an Atom E3845 with
+         Ethernet (in non-PCIe-x4 configuration), micro-SD, USB 2,
+         USB 3, SATA, serial console and DisplayPort 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/dfi/dfi-bt700/Kconfig"
diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig
index 81a2575d11..61bd182dd7 100644
--- a/board/dfi/dfi-bt700/Kconfig
+++ b/board/dfi/dfi-bt700/Kconfig
@@ -1,5 +1,3 @@
-if TARGET_DFI_BT700
-
  config SYS_BOARD
         default "dfi-bt700"

@@ -10,7 +8,8 @@ config SYS_SOC
         default "baytrail"

  config SYS_CONFIG_NAME
-       default "dfi-bt700"
+       default "dfi-bt700" if TARGET_Q7X_151_DFI_BT700
+       default "theadorable-x86-dfi-bt700" if TARGET_THEADORABLE_X86_DFI_BT700

  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
diff --git a/board/dfi/dfi-bt700/MAINTAINERS b/board/dfi/dfi-bt700/MAINTAINERS
index 6639787814..a99a7250b8 100644
--- a/board/dfi/dfi-bt700/MAINTAINERS
+++ b/board/dfi/dfi-bt700/MAINTAINERS
@@ -3,6 +3,7 @@ M:      Stefan Roese <s...@denx.de>
  S:     Maintained
  F:     board/dfi/dfi-bt700
  F:     include/configs/dfi-bt700.h
+F:     include/configs/theadorable-x86-dfi-bt700.h
  F:     configs/dfi-bt700-q7x-151_defconfig
  F:     configs/theadorable-x86-dfi-bt700_defconfig
  F:     arch/x86/dts/dfi-bt700.dtsi
diff --git a/configs/dfi-bt700-q7x-151_defconfig 
b/configs/dfi-bt700-q7x-151_defconfig
index 13d911c78c..783239b999 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -1,13 +1,13 @@
  CONFIG_X86=y
  CONFIG_VENDOR_DFI=y
  CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151"
-CONFIG_TARGET_DFI_BT700=y
  CONFIG_DEBUG_UART=y
  CONFIG_SMP=y
  CONFIG_HAVE_VGA_BIOS=y
  CONFIG_GENERATE_PIRQ_TABLE=y
  CONFIG_GENERATE_MP_TABLE=y
  CONFIG_GENERATE_ACPI_TABLE=y
+CONFIG_HAVE_ACPI_RESUME=y
  CONFIG_SEABIOS=y
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
@@ -43,6 +43,8 @@ CONFIG_SYSCON=y
  CONFIG_CPU=y
  CONFIG_DM_I2C=y
  CONFIG_NUVOTON_NCT6102D=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_WINBOND=y

Normally there is just one SPI flash on the board. Can you confirm
that? Please change the board Kconfig file to select SPI flash, like
http://patchwork.ozlabs.org/patch/795356/.

I some cases, we equip these boards with SPI flash chips from
different manufacturers. So yes, this is correct. And to make
this selection of flash chips more user friendly (for potential
changes in the future), it seems easier to me to select them via
Kconfig (menuconfig) than to select them in the Kconfig board
file.

So in summary, I would like to keep it this way, if there are
no real pressing reasons to move this selection to the board
Kconfig file.

Thanks,
Stefan
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to