[coreboot-gerrit] Change in coreboot[master]: OC fixes WIP

[Philipp Deppenwiese (Code Review)]

Philipp Deppenwiese has uploaded this change for review. ( https://review.coreboot.org/28335


Change subject: OC fixes WIP
......................................................................

OC fixes WIP

Change-Id: I1ccd0c28e05f5d57f0c2a7575021efbe4ba1c570
Signed-off-by: Philipp Deppenwiese <zaolin at das-labor.org>
---
M src/mainboard/opencellular/Kconfig
M src/mainboard/opencellular/Kconfig.name
M src/mainboard/opencellular/elgon/Kconfig
M src/mainboard/opencellular/elgon/Kconfig.name
M src/mainboard/opencellular/elgon/Makefile.inc
M src/mainboard/opencellular/rotundu/Kconfig
M src/mainboard/opencellular/rotundu/Kconfig.name
M src/soc/cavium/cn81xx/soc.c
8 files changed, 10 insertions(+), 24 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/28335/1

diff --git a/src/mainboard/opencellular/Kconfig b/src/mainboard/opencellular/Kconfig
index 2df6ba3..1a80c3f 100644
--- a/src/mainboard/opencellular/Kconfig
+++ b/src/mainboard/opencellular/Kconfig
@@ -25,6 +25,6 @@
 
 config MAINBOARD_VENDOR
 	string
-	default "OpenCellular"
+	default "Open Cellular"
 
 endif # VENDOR_OPENCELLULAR
diff --git a/src/mainboard/opencellular/Kconfig.name b/src/mainboard/opencellular/Kconfig.name
index c65882f..fbbca76 100644
--- a/src/mainboard/opencellular/Kconfig.name
+++ b/src/mainboard/opencellular/Kconfig.name
@@ -1,2 +1,2 @@
 config VENDOR_OPENCELLULAR
-	bool "OpenCellular"
+	bool "Open Cellular"
diff --git a/src/mainboard/opencellular/elgon/Kconfig b/src/mainboard/opencellular/elgon/Kconfig
index bd35e9c..37a020a 100644
--- a/src/mainboard/opencellular/elgon/Kconfig
+++ b/src/mainboard/opencellular/elgon/Kconfig
@@ -42,10 +42,6 @@
 	string
 	default "opencellular/elgon"
 
-config MAINBOARD_VENDOR
-	string
-	default "Open Cellular"
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x1
@@ -91,4 +87,8 @@
 	string
 	default "Elgon"
 
+config MAINBOARD_FIT_DTS
+	string
+	default "gbcv2.dts"
+
 endif
diff --git a/src/mainboard/opencellular/elgon/Kconfig.name b/src/mainboard/opencellular/elgon/Kconfig.name
index e0c4290..7d02111 100644
--- a/src/mainboard/opencellular/elgon/Kconfig.name
+++ b/src/mainboard/opencellular/elgon/Kconfig.name
@@ -1,2 +1,2 @@
 config BOARD_OPENCELLULAR_ELGON
-	bool "Elgon"
+	bool "Elgon (GBCv2)"
diff --git a/src/mainboard/opencellular/elgon/Makefile.inc b/src/mainboard/opencellular/elgon/Makefile.inc
index 26de1cc..343a52e 100644
--- a/src/mainboard/opencellular/elgon/Makefile.inc
+++ b/src/mainboard/opencellular/elgon/Makefile.inc
@@ -29,13 +29,3 @@
 
 verstage-y += memlayout.ld
 verstage-y += death.c
-
-MB_DIR = src/mainboard/$(MAINBOARDDIR)
-
-LINUX_DTB = gbcv2.dtb
-build/$(LINUX_DTB):
-	dtc -p 4096 -I dts -O dtb -o build/$(LINUX_DTB) -i $(MB_DIR) $(MB_DIR)/$(patsubst %.dtb,%.dts,$(LINUX_DTB))
-
-cbfs-files-y += $(LINUX_DTB)
-$(LINUX_DTB)-file := build/$(LINUX_DTB)
-$(LINUX_DTB)-type := raw
diff --git a/src/mainboard/opencellular/rotundu/Kconfig b/src/mainboard/opencellular/rotundu/Kconfig
index edacf0d..4164768 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig
+++ b/src/mainboard/opencellular/rotundu/Kconfig
@@ -66,10 +66,6 @@
 	string
 	default "opencellular/rotundu"
 
-config MAINBOARD_VENDOR
-	string
-	default "OpenCellular"
-
 config MAX_CPUS
 	int
 	default 16
diff --git a/src/mainboard/opencellular/rotundu/Kconfig.name b/src/mainboard/opencellular/rotundu/Kconfig.name
index 1346b94..37df2e2 100644
--- a/src/mainboard/opencellular/rotundu/Kconfig.name
+++ b/src/mainboard/opencellular/rotundu/Kconfig.name
@@ -1,7 +1,7 @@
 config BOARD_OPENCELLULAR_ROTUNDU
-	bool "OpenCellular Rotundu (GBCv1)"
+	bool "Rotundu (GBCv1)"
 	select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
 
 config BOARD_OPENCELLULAR_SUPABRCKV1
-	bool "OpenCellular Supabrck V1 (BRCK)"
+	bool "Supabrck V1 (BRCK)"
 	select BOARD_OPENCELLULAR_BASEBOARD_ROTUNDU
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index 8efcb13..0d10f4e 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -327,7 +327,7 @@
 
 	size_t size = 0;
 
-	void *ptr = cbfs_boot_map_with_leak("sff8104-linux.dtb",
+	void *ptr = cbfs_boot_map_with_leak(CONFIG_MAINBOARD_FIT_DTS,
 					    CBFS_TYPE_RAW, &size);
 	if (ptr)
 		memcpy(_sff8104, ptr, size);

-- 
To view, visit https://review.coreboot.org/28335
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ccd0c28e05f5d57f0c2a7575021efbe4ba1c570
Gerrit-Change-Number: 28335
Gerrit-PatchSet: 1
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180824/9487b384/attachment-0001.html>