[coreboot-gerrit] Change in coreboot[master]: mb/apple/macbook11, macbook21, imac52: Remove per board direct...

[Arthur Heymans (Code Review)]

Arthur Heymans has submitted this change and it was merged. ( https://review.coreboot.org/17894 )

Change subject: mb/apple/macbook11,macbook21,imac52: Remove per board directories
......................................................................


mb/apple/macbook11,macbook21,imac52: Remove per board directories

This is achieved by setting up Kconfig and Kconfig.name very similar
to how variants are used.

Change-Id: I22089ff29e3879d7956527a092a0ac6425b05cb3
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
Reviewed-on: https://review.coreboot.org/17894
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
D src/mainboard/apple/imac52/Kconfig
D src/mainboard/apple/imac52/Kconfig.name
D src/mainboard/apple/imac52/board_info.txt
D src/mainboard/apple/macbook11/Kconfig
D src/mainboard/apple/macbook11/Kconfig.name
D src/mainboard/apple/macbook11/board_info.txt
M src/mainboard/apple/macbook21/Kconfig
M src/mainboard/apple/macbook21/Kconfig.name
8 files changed, 9 insertions(+), 39 deletions(-)

Approvals:
  Kyösti Mälkki: Looks good to me, approved
  build bot (Jenkins): Verified



diff --git a/src/mainboard/apple/imac52/Kconfig b/src/mainboard/apple/imac52/Kconfig
deleted file mode 100644
index ba2ff95..0000000
--- a/src/mainboard/apple/imac52/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-if BOARD_APPLE_IMAC52
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "iMac5,2"
-
-endif
diff --git a/src/mainboard/apple/imac52/Kconfig.name b/src/mainboard/apple/imac52/Kconfig.name
deleted file mode 100644
index 034222b..0000000
--- a/src/mainboard/apple/imac52/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_APPLE_IMAC52
-	bool "iMac5,2"
diff --git a/src/mainboard/apple/imac52/board_info.txt b/src/mainboard/apple/imac52/board_info.txt
deleted file mode 100644
index 918d394..0000000
--- a/src/mainboard/apple/imac52/board_info.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Board name: iMac5,2
-Category: desktop
-ROM package: SOIC-8
-ROM protocol: SPI
-ROM socketed: n
-Flashrom support: n
-Clone of: apple/macbook21
-Release year: 2007
diff --git a/src/mainboard/apple/macbook11/Kconfig b/src/mainboard/apple/macbook11/Kconfig
deleted file mode 100644
index ebf5dfe..0000000
--- a/src/mainboard/apple/macbook11/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-if BOARD_APPLE_MACBOOK11
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "MacBook1,1"
-
-endif
diff --git a/src/mainboard/apple/macbook11/Kconfig.name b/src/mainboard/apple/macbook11/Kconfig.name
deleted file mode 100644
index d5ab9ae..0000000
--- a/src/mainboard/apple/macbook11/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_APPLE_MACBOOK11
-	bool "Macbook1,1"
diff --git a/src/mainboard/apple/macbook11/board_info.txt b/src/mainboard/apple/macbook11/board_info.txt
deleted file mode 100644
index af45a2f..0000000
--- a/src/mainboard/apple/macbook11/board_info.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Board name: Macbook1,1
-Category: laptop
-ROM package: SOIC-8
-ROM protocol: SPI
-ROM socketed: n
-Flashrom support: n
-Clone of: apple/macbook21
-Release year: 2006
diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index 4f51a28..7ee0e1a 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -27,13 +27,11 @@
 	string
 	default apple/macbook21
 
-if BOARD_APPLE_MACBOOK21
-
 config MAINBOARD_PART_NUMBER
 	string
-	default "MacBook2,1"
-
-endif
+	default "Macbook1,1" if BOARD_APPLE_MACBOOK11
+	default "MacBook2,1" if BOARD_APPLE_MACBOOK21
+	default "iMac5,2" if BOARD_APPLE_IMAC52
 
 config MMCONF_BASE_ADDRESS
 	hex
diff --git a/src/mainboard/apple/macbook21/Kconfig.name b/src/mainboard/apple/macbook21/Kconfig.name
index 034956b..7547767 100644
--- a/src/mainboard/apple/macbook21/Kconfig.name
+++ b/src/mainboard/apple/macbook21/Kconfig.name
@@ -1,2 +1,8 @@
 config BOARD_APPLE_MACBOOK21
 	bool "Macbook2,1"
+
+config BOARD_APPLE_MACBOOK11
+	bool "Macbook1,1"
+
+config BOARD_APPLE_IMAC52
+	bool "iMac5,2"

-- 
To view, visit https://review.coreboot.org/17894
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I22089ff29e3879d7956527a092a0ac6425b05cb3
Gerrit-PatchSet: 5
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki at gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins)