[coreboot-gerrit] Patch set updated for coreboot: mb/gigabyte/ga-945gcm-s2c: Add mainboard using variants

[Arthur Heymans (arthur@aheymans.xyz)]

Arthur Heymans (arthur at aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17416

-gerrit

commit 8b749ec2f61f87098833e204f1745979e03cd177
Author: Arthur Heymans <arthur at aheymans.xyz>
Date:   Mon Nov 14 09:58:20 2016 +0100

    mb/gigabyte/ga-945gcm-s2c: Add mainboard using variants
    
    This mainboard is identical to ga-945gcm-s2l except for NIC
    which is a Realtek RTL 8101E chip (10/100 Mbit).
    
    The schematics of ga-945gcm-s2l mention multiple NICs and ga-945gcm-s2c
    and ga-945gcm-s2l have a common manual further indicating that those
    boards are close to identical.
    
    Change-Id: Iba3d401efcf208154e639c3237b201830a5151aa
    Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
 src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig               | 14 ++++++++++----
 src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig.name          |  3 +++
 src/mainboard/gigabyte/ga-945gcm-s2l/board_info.txt        |  6 ------
 .../ga-945gcm-s2l/variants/ga-945gcm-s2c/board_info.txt    |  6 ++++++
 .../ga-945gcm-s2l/variants/ga-945gcm-s2l/board_info.txt    |  6 ++++++
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index b41becc..e4110d1 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -13,7 +13,7 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
-if BOARD_GIGABYTE_GA_945GCM_S2L
+if BOARD_GIGABYTE_GA_945GCM_S2L || BOARD_GIGABYTE_GA_945GCM_S2C
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -33,15 +33,21 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select INTEL_EDID
-	select REALTEK_8168_RESET
+	select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L
 
 config MAINBOARD_DIR
 	string
 	default gigabyte/ga-945gcm-s2l
 
+config VARIANT_DIR
+	string
+	default "ga-945gcm-s2l" if BOARD_GIGABYTE_GA_945GCM_S2L
+	default "ga-945gcm-s2c" if BOARD_GIGABYTE_GA_945GCM_S2C
+
 config MAINBOARD_PART_NUMBER
 	string
-	default "GA-945GCM-S2L"
+	default "GA-945GCM-S2L" if BOARD_GIGABYTE_GA_945GCM_S2L
+	default "GA-945GCM-S2C" if BOARD_GIGABYTE_GA_945GCM_S2C
 
 config MMCONF_BASE_ADDRESS
 	hex
@@ -55,4 +61,4 @@ config MAX_CPUS
 	int
 	default 2
 
-endif # BOARD_GIGABYTE_GA_945GCM_S2L
+endif
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig.name b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig.name
index 95baebe..8c7c21e 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig.name
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig.name
@@ -1,2 +1,5 @@
 config BOARD_GIGABYTE_GA_945GCM_S2L
 	bool "GA-945GCM-S2L"
+
+config BOARD_GIGABYTE_GA_945GCM_S2C
+	bool "GA-945GCM-S2C"
\ No newline at end of file
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/board_info.txt b/src/mainboard/gigabyte/ga-945gcm-s2l/board_info.txt
deleted file mode 100644
index 70cbe41..0000000
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/board_info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Category: desktop
-Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=2669#ov
-Release year: 2007
-ROM package: SOIC-8
-ROM protocol: SPI
-ROM socketed: n
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2c/board_info.txt b/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2c/board_info.txt
new file mode 100644
index 0000000..cf3cbc7
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2c/board_info.txt
@@ -0,0 +1,6 @@
+Category: desktop
+Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=2668#ov
+Release year: 2007
+ROM package: SOIC-8
+ROM protocol: SPI
+ROM socketed: n
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2l/board_info.txt b/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2l/board_info.txt
new file mode 100644
index 0000000..70cbe41
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/variants/ga-945gcm-s2l/board_info.txt
@@ -0,0 +1,6 @@
+Category: desktop
+Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=2669#ov
+Release year: 2007
+ROM package: SOIC-8
+ROM protocol: SPI
+ROM socketed: n