jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4103 from Kwiboo/mkimage-box

Browse Source 
scripts/mkimage: only configure extlinux for valid uboot_helper dtb
This commit is contained in:
Christian Hewitt 2020-01-31 10:55:35 +03:00 committed by GitHub
commit 44a6266465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/Allwinner/options
View File

@ -5,9 +5,6 @@
# Bootloader to use (syslinux / u-boot / bcm2835-bootloader) # Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
BOOTLOADER="u-boot" BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION="default"
# Additional kernel make parameters (for example to specify the u-boot loadaddress) # Additional kernel make parameters (for example to specify the u-boot loadaddress)
KERNEL_MAKE_EXTRACMD="dtbs" KERNEL_MAKE_EXTRACMD="dtbs"

2
projects/Amlogic/bootloader/mkimage
View File

@ -3,8 +3,6 @@
. config/options "" . config/options ""
DTB="$(${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb)"
mkimage_uboot(){ mkimage_uboot(){
echo "image: writing u-boot to $(basename $DISK)" echo "image: writing u-boot to $(basename $DISK)"
dd if="$INSTALL/usr/share/bootloader/u-boot.bin.sd.bin" of="$DISK" conv=fsync,notrunc bs=1 count=444 >"$SAVE_ERROR" 2>&1 || show_error dd if="$INSTALL/usr/share/bootloader/u-boot.bin.sd.bin" of="$DISK" conv=fsync,notrunc bs=1 count=444 >"$SAVE_ERROR" 2>&1 || show_error

3
projects/Generic/options
View File

@ -18,9 +18,6 @@
# Bootloader to use (syslinux / u-boot) # Bootloader to use (syslinux / u-boot)
BOOTLOADER="syslinux" BOOTLOADER="syslinux"
# u-boot version to use (default)
UBOOT_VERSION="default"
# Kernel target # Kernel target
KERNEL_TARGET="bzImage" KERNEL_TARGET="bzImage"

3
projects/NXP/options
View File

@ -5,9 +5,6 @@
# Bootloader to use (syslinux / u-boot / bcm2835-bootloader) # Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
BOOTLOADER="u-boot" BOOTLOADER="u-boot"
# u-boot version to use (default)
UBOOT_VERSION="default"
# Additional kernel make parameters (for example to specify the u-boot loadaddress) # Additional kernel make parameters (for example to specify the u-boot loadaddress)
KERNEL_MAKE_EXTRACMD="dtbs" KERNEL_MAKE_EXTRACMD="dtbs"

3
projects/RPi/options
View File

@ -40,9 +40,6 @@
# Bootloader to use (bcm2835-bootloader) # Bootloader to use (bcm2835-bootloader)
BOOTLOADER="bcm2835-bootloader" BOOTLOADER="bcm2835-bootloader"
# u-boot version to use (default)
UBOOT_VERSION="default"
# Kernel target # Kernel target
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"

3
scripts/image
View File

@ -14,7 +14,7 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACK
if [ "${BOOTLOADER}" = "u-boot" -a -n "${DEVICE}" ]; then if [ "${BOOTLOADER}" = "u-boot" -a -n "${DEVICE}" ]; then
if [ -z "${UBOOT_SYSTEM}" ]; then if [ -z "${UBOOT_SYSTEM}" ]; then
${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} >/dev/null ${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} >/dev/null
elif [ "${UBOOT_VERSION}" != "vendor" ]; then else
${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb >/dev/null ${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb >/dev/null
fi fi
fi fi
@ -50,7 +50,6 @@ function do_mkimage() {
DISTRO_BOOTLABEL="${DISTRO_BOOTLABEL}" \ DISTRO_BOOTLABEL="${DISTRO_BOOTLABEL}" \
DISTRO_DISKLABEL="${DISTRO_DISKLABEL}" \ DISTRO_DISKLABEL="${DISTRO_DISKLABEL}" \
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}" \

4
scripts/mkimage
View File

@ -216,8 +216,8 @@ elif [ "${BOOTLOADER}" = "u-boot" -a -n "${UBOOT_SYSTEM}" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
if [ "${UBOOT_SYSTEM}" != "box" ]; then DTB="$(${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb)"
DTB="$(${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb)" if [ -n "${DTB}" ]; then
if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${DTB}" ]; then if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${DTB}" ]; then
mcopy "${RELEASE_DIR}/3rdparty/bootloader/${DTB}" :: mcopy "${RELEASE_DIR}/3rdparty/bootloader/${DTB}" ::

4
scripts/uboot_helper
View File

@ -133,7 +133,7 @@ devices = \
'Amlogic': { 'Amlogic': {
'AMLGX': { 'AMLGX': {
'box': { 'box': {
'dtb': 'meson-gxl-s905x-p212.dtb', 'dtb': '',
'config': 'p212_defconfig' 'config': 'p212_defconfig'
}, },
'lepotato': { 'lepotato': {
@ -151,7 +151,7 @@ devices = \
}, },
'AMLG12': { 'AMLG12': {
'box': { 'box': {
'dtb': 'meson-g12a-x96max.dtb', 'dtb': '',
'config': 'p212_defconfig' 'config': 'p212_defconfig'
}, },
'odroid-n2': { 'odroid-n2': {