add linux 5.4 and uboot v2018.05

This commit is contained in:
Qubot 2024-04-08 17:11:43 +08:00
parent b2910c1455
commit 01169eb120
3 changed files with 12 additions and 5 deletions

View File

@ -34,7 +34,7 @@ case $BRANCH in
OVERLAY_PREFIX='sun50i-h616'
KERNELBRANCH="branch:banana-pi-5.4-sun50iw9"
#BOOTBRANCH='branch:u-boot-2018'
[[ $BOARD =~ bpi-m4berry|bpi-m4zero ]] && BOOTBRANCH='branch:v2018.05-h618'
[[ $BOARD =~ bpi-m4berry|bpi-m4zero ]] && BOOTBRANCH='branch:v2018.05-sunxi'
KERNELPATCHDIR=${BOARDFAMILY}-${BRANCH}
UBOOT_TARGET_MAP=";;dts/${BOARD}-u-boot.dts boot0_sdcard.fex boot_package.fex"

View File

@ -416,12 +416,18 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish)$ ]]; then
DISTRIBUTION="Ubuntu"
elif [[ "$RELEASE" == jammy ]]; then
DISTRIBUTION="Ubuntu22.04"
elif [[ "$RELEASE" == bookworm ]]; then
DISTRIBUTION="Debian12"
elif [[ "$RELEASE" == bullseye ]]; then
DISTRIBUTION="Debian11"
elif [[ "$RELEASE" == raspi ]]; then
DISTRIBUTION="Bullseye"
else
DISTRIBUTION="Debian"
DISTRIBUTION="Others"
fi
CLI_CONFIG_PATH="${EXTER}/config/cli/${RELEASE}"

View File

@ -791,6 +791,7 @@ update_initramfs()
#
create_image()
{
CREATE_TIME=`date +%Y-%m-%d`
# stage: create file name
if [[ $SELECTED_CONFIGURATION == "cli_standard" ]]; then
IMAGE_TYPE=server
@ -800,11 +801,11 @@ create_image()
IMAGE_TYPE=desktop
fi
local version="${BOARD^}_${REVISION}_${DISTRIBUTION,}_${RELEASE}_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"
local version="${CREATE_TIME^}_${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")"
local version="{CREATE_TIME^}_${BOARD^}_${REVISION}_raspios_bullseye_${IMAGE_TYPE}"${DESKTOP_ENVIRONMENT:+_$DESKTOP_ENVIRONMENT}"_linux$(grab_version "$LINUXSOURCEDIR")"
fi
[[ $ROOTFS_TYPE == nfs ]] && version=${version}_nfsboot