From 1dfc0a64d42cc9052f5140cfa481ec0380971eef Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 15 Dec 2016 19:35:31 +0100 Subject: [PATCH] mb/apple/macbook11,macbook21,imac52: Remove per board directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/17894 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/apple/imac52/Kconfig | 7 ------- src/mainboard/apple/imac52/Kconfig.name | 2 -- src/mainboard/apple/imac52/board_info.txt | 8 -------- src/mainboard/apple/macbook11/Kconfig | 7 ------- src/mainboard/apple/macbook11/Kconfig.name | 2 -- src/mainboard/apple/macbook11/board_info.txt | 8 -------- src/mainboard/apple/macbook21/Kconfig | 8 +++----- src/mainboard/apple/macbook21/Kconfig.name | 6 ++++++ 8 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 src/mainboard/apple/imac52/Kconfig delete mode 100644 src/mainboard/apple/imac52/Kconfig.name delete mode 100644 src/mainboard/apple/imac52/board_info.txt delete mode 100644 src/mainboard/apple/macbook11/Kconfig delete mode 100644 src/mainboard/apple/macbook11/Kconfig.name delete mode 100644 src/mainboard/apple/macbook11/board_info.txt diff --git a/src/mainboard/apple/imac52/Kconfig b/src/mainboard/apple/imac52/Kconfig deleted file mode 100644 index ba2ff95b2d..0000000000 --- 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 034222b202..0000000000 --- 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 918d39461e..0000000000 --- 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 ebf5dfe677..0000000000 --- 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 d5ab9aec8a..0000000000 --- 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 af45a2f21d..0000000000 --- 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 4f51a28adf..7ee0e1a712 100644 --- a/src/mainboard/apple/macbook21/Kconfig +++ b/src/mainboard/apple/macbook21/Kconfig @@ -27,13 +27,11 @@ config MAINBOARD_DIR 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 034956b160..7547767919 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"