Skip to content

Commit ec0776d

Browse files
MrChromeboxMrChromebox
committed
Improve HWID/board name handling for KBL boxes, YUNA
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
1 parent 62c985f commit ec0776d

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

‎firmware.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ function menu_fwupdate() {
10811081
echo -e "${NORMAL}\n ChromeOS Firmware Utility Script ${script_date} ${NORMAL}"
10821082
echo -e "${NORMAL} (c) Mr Chromebox <mrchromebox@gmail.com> ${NORMAL}"
10831083
echo -e "${MENU}******************************************************${NORMAL}"
1084-
echo -e "${MENU}**${NUMBER} Device: ${NORMAL}${deviceDesc} (${device^^})"
1084+
echo -e "${MENU}**${NUMBER} Device: ${NORMAL}${deviceDesc} (${boardName^^})"
10851085
echo -e "${MENU}**${NUMBER} CPU Type: ${NORMAL}$deviceCpuType"
10861086
echo -e "${MENU}**${NUMBER} Fw Type: ${NORMAL}$firmwareType"
10871087
if [ "$wpEnabled" = true ]; then

‎functions.sh

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ braswell=('<banon>' '<celes>' '<cyan>' '<edgar>' '<kefka>' '<reks>' '<relm>' '<
4747
skylake=('<asuka>' '<caroline>' '<cave>' '<chell>' '<lars>' '<lili>' '<sentry>');
4848
snb_ivb=('<butterfly>' '<link>' '<lumpy>' '<parrot>' '<stout>' '<stumpy>')
4949
apl=('<astronaut>' '<coral>' '<electro>' '<lava>' '<nasher>' '<pyro>' '<reef>' '<robo>' '<sand>' '<santa>' '<snappy>')
50-
kbl=('<eve>' '<kench>' '<sion>' '<soraka>' '<teemo>' '<wukong>')
50+
kbl=('<eve>' '<fizz>' '<kench>' '<sion>' '<soraka>' '<teemo>' '<wukong>')
5151

5252
LegacyROMs=($(printf "%s " "${hsw_boxes[@]}" "${bdw_boxes[@]}" "stumpy"));
5353
UEFI_ROMS=($(printf "%s " "${hsw_boxes[@]}" "${hsw_books[@]}" "${bdw_boxes[@]}" "${bdw_books[@]}" "${baytrail[@]}" "${snb_ivb[@]}" "${braswell[@]}"));
@@ -347,9 +347,10 @@ fi
347347
#get full device info
348348
if [[ "$isChromeOS" = true ]]; then
349349
_hwid=$(crossystem hwid | sed 's/ /_/g')
350-
device=$(crossystem hwid | tr '[:upper:]' '[:lower:]' | awk 'NR==1{print $1}')
350+
boardName=$(crossystem hwid | awk 'NR==1{print $1}')
351351
else
352-
_hwid=${device^^}
352+
_hwid=${device^^}
353+
boardName=${device^^}
353354
fi
354355

355356
case "${_hwid}" in
@@ -384,14 +385,15 @@ case "${_hwid}" in
384385
ENGUARDE*) _x='BYT|(multiple device matches)' ;;
385386
EVE*) _x='KBL|Google Pixelbook' ;;
386387
FALCO*) _x='HSW|HP Chromebook 14' ;;
388+
FIZZ) _x='KBL|TBD KBL Chromebox' ;;
387389
GANDOF*) _x='BDW|Toshiba Chromebook 2 (2015) CB30/CB35' ;;
388390
GLIMMER*) _x='BYT|Lenovo ThinkPad 11e/Yoga Chromebook' ;;
389391
GNAWTY*) _x='BYT|Acer Chromebook 11 (CB3-111/131,C730/C730E/C735)' ;;
390392
GUADO*) _x='BDW|ASUS Chromebox 2 / CN62' ;;
391393
HELI*) _x='BYT|Haier Chromebook G2' ;;
392394
IEC_MARIO) _x='PNV|Google Cr-48' ;;
393395
KEFKA*) _x='BSW|Dell Chromebook 11 (3180,3189)' ;;
394-
KENCH*) _x='KBL|HP Chromebox G2' ;;
396+
KENCH*) _x='KBL|HP Chromebox G2' ; device="fizz";;
395397
KIP*) _x='BYT|HP Chromebook 11 G3/G4, 14 G4' ;;
396398
LARS*) _x='SKL|Acer Chromebook 14 for Work' ;;
397399
LAVA*) _x='APL|Acer Chromebook Spin 11 CP311' ;;
@@ -435,7 +437,7 @@ case "${_hwid}" in
435437
SANTA*) _x='APL|Acer Chromebook 11 (CB311-8H)' ;;
436438
SENTRY*) _x='SKL|Lenovo Thinkpad 13 Chromebook' ;;
437439
SETZER*) _x='BSW|HP Chromebook 11 G5' ;;
438-
SION*) _x='KBL|Acer Chromebox CXI3' ;;
440+
SION*) _x='KBL|Acer Chromebox CXI3' ; device="fizz";;
439441
SNAPPY_???-A*) _x='APL|HP Chromebook x360 11 G1 EE' ; device="snappy";;
440442
SNAPPY_???-B*) _x='APL|HP Chromebook 11 G6 EE' device="snappy";;
441443
SNAPPY_???-C*) _x='APL|HP Chromebook 14 G5' device="snappy";;
@@ -446,26 +448,26 @@ case "${_hwid}" in
446448
STUMPY*) _x='SNB|Samsung Chromebox Series 3' ;;
447449
SUMO*) _x='BYT|AOpen Chromebase Commercial' ;;
448450
SWANKY*) _x='BYT|Toshiba Chromebook 2 (2014) CB30/CB35' ;;
449-
TEEMO*) _x='KBL|Asus Chromebox 3 / CN65' ;;
451+
TEEMO*) _x='KBL|Asus Chromebox 3 / CN65' ; device="fizz";;
450452
TERRA_???-???-???-A*) _x='BSW|ASUS Chromebook C202SA' ; device="terra";;
451453
TERRA_???-???-???-B*) _x='BSW|ASUS Chromebook C300SA/C301SA' ; device="terra";;
452-
TERRA*) _x='BSW|ASUS Chromebook C202SA, C300SA/C301SA' ;;
454+
TERRA*) _x='BSW|ASUS Chromebook C202SA, C300SA/C301SA' ; device="terra";;
453455
TIDUS*) _x='BDW|Lenovo ThinkCentre Chromebox' ;;
454456
TRICKY*) _x='HSW|Dell Chromebox 3010' ;;
455457
ULTIMA*) _x='BSW|Lenovo ThinkPad 11e/Yoga Chromebook (G3)' ;;
456458
WINKY*) _x='BYT|Samsung Chromebook 2 (XE500C12)' ;;
457-
WIZPIG_???-???-??A*) _x='BSW|CTL Chromebook J5' ; device="wizpig";;
458-
WIZPIG_???-???-??B*) _x='BSW|Edugear CMT Chromebook' ; device="wizpig";;
459-
WIZPIG_???-???-??C*) _x='BSW|Haier Convertible Chromebook 11 C' ; device="wizpig";;
460-
WIZPIG_???-???-??D*) _x='BSW|Viglen Chromebook 360' ; device="wizpig";;
461-
WIZPIG_???-???-??G*) _x='BSW|Prowise ProLine Chromebook' ; device="wizpig";;
462-
WIZPIG_???-???-??H*) _x='BSW|PCMerge Chromebook PCM-116T-432B' ; device="wizpig";;
463-
WIZPIG_???-???-??I*) _x='BSW|Multilaser M11C Chromebook' ; device="wizpig";;
464-
WIZPIG*) _x='BSW|(unknown WIZPIG)' ; device="wizpig";;
459+
WIZPIG_???-???-??A*) _x='BSW|CTL Chromebook J5' ;;
460+
WIZPIG_???-???-??B*) _x='BSW|Edugear CMT Chromebook' ;;
461+
WIZPIG_???-???-??C*) _x='BSW|Haier Convertible Chromebook 11 C' ;;
462+
WIZPIG_???-???-??D*) _x='BSW|Viglen Chromebook 360' ;;
463+
WIZPIG_???-???-??G*) _x='BSW|Prowise ProLine Chromebook' ;;
464+
WIZPIG_???-???-??H*) _x='BSW|PCMerge Chromebook PCM-116T-432B' ;;
465+
WIZPIG_???-???-??I*) _x='BSW|Multilaser M11C Chromebook' ;;
466+
WIZPIG*) _x='BSW|(unknown WIZPIG)' ;;
465467
WOLF*) _x='HSW|Dell Chromebook 11' ;;
466-
WUKONG_???-???-???-??D*) _x='KBL|CTL Chromebox CBx1' ;;
467-
WUKONG_???-???-???-??C*) _x='KBL|ViewSonic NMP660 Chromebox' ;;
468-
YUNA*) _x='BDW|Acer Chromebook 15 (CB5-571, C910)' ;;
468+
WUKONG_???-???-???-??C*) _x='KBL|ViewSonic NMP660 Chromebox' ; device="fizz";;
469+
WUKONG*) _x='KBL|CTL Chromebox CBx1' ; device="fizz";;
470+
YUNA*) _x='BDW|Acer Chromebook 15 (CB5-571, C910)' ; device="auron_yuna";;
469471
ZAKO*) _x='HSW|HP Chromebox CB1' ;;
470472
esac
471473

0 commit comments

Comments
 (0)