mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #2269 from Raybuntu/wetekuboot
Fix image creation for WeTek Devices
This commit is contained in:
commit
b6d4415a31
@ -37,7 +37,7 @@
|
|||||||
BOOTLOADER="u-boot"
|
BOOTLOADER="u-boot"
|
||||||
|
|
||||||
# u-boot version to use (default)
|
# u-boot version to use (default)
|
||||||
UBOOT_VERSION="hardkernel"
|
UBOOT_VERSION="vendor"
|
||||||
|
|
||||||
# Configuration for u-boot
|
# Configuration for u-boot
|
||||||
UBOOT_CONFIG="odroidc2_defconfig"
|
UBOOT_CONFIG="odroidc2_defconfig"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
BOOTLOADER="u-boot"
|
BOOTLOADER="u-boot"
|
||||||
|
|
||||||
# u-boot version to use (default)
|
# u-boot version to use (default)
|
||||||
UBOOT_VERSION=""
|
UBOOT_VERSION="vendor"
|
||||||
|
|
||||||
# Configuration for u-boot
|
# Configuration for u-boot
|
||||||
UBOOT_CONFIG=""
|
UBOOT_CONFIG=""
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
BOOTLOADER="u-boot"
|
BOOTLOADER="u-boot"
|
||||||
|
|
||||||
# u-boot version to use (default)
|
# u-boot version to use (default)
|
||||||
UBOOT_VERSION=""
|
UBOOT_VERSION="vendor"
|
||||||
|
|
||||||
# Configuration for u-boot
|
# Configuration for u-boot
|
||||||
UBOOT_CONFIG=""
|
UBOOT_CONFIG=""
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
BOOTLOADER="u-boot"
|
BOOTLOADER="u-boot"
|
||||||
|
|
||||||
# u-boot version to use (default)
|
# u-boot version to use (default)
|
||||||
UBOOT_VERSION=""
|
UBOOT_VERSION="vendor"
|
||||||
|
|
||||||
# Configuration for u-boot
|
# Configuration for u-boot
|
||||||
UBOOT_CONFIG=""
|
UBOOT_CONFIG=""
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
BOOTLOADER="u-boot"
|
BOOTLOADER="u-boot"
|
||||||
|
|
||||||
# u-boot version to use (default)
|
# u-boot version to use (default)
|
||||||
UBOOT_VERSION=""
|
UBOOT_VERSION="vendor"
|
||||||
|
|
||||||
# Configuration for u-boot
|
# Configuration for u-boot
|
||||||
UBOOT_CONFIG=""
|
UBOOT_CONFIG=""
|
||||||
|
@ -342,6 +342,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
|
|||||||
RELEASE_DIR=$RELEASE_DIR \
|
RELEASE_DIR=$RELEASE_DIR \
|
||||||
UUID_STORAGE="$(uuidgen)" \
|
UUID_STORAGE="$(uuidgen)" \
|
||||||
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
|
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
|
||||||
|
UBOOT_VERSION="$UBOOT_VERSION" \
|
||||||
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
|
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
|
||||||
SYSTEM_SIZE="$SYSTEM_SIZE" \
|
SYSTEM_SIZE="$SYSTEM_SIZE" \
|
||||||
SYSTEM_PART_START="$SYSTEM_PART_START" \
|
SYSTEM_PART_START="$SYSTEM_PART_START" \
|
||||||
|
@ -225,11 +225,11 @@ EOF
|
|||||||
mcopy -s $RELEASE_DIR/3rdparty/bootloader/overlays ::
|
mcopy -s $RELEASE_DIR/3rdparty/bootloader/overlays ::
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elif [ "$BOOTLOADER" = "u-boot" -a \( -n "$UBOOT_SYSTEM" -o "$PROJECT" = "Odroid_C2" \) ]; then
|
elif [ "$BOOTLOADER" = "u-boot" -a \( -n "$UBOOT_SYSTEM" -o "$UBOOT_VERSION" = "vendor" \) ]; then
|
||||||
# create bootloader configuration
|
# create bootloader configuration
|
||||||
echo "image: creating bootloader configuration..."
|
echo "image: creating bootloader configuration..."
|
||||||
|
|
||||||
if [ "$PROJECT" != "Odroid_C2" ]; then
|
if [ "$UBOOT_VERSION" != "vendor" ]; then
|
||||||
DTB="$($SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM dtb)"
|
DTB="$($SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM dtb)"
|
||||||
|
|
||||||
if [ -f "$RELEASE_DIR/3rdparty/bootloader/$DTB" ]; then
|
if [ -f "$RELEASE_DIR/3rdparty/bootloader/$DTB" ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user