Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4753
-gerrit
commit da871795fa51941ffe35b9f8601d386e41aaa4ea
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Sun Jan 19 15:49:10 2014 +0100
boardstatus: Remove category retrieval from board_info.txt
Change-Id: I16795e0d8a2ced43d1b4493a34acd812ab6295aa
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
util/board_status/to-wiki/towiki.sh | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index 43ee3c1..46d99f0 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -146,22 +146,20 @@ EOF
fi
if [ -f "$vendor_board_dir/board_info.txt" ]; then
- cur_category="$(sed -n "/^[[:space:]]*Category:/ s,^[[:space:]]*Category:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
clone_of="$(sed -n "/^[[:space:]]*Clone of:/ s,^[[:space:]]*Clone of:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
else
- cur_category=
clone_of=
fi
- if [ -z "$cur_category" ]; then
- # eval board may be of other type as well. Prefer "eval"
- # desktop is pretty generic, keep it for last
- for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
- if grep -i BOARD_TYPE_"$candidate" "$vendor_board_dir/Kconfig" > /dev/null ; then
- cur_category="$candidate"
- break
- fi
- done
- fi
+
+ cur_category=
+ # eval board may be of other type as well. Prefer "eval"
+ # desktop is pretty generic, keep it for last
+ for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
+ if grep -i BOARD_TYPE_"$candidate" "$vendor_board_dir/Kconfig" > /dev/null ; then
+ cur_category="$candidate"
+ break
+ fi
+ done
if [ -z "$cur_category" ] && ! [ -z "$clone_of" ]; then
# eval board may be of other type as well. Prefer "eval"
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4753
-gerrit
commit 8e124b1741bea0074cf416c57a673ddf1b1b0a78
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Sun Jan 19 15:49:10 2014 +0100
boardstatus: Remove category retrieval from board_info.txt
Change-Id: I16795e0d8a2ced43d1b4493a34acd812ab6295aa
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
util/board_status/to-wiki/towiki.sh | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index 43ee3c1..c0ee1eb 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -146,22 +146,18 @@ EOF
fi
if [ -f "$vendor_board_dir/board_info.txt" ]; then
- cur_category="$(sed -n "/^[[:space:]]*Category:/ s,^[[:space:]]*Category:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
clone_of="$(sed -n "/^[[:space:]]*Clone of:/ s,^[[:space:]]*Clone of:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
else
- cur_category=
clone_of=
fi
- if [ -z "$cur_category" ]; then
- # eval board may be of other type as well. Prefer "eval"
- # desktop is pretty generic, keep it for last
- for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
- if grep -i BOARD_TYPE_"$candidate" "$vendor_board_dir/Kconfig" > /dev/null ; then
- cur_category="$candidate"
- break
- fi
- done
- fi
+ # eval board may be of other type as well. Prefer "eval"
+ # desktop is pretty generic, keep it for last
+ for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
+ if grep -i BOARD_TYPE_"$candidate" "$vendor_board_dir/Kconfig" > /dev/null ; then
+ cur_category="$candidate"
+ break
+ fi
+ done
if [ -z "$cur_category" ] && ! [ -z "$clone_of" ]; then
# eval board may be of other type as well. Prefer "eval"
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4751
-gerrit
commit 3a8ab4dc507ecd58b843b93d2ca097ec7b56c0f7
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Sun Jan 19 15:33:45 2014 +0100
boardstatus: Use BOARD_TYPE as fallback for categorizing.
Change-Id: If9b379656b3ac35f950ee3337e55439447e47cc7
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
util/board_status/to-wiki/towiki.sh | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index fd0dcf0..43ee3c1 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -147,8 +147,31 @@ EOF
if [ -f "$vendor_board_dir/board_info.txt" ]; then
cur_category="$(sed -n "/^[[:space:]]*Category:/ s,^[[:space:]]*Category:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
+ clone_of="$(sed -n "/^[[:space:]]*Clone of:/ s,^[[:space:]]*Clone of:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
else
cur_category=
+ clone_of=
+ fi
+ if [ -z "$cur_category" ]; then
+ # eval board may be of other type as well. Prefer "eval"
+ # desktop is pretty generic, keep it for last
+ for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
+ if grep -i BOARD_TYPE_"$candidate" "$vendor_board_dir/Kconfig" > /dev/null ; then
+ cur_category="$candidate"
+ break
+ fi
+ done
+ fi
+
+ if [ -z "$cur_category" ] && ! [ -z "$clone_of" ]; then
+ # eval board may be of other type as well. Prefer "eval"
+ # desktop is pretty generic, keep it for last
+ for candidate in "eval" server laptop half mini settop emulation sbc misc desktop; do
+ if grep -i BOARD_TYPE_"$candidate" "$COREBOOT_DIR"/src/mainboard/"$clone_of"/Kconfig > /dev/null ; then
+ cur_category="$candidate"
+ break
+ fi
+ done
fi
case "$cur_category" in
@@ -171,7 +194,6 @@ EOF
vendor_cooperation_score="$(sed -n "/^[[:space:]]*Vendor cooperation score:/ s,^[[:space:]]*Vendor cooperation score:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
vendor_cooperation_page="$(sed -n "/^[[:space:]]*Vendor cooperation page:/ s,^[[:space:]]*Vendor cooperation page:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
board_url="$(sed -n "/^[[:space:]]*Board URL:/ s,^[[:space:]]*Board URL:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
- clone_of="$(sed -n "/^[[:space:]]*Clone of:/ s,^[[:space:]]*Clone of:[[:space:]]*,,p" "$vendor_board_dir/board_info.txt")"
else
board_nice=
rom_package=
@@ -181,7 +203,6 @@ EOF
vendor_cooperation_score=
vendor_cooperation_page=
board_url=
- clone_of=
fi
if [ "$last_vendor" != "$vendor" ]; then
last_vendor="$vendor"
the following patch was just integrated into master:
commit f3af12a04c291dff30d93a481e8cde8d875db27a
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Wed Jan 15 22:07:52 2014 +0100
nvramcui: Trim values when setting.
Values get space-padded by curses and then enum search fails to match them.
Rtrim to compensate for curses.
Change-Id: Iecf095f21cfade9425eaa039b67625615eb80481
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
See http://review.coreboot.org/4692 for details.
-gerrit