Change in coreboot[master]: opencellular/rotundu: Introduce variants for OC

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/22924 )

Change subject: opencellular/rotundu: Introduce variants for OC
......................................................................

opencellular/rotundu: Introduce variants for OC

* Add Supabrck v1 variant
* Modify rotundu base board

Change-Id: Id20e9d4ed7ac071d25a69eee63c9ec544d2ad152
Signed-off-by: Philipp Deppenwiese 
Reviewed-on: https://review.coreboot.org/22924
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/mainboard/opencellular/rotundu/Kconfig
M src/mainboard/opencellular/rotundu/Kconfig.name
M src/mainboard/opencellular/rotundu/Makefile.inc
R src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb
R src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c
C src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb
C src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c
7 files changed, 29 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig
index e118ad5..9b50cef 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig
+++ b/src/mainboard/opencellular/rotundu/Kconfig
@@ -15,10 +15,8 @@
 ## GNU General Public License for more details.
 ##

-if BOARD_OPENCELLULAR_ROTUNDU
-
-config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
+config BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
+	def_bool n
    select SOC_INTEL_FSP_BAYTRAIL
    select BOARD_ROMSIZE_KB_16384
    select HAVE_ACPI_TABLES
@@ -30,13 +28,26 @@
    select USE_BLOBS
    select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT

-config MAINBOARD_DIR
+if BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
+
+config VARIANT_DIR
    string
-	default "opencellular/rotundu"
+	default "rotundu" if BOARD_OPENCELLULAR_ROTUNDU
+	default "supabrckv1" if BOARD_OPENCELLULAR_SUPABRCKV1

config MAINBOARD_PART_NUMBER
    string
-	default "Rotundu"
+	default "Rotundu" if BOARD_OPENCELLULAR_ROTUNDU
+	default "Supabrck v1" if BOARD_OPENCELLULAR_SUPABRCKV1
+
+config DEVICETREE
+	string
+	default "variants/rotundu/devicetree.cb" if BOARD_OPENCELLULAR_ROTUNDU
+	default "variants/supabrckv1/devicetree.cb" if BOARD_OPENCELLULAR_SUPABRCKV1
+
+config MAINBOARD_DIR
+	string
+	default "opencellular/rotundu"

config MAINBOARD_VENDOR
    string
diff --git a/src/mainboard/opencellular/rotundu/Kconfig.name b/src/mainboard/opencellular/rotundu/Kconfig.name
index 3640ef6..1346b94 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig.name
+++ b/src/mainboard/opencellular/rotundu/Kconfig.name
@@ -1,2 +1,7 @@
 config BOARD_OPENCELLULAR_ROTUNDU
-	bool "Rotundu"
+	bool "OpenCellular Rotundu (GBCv1)"
+	select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
+
+config BOARD_OPENCELLULAR_SUPABRCKV1
+	bool "OpenCellular Supabrck V1 (BRCK)"
+	select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
diff --git a/src/mainboard/opencellular/rotundu/Makefile.inc b/src/mainboard/opencellular/rotundu/Makefile.inc
index 3074df2..2aee228 100644
--- a/src/mainboard/opencellular/rotundu/Makefile.inc
+++ b/src/mainboard/opencellular/rotundu/Makefile.inc
@@ -13,5 +13,7 @@
 ## GNU General Public License for more details.
 ##

-ramstage-y += gpio.c
+ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-y += irqroute.c
+
+subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/opencellular/rotundu/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb
similarity index 100%
rename from src/mainboard/opencellular/rotundu/devicetree.cb
rename to src/mainboard/opencellular/rotundu/variants/rotundu/devicetree.cb
diff --git a/src/mainboard/opencellular/rotundu/gpio.c b/src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c
similarity index 99%
rename from src/mainboard/opencellular/rotundu/gpio.c
rename to src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c
index a61b7c4..78d1ad6 100644
--- a/src/mainboard/opencellular/rotundu/gpio.c
+++ b/src/mainboard/opencellular/rotundu/variants/rotundu/gpio.c
@@ -17,7 +17,7 @@

#include <stdlib.h>
 #include <soc/gpio.h>
-#include "irqroute.h"
+#include "../../irqroute.h"

/* NCORE GPIOs */
 static const struct soc_gpio_map gpncore_gpio_map[] = {
diff --git a/src/mainboard/opencellular/rotundu/devicetree.cb b/src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb
similarity index 100%
copy from src/mainboard/opencellular/rotundu/devicetree.cb
copy to src/mainboard/opencellular/rotundu/variants/supabrckv1/devicetree.cb
diff --git a/src/mainboard/opencellular/rotundu/gpio.c b/src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c
similarity index 99%
copy from src/mainboard/opencellular/rotundu/gpio.c
copy to src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c
index a61b7c4..78d1ad6 100644
--- a/src/mainboard/opencellular/rotundu/gpio.c
+++ b/src/mainboard/opencellular/rotundu/variants/supabrckv1/gpio.c
@@ -17,7 +17,7 @@

#include <stdlib.h>
 #include <soc/gpio.h>
-#include "irqroute.h"
+#include "../../irqroute.h"

/* NCORE GPIOs */
 static const struct soc_gpio_map gpncore_gpio_map[] = {