Merge pull request #2269 from Raybuntu/wetekuboot

Fix image creation for WeTek Devices
This commit is contained in:
Alex Deryskyba 2017-11-28 17:28:33 +02:00 committed by GitHub
commit b6d4415a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 7 deletions

View File

@ -37,7 +37,7 @@
BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION="hardkernel"
UBOOT_VERSION="vendor"
# Configuration for u-boot
UBOOT_CONFIG="odroidc2_defconfig"

View File

@ -40,7 +40,7 @@
BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION=""
UBOOT_VERSION="vendor"
# Configuration for u-boot
UBOOT_CONFIG=""

View File

@ -37,7 +37,7 @@
BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION=""
UBOOT_VERSION="vendor"
# Configuration for u-boot
UBOOT_CONFIG=""

View File

@ -40,7 +40,7 @@
BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION=""
UBOOT_VERSION="vendor"
# Configuration for u-boot
UBOOT_CONFIG=""

View File

@ -37,7 +37,7 @@
BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION=""
UBOOT_VERSION="vendor"
# Configuration for u-boot
UBOOT_CONFIG=""

View File

@ -342,6 +342,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
RELEASE_DIR=$RELEASE_DIR \
UUID_STORAGE="$(uuidgen)" \
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
UBOOT_VERSION="$UBOOT_VERSION" \
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
SYSTEM_SIZE="$SYSTEM_SIZE" \
SYSTEM_PART_START="$SYSTEM_PART_START" \

View File

@ -225,11 +225,11 @@ EOF
mcopy -s $RELEASE_DIR/3rdparty/bootloader/overlays ::
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
echo "image: creating bootloader configuration..."
if [ "$PROJECT" != "Odroid_C2" ]; then
if [ "$UBOOT_VERSION" != "vendor" ]; then
DTB="$($SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM dtb)"
if [ -f "$RELEASE_DIR/3rdparty/bootloader/$DTB" ]; then