Update for h618

This commit is contained in:
orangepi-xunlong
2023-07-03 18:09:33 +08:00
parent 18c94085ea
commit 35a14cacd1
8 changed files with 43 additions and 4 deletions

View File

@@ -112,6 +112,14 @@ compile_atf()
compile_uboot()
{
if [[ ${BOARDFAMILY} == "sun50iw9" && ${BRANCH} =~ legacy|current && $(dpkg --print-architecture) == arm64 ]]; then
local uboot_name=${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb
display_alert "Compile u-boot is not supported, only copy precompiled deb package" "$uboot_name" "info"
cp "${EXTER}/cache/debs/h618/$uboot_name" "${DEB_STORAGE}/u-boot/"
else
# not optimal, but extra cleaning before overlayfs_wrapper should keep sources directory clean
if [[ $CLEAN_LEVEL == *make* ]]; then
display_alert "Cleaning" "$BOOTSOURCEDIR" "info"
@@ -215,6 +223,15 @@ 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
@@ -315,6 +332,8 @@ compile_uboot()
rsync --remove-source-files -rq "$uboottempdir/${uboot_name}.deb" "${DEB_STORAGE}/u-boot/"
rm -rf "$uboottempdir"
fi
}
create_linux-source_package ()

View File

@@ -748,7 +748,11 @@ create_image()
IMAGE_TYPE=desktop
fi
local version="${BOARD^}_${REVISION}_${DISTRIBUTION,}_${RELEASE}_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"
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
[[ $ROOTFS_TYPE == nfs ]] && version=${version}_nfsboot
destimg=$DEST/images/${version}

View File

@@ -280,7 +280,20 @@ 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