jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

u-boot: restore bootloader/firmware script

Browse Source 
Also move crust depend into options
This commit is contained in:
Jonas Karlman 2021-01-02 08:41:09 +00:00
parent 0af717039b
commit 11db31c238
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/tools/u-boot/package.mk
View File

@ -18,10 +18,6 @@ if [ -n "$UBOOT_FIRMWARE" ]; then
PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE" PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE"
fi fi
CRUST_CONFIG=""
[ -n "$UBOOT_SYSTEM" ] && CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
[ -n "$CRUST_CONFIG" ] && PKG_DEPENDS_TARGET+=" crust"
PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader"
@ -54,9 +50,8 @@ make_target() {
echo "see './scripts/uboot_helper' for more information" echo "see './scripts/uboot_helper' for more information"
else else
[ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0 [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
[ -n "$ATF_PLATFORM" ] && cp -av $(get_install_dir atf)/usr/share/bootloader/bl31.bin .
[ -n "$CRUST_CONFIG" ] && cp -av $(get_install_dir crust)/usr/share/bootloader/scp.bin .
DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make mrproper DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make mrproper
[ -n "$UBOOT_FIRMWARE" ] && find_file_path bootloader/firmware && . ${FOUND_PATH}
DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make $($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config) DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make $($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)
DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make $UBOOT_TARGET HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make $UBOOT_TARGET HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
fi fi

9
projects/Allwinner/bootloader/firmware Normal file
View File

@ -0,0 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
[ -n "$ATF_PLATFORM" ] && cp -av $(get_install_dir atf)/usr/share/bootloader/bl31.bin .
CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config)
[ -n "$CRUST_CONFIG" ] && cp -av $(get_install_dir crust)/usr/share/bootloader/scp.bin .
exit 0

2
projects/Allwinner/devices/A64/options
View File

@ -26,7 +26,7 @@
KERNEL_TARGET="Image" KERNEL_TARGET="Image"
# U-Boot firmware package(s) to use # U-Boot firmware package(s) to use
UBOOT_FIRMWARE="atf" UBOOT_FIRMWARE="atf crust"
# ATF platform # ATF platform
ATF_PLATFORM="sun50i_a64" ATF_PLATFORM="sun50i_a64"

3
projects/Allwinner/devices/H3/options
View File

@ -37,6 +37,9 @@
# Kernel target # Kernel target
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"
# U-Boot firmware package(s) to use
UBOOT_FIRMWARE="crust"
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="mesa" OPENGLES="mesa"

2
projects/Allwinner/devices/H5/options
View File

@ -26,7 +26,7 @@
KERNEL_TARGET="Image" KERNEL_TARGET="Image"
# U-Boot firmware package(s) to use # U-Boot firmware package(s) to use
UBOOT_FIRMWARE="atf" UBOOT_FIRMWARE="atf crust"
# ATF platform # ATF platform
ATF_PLATFORM="sun50i_a64" ATF_PLATFORM="sun50i_a64"

2
projects/Allwinner/devices/H6/options
View File

@ -26,7 +26,7 @@
KERNEL_TARGET="Image" KERNEL_TARGET="Image"
# U-Boot firmware package(s) to use # U-Boot firmware package(s) to use
UBOOT_FIRMWARE="atf" UBOOT_FIRMWARE="atf crust"
# ATF platform # ATF platform
ATF_PLATFORM="sun50i_h6" ATF_PLATFORM="sun50i_h6"