Merge git://git.denx.de/u-boot-uniphier

[oweals/u-boot.git] / board / intel / Kconfig

diff --git a/board/intel/Kconfig b/board/intel/Kconfig
index 7fe21b983a4a4a3dd97160ed6b6ec1576d44ba02..4ebf80813fbeffdf745b42fa1d829b86880b3332 100644 (file)
--- a/board/intel/Kconfig
+++ b/board/intel/Kconfig
@@ -8,6 +8,32 @@ if VENDOR_INTEL
 
 choice
        prompt "Mainboard model"
+       optional
+
+config TARGET_BAYLEYBAY
+       bool "Bayley Bay"
+       help
+         This is the Intel Bayley Bay Customer Reference Board. It contains an
+         Intel quad-core Atom Processor E3800 with dual-channel DDR3L SODIMM
+         4GB memory, HDMI/DP/VGA display, HD audio, SATA, USB2, USB3, SD, eMMC,
+         PCIe and some other sensor interfaces.
+
+config TARGET_CHERRYHILL
+       bool "Cherry Hill"
+       help
+         This is the Intel Cherry Hill Customer Reference Board. It is in a
+         mini-ITX form factor containing the Intel Braswell SoC, which has
+         a 64-bit quad-core, single-thread, Intel Atom processor, along with
+         serial console, 10/100/1000 Ethernet, SD-Card, USB 2/3, SATA, PCIe,
+         some GPIOs, one HDMI and two DP video out.
+
+config TARGET_COUGARCANYON2
+       bool "Cougar Canyon 2"
+       help
+         This is the Intel Cougar Canyon 2 Customer Reference Board. It
+         is built on the Chief River platform with Intel Ivybridge Processor
+         and Panther Point chipset. The board has 4GB RAM, with some other
+         peripheral connectors for PCIe/SATA/USB2/USB3/LAN/UART/PS2/VGA/HDMI.
 
 config TARGET_CROWNBAY
        bool "Crown Bay"
@@ -18,6 +44,13 @@ config TARGET_CROWNBAY
          Intel Platform Controller Hub EG20T, other system components and
          peripheral connectors for PCIe/SATA/USB/LAN/SD/UART/Audio/LVDS.
 
+config TARGET_EDISON
+       bool "Edison"
+       help
+         This is the Intel Edison Compute Module. It contains a dual core Intel
+         Atom Tangier CPU, 1 GB RAM integrated on package. There is also 4 GB
+         eMMC flash on board, Wi-Fi, Bluetooth 4 and USB controllers.
+
 config TARGET_GALILEO
        bool "Galileo"
        help
@@ -44,7 +77,11 @@ config TARGET_MINNOWMAX
 
 endchoice
 
+source "board/intel/bayleybay/Kconfig"
+source "board/intel/cherryhill/Kconfig"
+source "board/intel/cougarcanyon2/Kconfig"
 source "board/intel/crownbay/Kconfig"
+source "board/intel/edison/Kconfig"
 source "board/intel/galileo/Kconfig"
 source "board/intel/minnowmax/Kconfig"