Patch set updated for coreboot: util/board_status: Fix a couple of ugly wiki lines

[Timothy Pearson]

Timothy Pearson ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12631

-gerrit

commit 90197c6003c56d587e3f328774202fd1d65ff9cc
Author: Timothy Pearson 
Date:   Wed Dec 2 18:07:22 2015 -0600

util/board_status: Fix a couple of ugly wiki lines

Examples from the KGPE-D16 entry:
    AMD SR5650
    AMD SB700 AMD SB700 DISABLE ISA DMA AMD SUBTYPE SP5100

AMD_SOCKET_G34_NON_AGESA

Should be:
    AMD SR5650
    AMD SB700 AMD SUBTYPE SP5100

AMD Opteron™ Magny-Cours/Interlagos

Change-Id: I3881a27060c0cd66a7228d201f477e89f364daca
    Signed-off-by: Timothy Pearson 
---
 util/board_status/to-wiki/towiki.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index e46d606..922e470 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -221,7 +221,7 @@ EOF
    	northbridge="$(sed -n "/^[[:space:]]*select NORTHBRIDGE_/ s,^[[:space:]]*select NORTHBRIDGE_,,p" "$vendor_board_dir/Kconfig")"
    	northbridge_nice="$(echo "$northbridge"|sed 's,AMD_AGESA_FAMILY([0-9a-fA-F]*)(.*),AMD Family \1h\2 (AGESA),g;s,AMD_PI_(.*),AMD \1 (PI),g;s,INTEL_FSP_(.*),Intel® \1 (FSP),g;s,AMD_FAMILY([0-9a-fA-F]*),AMD Family \1h,g;s,AMD_AMDFAM([0-9a-fA-F]*),AMD Family \1h,g;s,_, ,g;s,INTEL,Intel®,g;')"

-		southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_([^ ]*).*$,\1,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_ISA_DMA_INIT)"
+		southbridge="$(sed -n "/[[:space:]]*select SOUTHBRIDGE_/ s,[[:space:]]*select SOUTHBRIDGE_([^ ]*).*$,\1,p" "$vendor_board_dir/Kconfig"|grep -v SKIP_|grep -v DISABLE_)"
    	southbridge_nice="$(echo "$southbridge"|sed 's,_, ,g;s,INTEL,Intel®,g')"
    	superio="$(sed -n "/[[:space:]]*select SUPERIO_/ s,[[:space:]]*select SUPERIO_,,p" "$vendor_board_dir/Kconfig"|grep -v OVERRIDE_FANCTL)"
    	superio_nice="$(echo "$superio"|sed 's,_, ,g;s,WINBOND,Winbond™,g;s,ITE,ITE™,g;s,SMSC,SMSC®,g;s,NUVOTON,Nuvoton ,g')"
@@ -242,7 +242,7 @@ EOF
    		AMD_SOCKET_S1G1)
    			cpu_nice="AMD Turion™ / X2  Sempron™";
    			socket_nice="Socket S1G1";;
-			AMD_SOCKET_G34)
+			AMD_SOCKET_G34|AMD_SOCKET_G34_NON_AGESA)
    			cpu_nice="AMD Opteron™ Magny-Cours/Interlagos";
    			socket_nice="Socket G34";;
    		AMD_SOCKET_C32|AMD_SOCKET_C32_NON_AGESA)