Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6711
-gerrit
commit 4d1fff6b78856cd642a16055f58c71cf7118d824 Author: Vladimir Serbinenko phcoder@gmail.com Date: Tue Aug 19 02:11:20 2014 +0200
board-status: disambiguate clones
Change-Id: I362da6c983636594bf6a61a58e1bdc7d5b738a67 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/mainboard/apple/macbook11/Kconfig | 4 ++++ src/mainboard/asus/a8n_sli/Kconfig | 4 ++++ src/mainboard/iei/rocky-512/Kconfig | 4 ++++ src/mainboard/jetway/j7f4k1g2e/Kconfig | 5 +++++ src/mainboard/jetway/j7f4k1g5d/Kconfig | 5 +++++ src/mainboard/linutop/linutop1/Kconfig | 4 ++++ src/mainboard/pcengines/alix2c/Kconfig | 4 ++++ src/mainboard/pcengines/alix6/Kconfig | 4 ++++ src/mainboard/via/epia-mii/Kconfig | 4 ++++ src/mainboard/via/epia-ml/Kconfig | 4 ++++ util/board_status/board_status.sh | 5 ++++- 11 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/src/mainboard/apple/macbook11/Kconfig b/src/mainboard/apple/macbook11/Kconfig index b5ac7fe..5d981af 100644 --- a/src/mainboard/apple/macbook11/Kconfig +++ b/src/mainboard/apple/macbook11/Kconfig @@ -4,4 +4,8 @@ config MAINBOARD_PART_NUMBER string default "MacBook2,1"
+config BOARD_STATUS_DIR + string + default apple/macbook11 + endif diff --git a/src/mainboard/asus/a8n_sli/Kconfig b/src/mainboard/asus/a8n_sli/Kconfig index e2ac03d..05975a0 100644 --- a/src/mainboard/asus/a8n_sli/Kconfig +++ b/src/mainboard/asus/a8n_sli/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "A8N-SLI"
+config BOARD_STATUS_DIR + string + default asus/a8n_sli + endif diff --git a/src/mainboard/iei/rocky-512/Kconfig b/src/mainboard/iei/rocky-512/Kconfig index 864da86..05a3279 100644 --- a/src/mainboard/iei/rocky-512/Kconfig +++ b/src/mainboard/iei/rocky-512/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "ROCKY-512"
+config BOARD_STATUS_DIR + string + default iei/rocky-512 + endif diff --git a/src/mainboard/jetway/j7f4k1g2e/Kconfig b/src/mainboard/jetway/j7f4k1g2e/Kconfig index 8c8bbaf..edf43d3 100644 --- a/src/mainboard/jetway/j7f4k1g2e/Kconfig +++ b/src/mainboard/jetway/j7f4k1g2e/Kconfig @@ -5,4 +5,9 @@ if BOARD_JETWAY_J7F4K1G2E config MAINBOARD_PART_NUMBER string default "J7f4K1G2E" + +config BOARD_STATUS_DIR + string + default jetway/j7f4k1g2e + endif diff --git a/src/mainboard/jetway/j7f4k1g5d/Kconfig b/src/mainboard/jetway/j7f4k1g5d/Kconfig index d59e703..83b2da9 100644 --- a/src/mainboard/jetway/j7f4k1g5d/Kconfig +++ b/src/mainboard/jetway/j7f4k1g5d/Kconfig @@ -5,4 +5,9 @@ if BOARD_JETWAY_J7F4K1G5D config MAINBOARD_PART_NUMBER string default "J7f4K1G5D" + +config BOARD_STATUS_DIR + string + default jetway/j7f4k1g5d + endif diff --git a/src/mainboard/linutop/linutop1/Kconfig b/src/mainboard/linutop/linutop1/Kconfig index c8f9a24..8586908 100644 --- a/src/mainboard/linutop/linutop1/Kconfig +++ b/src/mainboard/linutop/linutop1/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "Linutop-1"
+config BOARD_STATUS_DIR + string + default linutop/linutop1 + endif diff --git a/src/mainboard/pcengines/alix2c/Kconfig b/src/mainboard/pcengines/alix2c/Kconfig index 8bed484..24ed7eb 100644 --- a/src/mainboard/pcengines/alix2c/Kconfig +++ b/src/mainboard/pcengines/alix2c/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "ALIX.2C"
+config BOARD_STATUS_DIR + string + default pcengines/alix2c + endif diff --git a/src/mainboard/pcengines/alix6/Kconfig b/src/mainboard/pcengines/alix6/Kconfig index 41b9cf4..a26a988 100644 --- a/src/mainboard/pcengines/alix6/Kconfig +++ b/src/mainboard/pcengines/alix6/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "ALIX.6"
+config BOARD_STATUS_DIR + string + default pcengines/alix6 + endif diff --git a/src/mainboard/via/epia-mii/Kconfig b/src/mainboard/via/epia-mii/Kconfig index ff31b93..729d487 100644 --- a/src/mainboard/via/epia-mii/Kconfig +++ b/src/mainboard/via/epia-mii/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "EPIA-MII"
+config BOARD_STATUS_DIR + string + default via/epia-mii + endif diff --git a/src/mainboard/via/epia-ml/Kconfig b/src/mainboard/via/epia-ml/Kconfig index 5e7b6ab..51739ec 100644 --- a/src/mainboard/via/epia-ml/Kconfig +++ b/src/mainboard/via/epia-ml/Kconfig @@ -6,4 +6,8 @@ config MAINBOARD_PART_NUMBER string default "EPIA-ML"
+config BOARD_STATUS_DIR + string + default via/epia-ml + endif diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 49d2c73..b4e7f24 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -222,7 +222,10 @@ fi test_cmd $LOCAL "$cbfstool_cmd" $cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt $cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt -mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +mainboard_dir="$(grep CONFIG_BOARD_STATUS_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +if [ "$mainboard_dir" = "" ]; then + mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +fi vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }')