add zero ,delete memory selection

This commit is contained in:
Qubot 2024-01-23 10:24:37 +08:00
parent b52d0556ef
commit a824205e63
3 changed files with 5 additions and 28 deletions

View File

@ -224,12 +224,7 @@ compile_uboot()
fi
if [[ ${BOARDFAMILY} == "sun50iw9" && ${BRANCH} == "next" ]]; then
if [[ ${MEM_TYPE} == "1500MB" ]]; then
sed -i 's/^.*CONFIG_DRAM_SUN50I_H616_TRIM_SIZE*/CONFIG_DRAM_SUN50I_H616_TRIM_SIZE=y/g' .config
else
sed -i 's/^.*CONFIG_DRAM_SUN50I_H616_TRIM_SIZE*/# CONFIG_DRAM_SUN50I_H616_TRIM_SIZE is not set/g' .config
fi
sed -i 's/^.*CONFIG_DRAM_SUN50I_H616_TRIM_SIZE*/# CONFIG_DRAM_SUN50I_H616_TRIM_SIZE is not set/g' .config
fi
[[ -f tools/logos/udoo.bmp ]] && cp "${EXTER}"/packages/blobs/splash/udoo.bmp tools/logos/udoo.bmp

View File

@ -800,11 +800,8 @@ create_image()
IMAGE_TYPE=desktop
fi
if [[ ${MEM_TYPE} == "1500MB" ]]; then
local version="${BOARD^}_${REVISION}_${DISTRIBUTION,}_${RELEASE}_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")_1.5gb"
else
local version="${BOARD^}_${REVISION}_${DISTRIBUTION,}_${RELEASE}_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"
fi
local version="${BOARD^}_${REVISION}_${DISTRIBUTION,}_${RELEASE}_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"
if [[ ${RELEASE} == "raspi" ]]; then
local version="${BOARD^}_${REVISION}_raspios_bullseye_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"

View File

@ -204,8 +204,8 @@ fi
if [[ -z $BOARD ]]; then
options+=("bpi-m4berry" "Allwinner H618 quad core 1GB/1.5GB/2GB/4GB RAM WiFi/BT GBE SPI")
options+=("bpi-m4zero" "TBA")
options+=("bpi-m4berry" "Allwinner H618 quad core 2GB RAM WiFi/BT GBE")
options+=("bpi-m4zero" "Allwinner H618 quad core 2GB RAM WiFi/BT 100M")
menustr="Please choose a Board."
BOARD=$(whiptail --title "${titlestr}" --backtitle "${backtitle}" \
@ -247,21 +247,6 @@ if [[ -z $BRANCH ]]; then
fi
if [[ -z ${MEM_TYPE} && ${BOARD} =~ bpi-m4zero|bpi-m4berry && ${BUILD_OPT} =~ u-boot|image && ${BRANCH} == next ]]; then
options+=("1500MB" "1.5 GB Memory")
options+=("Others" "1/2/4 GB Memory")
menustr="Please choose memory size for ${BOARD}."
MEM_TYPE=$(whiptail --title "${titlestr}" --backtitle "${backtitle}" \
--menu "${menustr}" "${TTY_Y}" "${TTY_X}" $((TTY_Y - 8)) \
--cancel-button Exit --ok-button Select "${options[@]}" \
3>&1 1>&2 2>&3)
unset options
[[ -z $MEM_TYPE ]] && exit_with_error "No option selected"
fi
if [[ $BUILD_OPT =~ rootfs|image && -z $RELEASE ]]; then
options=()