Denis Carikli (GNUtoo@no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10079
-gerrit
commit 3027fbd7a305fdc352a2de5f77791de298a35ac9 Author: Denis 'GNUtoo' Carikli GNUtoo@no-log.org Date: Sun May 3 14:01:27 2015 +0200
DO NOT MERGE: to-wiki.sh: remove useless ™ and ®
This is to shorten the names: The table is already big.
Change-Id: I78bc0c7e8419da62baf92264ef4294435512e3cd Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@no-log.org --- util/board_status/to-wiki/towiki.sh | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh index 3e80d44..338e895 100755 --- a/util/board_status/to-wiki/towiki.sh +++ b/util/board_status/to-wiki/towiki.sh @@ -219,65 +219,65 @@ EOF vendor_board_dir="$COREBOOT_DIR"/src/mainboard/"$venboard";
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_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;')" + northbridge_nice="$(echo "$northbridge"|sed 's,AMD_AGESA_FAMILY([0-9a-fA-F]*)(.*),AMD Family \1h\2 (AGESA),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_nice="$(echo "$southbridge"|sed 's,_, ,g;s,INTEL,Intel®,g')" + 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')" + superio_nice="$(echo "$superio"|sed 's,_, ,g;s,WINBOND,Winbond,g;s,ITE,ITE,g;s,SMSC,SMSC,g')" cpu="$(sed -n "/ select CPU_/ s, select CPU_,,p" "$vendor_board_dir/Kconfig"|grep -v "AMD_AGESA_FAMILY")" case "$cpu" in ALLWINNER_A10) cpu_nice="Allwinner A10" socket_nice="?";; AMD_GEODE_*) - cpu_nice="AMD Geode™ ${cpu#AMD_GEODE_}"; + cpu_nice="AMD Geode ${cpu#AMD_GEODE_}"; socket_nice="—";; AMD_SOCKET_754) - cpu_nice="AMD Sempron™ / Athlon™ 64 / Turion™ 64"; + cpu_nice="AMD Sempron / Athlon 64 / Turion 64"; socket_nice="Socket 754";; AMD_SOCKET_ASB2) - cpu_nice="AMD Turion™ II Neo/Athlon™ II Neo"; + cpu_nice="AMD Turion II Neo/Athlon II Neo"; socket_nice="ASB2 (BGA812)";; AMD_SOCKET_S1G1) - cpu_nice="AMD Turion™ / X2 Sempron™"; + cpu_nice="AMD Turion / X2 Sempron"; socket_nice="Socket S1G1";; AMD_SOCKET_G34) - cpu_nice="AMD Opteron™ Magny-Cours/Interlagos"; + cpu_nice="AMD Opteron Magny-Cours/Interlagos"; socket_nice="Socket G34";; AMD_SOCKET_C32|AMD_SOCKET_C32_NON_AGESA) - cpu_nice="AMD Opteron™ Magny-Cours/Interlagos"; + cpu_nice="AMD Opteron Magny-Cours/Interlagos"; socket_nice="Socket C32";; AMD_SOCKET_AM2) cpu_nice="?"; socket_nice="Socket AM2" ;; AMD_SOCKET_AM3) - cpu_nice="AMD Athlon™ 64 / FX / X2"; + cpu_nice="AMD Athlon 64 / FX / X2"; socket_nice="Socket AM3" ;; AMD_SOCKET_AM2R2) - cpu_nice="AMD Athlon™ 64 / X2 / FX, Sempron™"; + cpu_nice="AMD Athlon 64 / X2 / FX, Sempron"; socket_nice="Socket AM2+" ;; AMD_SOCKET_F) - cpu_nice="AMD Opteron™"; + cpu_nice="AMD Opteron"; socket_nice="Socket F" ;; AMD_SOCKET_F_1207) - cpu_nice="AMD Opteron™"; + cpu_nice="AMD Opteron"; socket_nice="Socket F 1207" ;; AMD_SOCKET_940) - cpu_nice="AMD Opteron™"; + cpu_nice="AMD Opteron"; socket_nice="Socket 940" ;; AMD_SOCKET_939) - cpu_nice="AMD Athlon™ 64 / FX / X2"; + cpu_nice="AMD Athlon 64 / FX / X2"; socket_nice="Socket 939" ;; AMD_SC520) - cpu_nice="AMD Élan™SC520"; + cpu_nice="AMD ÉlanSC520"; socket_nice="—";; ARMLTD_CORTEX_A9) cpu_nice="ARM Cortex A9"; @@ -295,34 +295,34 @@ EOF cpu_nice="TI AM335X"; socket_nice="?";; INTEL_SLOT_1) - cpu_nice="Intel® Pentium® II/III, Celeron®"; + cpu_nice="Intel Pentium II/III, Celeron"; socket_nice="Slot 1";; INTEL_SOCKET_MPGA604) - cpu_nice="Intel® Xeon®"; + cpu_nice="Intel Xeon"; socket_nice="Socket 604";; INTEL_SOCKET_MFCPGA478) - cpu_nice="Intel® Core™ 2 Duo Mobile, Core™ Duo/Solo, Celeron® M"; + cpu_nice="Intel Core 2 Duo Mobile, Core Duo/Solo, Celeron M"; socket_nice="Socket mPGA478";; INTEL_SOCKET_LGA771) - cpu_nice="Intel Xeon™ 5000 series"; + cpu_nice="Intel Xeon 5000 series"; socket_nice="Socket LGA771";; INTEL_SOCKET_PGA370) - cpu_nice="Intel® Pentium® III-800, Celeron®" + cpu_nice="Intel Pentium III-800, Celeron" socket_nice="Socket 370";; INTEL_SOCKET_MPGA479M) - cpu_nice="Intel® Mobile Celeron" + cpu_nice="Intel Mobile Celeron" socket_nice="Socket 479" ;; INTEL_SOCKET_RPGA989) case $northbridge in INTEL_HASWELL) - cpu_nice="Intel® 4th Gen (Haswell) Core i3/i5/i7" + cpu_nice="Intel 4th Gen (Haswell) Core i3/i5/i7" socket_nice="Socket RPGA989";; INTEL_IVYBRIDGE_NATIVE|INTEL_IVYBRIDGE|INTEL_FSP_IVYBRIDGE) - cpu_nice="Intel® 3rd Gen (Ivybridge) Core i3/i5/i7" + cpu_nice="Intel 3rd Gen (Ivybridge) Core i3/i5/i7" socket_nice="Socket RPGA989";; INTEL_SANDYBRIDGE) - cpu_nice="Intel® 2nd Gen (Sandybridge) Core i3/i5/i7" + cpu_nice="Intel 2nd Gen (Sandybridge) Core i3/i5/i7" socket_nice="Socket RPGA989";; *) cpu_nice="$northbridge" @@ -330,39 +330,39 @@ EOF esac ;; INTEL_SOCKET_441) - cpu_nice="Intel® Atom™ 230"; + cpu_nice="Intel Atom 230"; socket_nice="Socket 441";; INTEL_SOCKET_BGA956) case $northbridge in INTEL_GM45) - cpu_nice="Intel® Core 2 Duo (Penryn)" + cpu_nice="Intel Core 2 Duo (Penryn)" socket_nice="Socket P";; *) - cpu_nice="Intel® Pentium® M"; + cpu_nice="Intel Pentium M"; socket_nice="BGA956";; esac ;; INTEL_SOCKET_FC_PGA370) - cpu_nice="Intel® Pentium® III / Celeron®"; + cpu_nice="Intel Pentium III / Celeron"; socket_nice="Socket 370" ;; INTEL_EP80579) - cpu_nice="Intel® EP80579"; - socket_nice="Intel® EP80579" + cpu_nice="Intel EP80579"; + socket_nice="Intel EP80579" ;; INTEL_SOCKET_MFCBGA479) - cpu_nice="Intel® Mobile Celeron" + cpu_nice="Intel Mobile Celeron" socket_nice="Socket 479";; VIA_C3) - cpu_nice="VIA C3™"; + cpu_nice="VIA C3"; socket_nice="?" ;; VIA_C7) - cpu_nice="VIA C7™"; + cpu_nice="VIA C7"; socket_nice="?" ;; VIA_NANO) - cpu_nice="VIA Nano™"; + cpu_nice="VIA Nano"; socket_nice="?" ;; QEMU_X86) @@ -372,7 +372,7 @@ EOF "") case $northbridge in INTEL_NEHALEM) - cpu_nice="Intel® 1st Gen (Nehalem) Core i3/i5/i7" + cpu_nice="Intel 1st Gen (Nehalem) Core i3/i5/i7" socket_nice="?";; RDC_R8610) cpu_nice="RDC 8610"