diff --git a/projects/Allwinner/options b/projects/Allwinner/options index f559f5616b..697ac4633f 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -5,9 +5,6 @@ # Bootloader to use (syslinux / u-boot / bcm2835-bootloader) BOOTLOADER="u-boot" - # u-boot version to use (default) - UBOOT_VERSION="default" - # Additional kernel make parameters (for example to specify the u-boot loadaddress) KERNEL_MAKE_EXTRACMD="dtbs" diff --git a/projects/Generic/options b/projects/Generic/options index 4b55bcbba5..675138dae4 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -18,9 +18,6 @@ # Bootloader to use (syslinux / u-boot) BOOTLOADER="syslinux" - # u-boot version to use (default) - UBOOT_VERSION="default" - # Kernel target KERNEL_TARGET="bzImage" diff --git a/projects/NXP/options b/projects/NXP/options index 2c2f7741d3..f6b4919c99 100644 --- a/projects/NXP/options +++ b/projects/NXP/options @@ -5,9 +5,6 @@ # Bootloader to use (syslinux / u-boot / bcm2835-bootloader) BOOTLOADER="u-boot" - # u-boot version to use (default) - UBOOT_VERSION="default" - # Additional kernel make parameters (for example to specify the u-boot loadaddress) KERNEL_MAKE_EXTRACMD="dtbs" diff --git a/projects/RPi/options b/projects/RPi/options index 62d6d019c1..0d401f5bab 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -40,9 +40,6 @@ # Bootloader to use (bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" - # u-boot version to use (default) - UBOOT_VERSION="default" - # Kernel target KERNEL_TARGET="zImage" diff --git a/scripts/image b/scripts/image index 72512df6aa..6ec306955a 100755 --- a/scripts/image +++ b/scripts/image @@ -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 [ -z "${UBOOT_SYSTEM}" ]; then ${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} >/dev/null - elif [ "${UBOOT_VERSION}" != "vendor" ]; then + else ${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} dtb >/dev/null fi fi @@ -50,7 +50,6 @@ function do_mkimage() { DISTRO_BOOTLABEL="${DISTRO_BOOTLABEL}" \ DISTRO_DISKLABEL="${DISTRO_DISKLABEL}" \ UBOOT_SYSTEM="${UBOOT_SYSTEM}" \ - UBOOT_VERSION="${UBOOT_VERSION}" \ EXTRA_CMDLINE="${EXTRA_CMDLINE}" \ SYSTEM_SIZE="${SYSTEM_SIZE}" \ SYSTEM_PART_START="${SYSTEM_PART_START}" \