diff --git a/external/config/boards/orangepizero2w.conf b/external/config/boards/orangepizero2w.conf index 8248a13..27bdc9b 100755 --- a/external/config/boards/orangepizero2w.conf +++ b/external/config/boards/orangepizero2w.conf @@ -12,4 +12,4 @@ DISTRIB_TYPE_LEGACY="buster" DISTRIB_TYPE_CURRENT="bullseye focal jammy" DISTRIB_TYPE_NEXT="bullseye bookworm jammy raspi" BOOT_LOGO="desktop" -REVISION="1.0.0" +REVISION="1.0.2" diff --git a/external/config/boards/orangepizero3.conf b/external/config/boards/orangepizero3.conf index d56a617..c301fcf 100755 --- a/external/config/boards/orangepizero3.conf +++ b/external/config/boards/orangepizero3.conf @@ -12,4 +12,4 @@ DISTRIB_TYPE_LEGACY="buster" DISTRIB_TYPE_CURRENT="bullseye focal jammy" DISTRIB_TYPE_NEXT="bullseye bookworm jammy" BOOT_LOGO="desktop" -REVISION="1.0.2" +REVISION="1.0.4" diff --git a/external/config/sources/families/sun50iw9.conf b/external/config/sources/families/sun50iw9.conf index a6bc151..3dec4d2 100644 --- a/external/config/sources/families/sun50iw9.conf +++ b/external/config/sources/families/sun50iw9.conf @@ -62,7 +62,7 @@ case $BRANCH in [[ $BOARD =~ orangepizero2 ]] && BOOTBRANCH='branch:v2021.10-sunxi' BOOTSCRIPT='boot-sun50iw9-next.cmd:boot.cmd' if [[ $BOARD =~ orangepizero3|orangepir1b|orangepizero2w ]]; then - BOOTBRANCH='branch:v2021.07-sunxi' + BOOTBRANCH='branch:v2024.01' fi ## For Linux5.16.y diff --git a/scripts/compilation.sh b/scripts/compilation.sh index 541beba..b1420a7 100755 --- a/scripts/compilation.sh +++ b/scripts/compilation.sh @@ -223,15 +223,6 @@ 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 - fi - [[ -f tools/logos/udoo.bmp ]] && cp "${EXTER}"/packages/blobs/splash/udoo.bmp tools/logos/udoo.bmp touch .scmversion diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh index ce1f3b9..170776a 100755 --- a/scripts/debootstrap.sh +++ b/scripts/debootstrap.sh @@ -800,11 +800,7 @@ 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")" diff --git a/scripts/main.sh b/scripts/main.sh index aaf63aa..7391e78 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -287,21 +287,6 @@ if [[ -z $BRANCH ]]; then fi -if [[ -z ${MEM_TYPE} && ${BOARD} =~ orangepizero3|orangepir1b|orangepizero2w && ${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=()