drholy/orangepi-build
1
0
Fork 0
mirror of https://github.com/DrHo1y/orangepi-build.git synced 2026-03-23 09:06:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

h618: update u-boot to v2024.01

Browse Source
This commit is contained in:
leeboby
2024-07-10 14:52:44 +08:00
parent 52624375b8
commit 7152e883b5
6 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/config/boards/orangepizero2w.conf vendored
View File

@@ -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"

2
external/config/boards/orangepizero3.conf vendored
View File

@@ -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"

2
external/config/sources/families/sun50iw9.conf vendored
View File

@@ -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

9
scripts/compilation.sh
View File

@@ -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

6
scripts/debootstrap.sh
View File

@@ -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")"

15
scripts/main.sh
View File

@@ -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=()