diff --git a/firmware.sh b/firmware.sh index 40d47c6..da48185 100644 --- a/firmware.sh +++ b/firmware.sh @@ -41,6 +41,8 @@ elif [ "$isKbl" = true ]; then rwlegacy_file=$seabios_kbl elif [ "$isWhl" = true ]; then rwlegacy_file=$rwl_altfw_whl +elif [ "$isCmlBox" = true ]; then + rwlegacy_file=$rwl_altfw_cml else echo_red "Unknown or unsupported device (${device}); cannot update RW_LEGACY firmware." read -ep "Press enter to return to the main menu" diff --git a/functions.sh b/functions.sh index 9ff4a71..0a0fd5d 100644 --- a/functions.sh +++ b/functions.sh @@ -33,6 +33,7 @@ isGlk=false isStr=false isWhl=false isCml=false +isCmlBox=false isUnsupported=false firmwareType="" isStock=true @@ -73,7 +74,9 @@ glk=('ampton' 'apel' 'bluebird' 'bobba' 'bobba360' 'bobba' 'lick' 'meep' 'mimroc 'phaser' 'phaser360' 'phaser360s' 'sparky' 'sparky360') str=('aleena' 'barla' 'careena' 'grunt' 'kasumi' 'liara' 'treeya' 'treeya360') whl=('arcada' 'sarien') -cml=('akemi' 'hatch' 'helios' 'kindred' 'kohaku') +cml_boxes=('duffy' 'kaisa' 'noibat' 'puff' 'wyvern') +cml_books=('akemi' 'dragonair' 'drillion' 'dratini' 'hatch' 'helios' 'jinlon' 'kindred' 'kled' 'kohaku') +cml=($(printf "%s " "${cml_boxes[@]}" "${cml_books[@]}")) UEFI_ROMS=($(printf "%s " "${hsw_boxes[@]}" "${hsw_books[@]}" "${bdw_boxes[@]}" \ "${bdw_books[@]}" "${baytrail[@]}" "${snb_ivb[@]}" "${braswell[@]}" \ "${skylake[@]}" "${kbl[@]}" "${purism[@]}" "${str[@]}")) @@ -641,12 +644,13 @@ esac [[ "${str[@]}" =~ "$device" ]] && isStr=true [[ "${whl[@]}" =~ "$device" ]] && isWhl=true [[ "${cml[@]}" =~ "$device" ]] && isCml=true +[[ "${cml_boxes[@]}" =~ "$device" ]] && isCmlBox=true [[ "${shellballs[@]}" =~ "${boardName,,}" ]] && hasShellball=true [[ "${UEFI_ROMS[@]}" =~ "$device" ]] && hasUEFIoption=true [[ "$isHsw" = true || "$isBdw" = true || "$isByt" = true || "$isBsw" = true \ - || "$isSkl" = true || "$isSnbIvb" = "true" \ - || "$isApl" = "true" || "$isKbl" = "true" \ - || "$isStr" = true || "$isWhl" = true ]] || isUnsupported=true + || "$isSkl" = true || "$isSnbIvb" = "true" || "$isApl" = "true" \ + || "$isKbl" = "true" || "$isStr" = true || "$isWhl" = true \ + || "$isCmlBox" = true ]] || isUnsupported=true [[ "$isHswBox" = true || "$isBdwBox" = true || "${kbl_boxes[@]}" =~ "$device" \ || "$device" = "ninja" || "$device" = "buddy" ]] && hasLAN=true [[ "$isKbl" = true || "$isApl" = true || "$isGlk" = true ]] && hasCR50=true diff --git a/sources.sh b/sources.sh index e43fb66..c7013d7 100644 --- a/sources.sh +++ b/sources.sh @@ -3,7 +3,7 @@ #define these here for easy updating -script_date="[2020-10-17]" +script_date="[2020-11-26]" #where the stuff is util_source="https://www.mrchromebox.tech/files/util/" @@ -122,6 +122,7 @@ seabios_kbl="seabios-kbl-mrchromebox_20200223.bin" seabios_kbl_18="seabios-kbl_18-mrchromebox_20200223.bin" rwl_altfw_stoney="rwl_altfw_stoney-mrchromebox_20200107.bin" rwl_altfw_whl="rwl_altfw_whl-mrchromebox_20201017.bin" +rwl_altfw_cml="rwl_altfw_cml-mrchromebox_20201126.bin" #hsw/bdw headless VBIOS