Merge ~waveform/ubuntu/+source/flash-kernel:rpi-boot into ubuntu/+source/flash-kernel:ubuntu/devel

[Dave Jones]

[Dave Jones (waveform)]

Built packages available from https://launchpad.net/~waveform/+archive/ubuntu/fk (the later version number in the PPA is because I had a couple of revisions fixing up things; the commit to merge is the squashed rebase).

[Łukasz Zemczak (sil2100)]

This looks good! Let me sponsor it.

review: Approve

Unmerged commits

87c294c... by Dave Jones on 2019-06-11

Use 1 bootscript for all RPis

Remove the special-case of the RPi2 uboot.env script, and use a single
script that will support uncompressed, self-extracting, or externally
compressed kernels on both armhf and arm64.

4e29f52... by Dave Jones on 2019-05-16

Import patches-unapplied version 3.98ubuntu1 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: bfb8d10c74b23e912d7d760ac9f1e8eb9b5beb35

New changelog entries:
  * Merge with Debian unstable. Remaining changes:
    - add "quiet splash" as default options to omap bootscr
    - re-add support for the FLASH_KERNEL_SKIP env variable, so the image
      build infrastructure has a chance to skip the automated flash-kernel run
      during image builds.
    - Also check for FLASH_KERNEL_SKIP to avoid setting up the root parameter
      in case flash-kernel will not be used
    - make the package postinst respect FLASH_KERNEL_SKIP
    - make sure that if we dont want to override the bootloader root=
      option by setting "Bootloader-sets-root: yes", we actually dont do it
    - use umount -l in the cleanup function, else we fail while finishing up
      with the script
    - add a diversion for update-initramfs to live-installers
      post-base-installer.d to avoid update-initramfs runs before flash-kernel
      is configured
    - add a check for the diverted update-initramfs to flash-kernel-installer,
      so it gets reverted before we try to call update-initramfs
    - make post-base-installer.d/01flash-kernel-diversion actually an
      executable shell script
    - enable UUID detection of the currently used root device
    - if uEnv.txt is defined in the db for an arch, generate preEnv.txt from
      UBOOT_DEFAULTS and UUID detection data
    - make sure blkid only gives us the UUID and not any other metadata like
      labels or filesystem
    - hide the boot device from udisk's automounting after installation on all
      systems using uEnv.txt to configure u-boot
    - make sure we only rename the bootrom partition so udisks hides it,
      when using mkdosfs for setting the label like we did in jasper (where
      we cached the contents before doing this) MLO and u-boot.bin are gone
    - make sure that /dev is bind mounted in /target when running
      update-initramfs from flash-kernel-installer, else we do not find the
      boot media (this is only a workaround, actual fixing of the netinst
      environment is needed to fix this properly)
    - drop the "|| true" from the initramfs building code, if we fail here we
      actually dont want to attempt to flash that
    - Do not run flash-kernel inside an LXC container
    - Call systemd-detect-virt instead of the Ubuntu specific
      running-in-container wrapper.
    - Add generic-lpae to the XB-Subarchitecture list in debian/control
    - debian/flash-kernel-installer.isinstallable: add arm*/generic-lpae
    - Fix typo in dtb_kver test that made it break all non-dtb platforms.
    - Apply patch from Paolo Pisati for appended DTB support
    - Filter the selection of 'latest' usable kernel through the whitelist.
    - Do not fail if there are no specified Kernel-Flavors for this machine.
    - Allow us to find DTBs in both the old flat layout and the new vendor
      subdirectory layout, so we keep backward compatibility
    - Add support for installing dtb files in boot partition
    - Add support for gzip-compressed kernel images
    - db/all.db: add dummy entries as noops when running on VMs
    - Add support for Calxeda Highbank
      - Add support for Calxeda Highbank (with bootscr.highbank different from
        Debian's version)
      - bootscr.highbank: allow more space to load larger kernels
    - Add support for Marvell ArmadaXP
      - Re-add support for Marvell ArmadaXP
      - Fix armadaxp kernel load address
    - Add support for OMAP3 and OMAP4 boards
      - add DB entry for "OMAP3 Beagle Board" (funnily thats missing)
      - add Panda to the list of supported board in the README file
      - debian/control: Re-add omap and omap4 to the flash-kernel-installer
        XB-Subarchitecture field. These appear to have been lost somewhere
        along the way.
      - Also add omap and omap4 to flash-kernel-installer.isinstallable.
      - switch omap3 and omap4 to uEnv.txt/preEnv.txt (the former holds all
        active boot commands, the latter holds the kernel commandline only)
      - switch omap3 and omap4 from Bootloader-sets-root: no to yes, we now
        generate a root=UUID= line on the fly for arches using
        uEnv.txt/preEnv.txt
      - introduce bootscript/uEnvtxt.omap
      - do not move the original uEnvtxt.omap to the target, use a copy
        instead
    - Add support for grouper boards
      - add support for the grouper architecture
    - Add support for Samsung Exynos 5440 platforms
      - Add support for EXYNOS5440-based platforms
    - Add support for HP ProLiant m400 and m800 cartridges
      - Added support for HP ProLiant m800 Server Cartridge
      - Add support for HP ProLiant m800 cartridges
      - Set required boot arguments for HP ProLiant m800 cartridges
      - Add support for HP ProLiant m400 Server Cartridges
      - HP Moonshot Cartridges: Use $baudrate from u-boot environment as
        serial console speed
      - HP Moonshot Cartridges: Enable hardware flow control as required by
        the HP moonshot chassis
      - Enable U-Boot environment support for X-Gene platforms
      - Use filesystem agnostic "load" command instead of assuming ext4
      - Add a bootscript specific to X-Gene Mustang boards since they need to
        pull their dtb from the OS.
    - Add support for Wandboard Quad
      - Wandboard: Use /dev/disk/by-path/platform-2198000.usdhc-part1
        instead of the hardcoded mmcblk1p1, this should make things work on
        boards with just a single microSD card in.
      - Add basic support for WandBoard Quad.
    - Add support for Raspberry Pi 2, 3, 3+, CM3, and CM3+
      - Extend support for the RPi2 to actually install the kernel/initramfs
        on the fat partition, and provide a uboot boot script based on the one
        used for Snappy images.
      - Extend functions to support generating uboot.env images, as an
        alternative to boot.scr and uEnv.txt, and use this for RPi2 as well.
      - Adjust the uboot.env.rpi2 to use the one Paolo Pisati has tested,
        instead of trying to base on the Snappy one, which is failing to boot.
      - Adjust the size of uboot.env based on empirical results on the rpi2.
      - Adjust rpi2/3 dtb address from 0x100 to 0x02000000
      - Support Raspberry Pi 2 Model B Rev 1.2
      - Add Raspberry Pi 3 Model B+ to the db.
      - Modify the Pi 3 boot.scr addresses to fit a bigger kernel, prepare
        separate versions for armhf and arm64.
      - Add Raspberry Pi Compute Module 3 and 3+ to the db.
    - Add support for Nexus 4 (Mako)
      - Enabling support for mako (Nexus 4)
    - Add support for QCT APQ8064 CDP
      - Add support for QCT APQ8064 CDP; thanks Alfonso Sanchez-Beato.
    - Migrate default /etc/default/flash-kernel content to new default without
      asking via debconf
    - Update tests with new fields: Android-Skip-Initrd, Bootloader-sets-root,
      DTB-Kernel-Version
    - Look for dtbs in /lib/firmware/$kvers/device-tree/ in find_dtb_file()
    - Add Bootloader-sets-root to Toshiba AC100 [previously undocumented]
    - Install all potential uboot scripts [previously undocumented]
    - initramfs-hook/flash-kernel: Pretend we're running from the kernel's
      postinst to activate the same guard against mismatched kernel versions.
    - flash-kernel/functions: Stop attempting to install the latest kernel
      if we request an older version, just refuse to act without --force.
  * Dropped changes merged in Debian:
    - Remove commit-tmp cruft [previously undocumented]
  * Dropped obsolete changes:
    - Add archs (why?) and duplicate generic (why?!) in d/control [previously
      undocumented]

bfb8d10... by Holger Wansing on 2019-04-04

Import patches-unapplied version 3.98 to debian/sid

Imported using git-ubuntu import.

Changelog parent: aed362d004d66d498ab7db1eee8f791877f32994

New changelog entries:
  [ Vagrant Cascadian ]
  * Add machine db entry for Rock64 (Closes: #906696). Thanks to Josua
    Mayer.
  * Add machine db entry for Banana Pi M2 Berry (Closes: #923483). Thanks
    to Lucas Nussbaum.
  [ Cyril Brulebois ]
  * Drop support for arm*/ixp4xx and arm*/iop32x; support for those
    platforms was removed from the Linux kernel and therefore d-i.
  [ Heinrich Schuchardt ]
  * Provide db entry for the Pine A64 LTS board (Closes: #923655).
  [ Jonas Smedegaard ]
  * Add an entry for Olimex A64 Teres-I (Closes: #926071).
  [ Vagrant Cascadian ]
  * Add entries for Raspberry Pi 1, Pi Zero and Pi 3 Compute Module
    (Closes: #921518). Thanks to Alexandre GRIVEAUX.
  [ Updated translations ]
  * Indonesian (id.po) by Muhammad Rifqi Priyo Susanto
  * Vietnamese (vi.po) by Trần Ngọc Quân

aed362d... by Karsten Merker <email address hidden> on 2019-01-04

Import patches-unapplied version 3.97 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ef8eb6d85907489e8f339730fd9051933213a819

New changelog entries:
  [ Vagrant Cascadian ]
  * Add machine db entry for Odroid HC1 (Closes: #916980). Thanks to
    Benjamin Drung.
  [ Karsten Merker ]
  * Apply a patch from Hajo Noerenberg adding a machine db entry for
    the Seagate Blackarmor NAS220 (Closes: #918193).

ef8eb6d... by Karsten Merker <email address hidden> on 2018-11-18

Import patches-unapplied version 3.96 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 59c26ef64541b0596a234ecb1fe88ba00e3fd13f

New changelog entries:
  [ Helmut Grohne ]
  * Support DEB_BUILD_OPTIONS=nocheck (Closes: #908355)
  [ Karsten Merker ]
  * Add a machine db entry for the Helios-4 NAS system,
    provided by Josua Mayer. (Closes: #914016)

59c26ef... by Karsten Merker <email address hidden> on 2018-08-19

Import patches-unapplied version 3.95 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3ae7f0db7c3af8a33360beecbc2d5d937998d819

New changelog entries:
  [ Heinrich Schuchardt ]
  * Add a machine db entry for the Rockchip RK3288 Tinker Board.
    (Closes: #895934)
  [ Cyril Brulebois ]
  * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
  [ Heinrich Schuchardt ]
  * Update Firefly-RK3399 Board (Closes: #899091).
  * Rockchip RK3399 Evaluation Board (Closes: #899090).
  * Update entry for Marvell 8040 MACCHIATOBin (Closes: #899092):
    - Add new Machine name.
    - Update DTB path.
  * Update Pine64+ (Closes: #899093).
  * Update Raspberry Pi 3 Model B (Closes: #899096).
  [ Josua Mayer ]
  * Clearfog Pro: correct DTB name (Closes: #902432).
  * Add missing entries for HummingBoard variants (Closes: #905962).
  [ Vagrant Cascadian ]
  * Add entries for additional Cubox-i models:
    - SolidRun Cubox-i Dual/Quad (1.5som)
    - SolidRun Cubox-i Dual/Quad (1.5som+emmc)
  * Add entry for Raspberry PI 3 B+ (Closes: #905002).
    Thanks to Johannes Keyser.

3ae7f0d... by Christian Perrier on 2018-04-14

Import patches-unapplied version 3.94 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5dbb740572bc498da768c8cb26ec06d4b91f992a

New changelog entries:
  [ Vagrant Cascadian ]
  * Fix typos in imx-base boot script.
  [ Uwe Kleine-König ]
  * Add Boot-DTB-Path-Version similar to Boot-Kernel-Path-Version.

5dbb740... by Christian Perrier on 2018-03-10

Import patches-unapplied version 3.93 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5216bef5ae8388f98379648a6233abca9e048d91

New changelog entries:
  [ Vagrant Cascadian ]
  * Add support for Theobroma Systems RK3399-Q7 SoM.

5216bef... by Christian Perrier on 2018-02-14

Import patches-unapplied version 3.92 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3535f4c4b64d201039492b0bebf2f1363671089d

New changelog entries:
  [ Updated translations ]
  * Hebrew (he.po) by Yaron Shahrabani

3535f4c... by Christian Perrier on 2018-02-01

Import patches-unapplied version 3.91 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3f073eaa9a74f0f680c712364e802fe784c429fb

New changelog entries:
  [ Vagrant Cascadian ]
  * Make ubootenv.d work on CuBox-i. Thanks to Rainer Dorsch.
  * Do not install flash-kernel.in.
  [ Heinrich Schuchardt ]
  * flash-kernel: Provide hook to start EFI application (Closes: #873390).
  [ Vagrant Cascadian ]
  * Add support for SolidRun Clearfog Boards (Closes: #839595). Thanks to
    Christoph Egger and Joshua Mayer.
  * Add support for SolidRun CuBox (dove) (Closes: #876773). Thanks to
    Josua Mayer.
  * Fix when no Kernel-Flavors are defined (Closes: #887803).
  * Add Boot-Kernel-Path-Version and Boot-Initrd-Path-Version to be used
    to append the version to the generated kernel/initrd images.
  * debian/control: Set Rules-Requires-Root: no.
  [ Heinrich Schuchardt ]
  * flash-kernel: support relative paths for DTB-Id (Closes: #860304).
  [ Vagrant Cascadian ]
  * Add compatibility symlink to dtb in vendor sub-directory.
  * Add support for root device specified by PARTLABEL.
  [ Andre Heider ]
  * Add support for multiple scripts sources
  [ Vagrant Cascadian ]
  * Convert Wandboard and CuBox-i to use a shared imx-base plus
    uboot-generic boot script.
  * Adjust sunxi boot script to prefer prefix variable if defined to set
    the locations to search for boot files.
  [ Updated translations ]
  * Tajik (tg.po) by Victor Ibragimov

diff --git a/bootscript/all/bootscr.rpi b/bootscript/all/bootscr.rpi
 new file mode 100644
index 0000000..03986e6
--- /dev/null
+++ b/bootscript/all/bootscr.rpi
@@ -0,0 +1,52 @@
+# Ubuntu Classic RPi U-Boot script (for armhf and arm64)
+
+# These values *must* be set in the global environment, not the hush
+# interpreter's environment (they're already in the global environment
+# which oddly takes precedence over hush vars)
+setenv fdt_addr_r 0x03000000
+setenv kernel_addr_r 0x01000000
+setenv ramdisk_addr_r 0x03100000
+
+# Load the flattened device tree and extract the bootargs from the /chosen
+# path into the ${bootargs} variable
+fdt addr ${fdt_addr_r}
+fdt get value bootargs /chosen bootargs
+
+# Store the gzip header (1f 8b) in the kernel area for comparison to the
+# header of the image we load. Load "vmlinuz" into the portion of memory for
+# the RAM disk (because we want to uncompress to the kernel area if it's
+# compressed) and compare the word at the start
+mw.w ${kernel_addr_r} 0x8b1f  # little endian
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} vmlinuz
+kernel_size=${filesize}
+if cmp.w ${kernel_addr_r} ${ramdisk_addr_r} 1; then
+    # It's a gzip compressed image (NOTE: *not* a self-extracting gzip
+    # compressed kernel, just a kernel image that has been gzip'd). This is
+    # how all kernels *should* be shipped on Ubuntu for RPi in future,
+    # regardless of architecture.
+    #
+    # Decompress the image into the kernel area, and set us up to use booti
+    # to launch it
+    echo "Decompressing kernel..."
+    unzip ${ramdisk_addr_r} ${kernel_addr_r}
+    kernel_size=${filesize}
+    try_boot="booti"
+else
+    # The kernel *might* be a self-extracting image (former case on armhf) or
+    # an uncompressed image (former case on arm64). Copy the data into the
+    # kernel area then attempt to launch first with "bootz" (will fail on arm64
+    # with an unknown command, on armhf with compressed image will succeed)
+    # then "booti" (will succeed with uncompressed image)
+    echo "Copying kernel..."
+    cp.b ${ramdisk_addr_r} ${kernel_addr_r} ${kernel_size}
+    try_boot="bootz booti"
+fi
+
+# Load the initramfs into the initramfs area, storing the filesize in the
+# variable expected by $boot_ubuntu
+load mmc 0:1 ${ramdisk_addr_r} initrd.img
+ramdisk_size=${filesize}
+for cmd in ${try_boot}; do
+    echo "Trying boot command: ${cmd}..."
+    ${cmd} ${kernel_addr_r} ${ramdisk_addr_r}:${ramdisk_size} ${fdt_addr_r}
+done
diff --git a/bootscript/all/uboot.env.rpi2 b/bootscript/all/uboot.env.rpi2
 deleted file mode 100644
index 73deb6a..0000000
--- a/bootscript/all/uboot.env.rpi2
+++ /dev/null
@@ -1,8 +0,0 @@
-bootcmd=run boot_ubuntu
-boot_ubuntu=run setup; run loadkernel; run loadinitrd; bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r}
-setup=fdt addr ${fdt_addr_r}; fdt get value bootargs /chosen bootargs
-loadkernel=fatload mmc 0:1 ${kernel_addr_r} vmlinuz
-loadinitrd=fatload mmc 0:1 ${ramdisk_addr_r} initrd.img; setenv initrdsize $filesize
-fdt_addr_r=0x02000000
-kernel_addr_r=0x01000000
-ramdisk_addr_r=0x02100000
diff --git a/bootscript/arm64/bootscr.rpi3 b/bootscript/arm64/bootscr.rpi3
 deleted file mode 100644
index 8d24fc6..0000000
--- a/bootscript/arm64/bootscr.rpi3
+++ /dev/null
@@ -1,9 +0,0 @@
-setenv fdt_addr_r 0x03000000
-fdt addr ${fdt_addr_r}
-fdt get value bootargs /chosen bootargs
-setenv kernel_addr_r 0x01000000
-setenv ramdisk_addr_r 0x03100000
-fatload mmc 0:1 ${kernel_addr_r} vmlinuz
-fatload mmc 0:1 ${ramdisk_addr_r} initrd.img
-setenv initrdsize $filesize
-booti ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r}
diff --git a/bootscript/armhf/bootscr.rpi3 b/bootscript/armhf/bootscr.rpi3
 deleted file mode 100644
index a60edda..0000000
--- a/bootscript/armhf/bootscr.rpi3
+++ /dev/null
@@ -1,9 +0,0 @@
-setenv fdt_addr_r 0x03000000
-fdt addr ${fdt_addr_r}
-fdt get value bootargs /chosen bootargs
-setenv kernel_addr_r 0x01000000
-setenv ramdisk_addr_r 0x03100000
-fatload mmc 0:1 ${kernel_addr_r} vmlinuz
-fatload mmc 0:1 ${ramdisk_addr_r} initrd.img
-setenv initrdsize $filesize
-bootz ${kernel_addr_r} ${ramdisk_addr_r}:${initrdsize} ${fdt_addr_r}
diff --git a/db/all.db b/db/all.db
index 6d33391..7ccdd5a 100644
--- a/db/all.db
+++ b/db/all.db
@@ -1608,12 +1608,12 @@ Machine: Raspberry Pi 2 Model B
 Machine: Raspberry Pi 2 Model B Rev 1.1
 Machine: Raspberry Pi 2 Model B Rev 1.2
 DTB-Id: bcm2709-rpi-2-b.dtb
-U-Boot-Script-Name: uboot.env.rpi2
+U-Boot-Script-Name: bootscr.rpi
 Required-Packages: u-boot-tools
 Boot-DTB-Path: /boot/firmware/bcm2709-rpi-2-b.dtb
 Boot-Kernel-Path: /boot/firmware/vmlinuz
 Boot-Initrd-Path: /boot/firmware/initrd.img
-Boot-Script-Path: /boot/firmware/uboot.env
+Boot-Script-Path: /boot/firmware/boot.scr
 # XXX we should copy the entire overlay dtbs dir too
 
 # Raspberry Pi 3 (BCM2710)
@@ -1621,7 +1621,7 @@ Machine: BCM2710
 Machine: Raspberry Pi 3 Model B
 Machine: Raspberry Pi 3 Model B Rev 1.2
 DTB-Id: bcm2710-rpi-3-b.dtb
-U-Boot-Script-Name: bootscr.rpi3
+U-Boot-Script-Name: bootscr.rpi
 Required-Packages: u-boot-tools
 Boot-DTB-Path: /boot/firmware/bcm2710-rpi-3-b.dtb
 Boot-Kernel-Path: /boot/firmware/vmlinuz
@@ -1634,7 +1634,7 @@ Machine: Raspberry Pi 3 Model B+
 Machine: Raspberry Pi 3 Model B Plus
 Machine: Raspberry Pi 3 Model B Plus Rev 1.3
 DTB-Id: bcm2710-rpi-3-b-plus.dtb
-U-Boot-Script-Name: bootscr.rpi3
+U-Boot-Script-Name: bootscr.rpi
 Required-Packages: u-boot-tools
 Boot-DTB-Path: /boot/firmware/bcm2710-rpi-3-b-plus.dtb
 Boot-Kernel-Path: /boot/firmware/vmlinuz
@@ -1646,7 +1646,7 @@ Boot-Script-Path: /boot/firmware/boot.scr
 Machine: Raspberry Pi Compute Module 3 Rev 1.0
 Machine: Raspberry Pi Compute Module 3 Plus Rev 1.0
 DTB-Id: bcm2710-rpi-cm3.dtb
-U-Boot-Script-Name: bootscr.rpi3
+U-Boot-Script-Name: bootscr.rpi
 Required-Packages: u-boot-tools
 Boot-DTB-Path: /boot/firmware/bcm2710-rpi-cm3.dtb
 Boot-Kernel-Path: /boot/firmware/vmlinuz
diff --git a/debian/changelog b/debian/changelog
index 507f35d..b342968 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+flash-kernel (3.98ubuntu2) eoan; urgency=medium
+
+  * Merge all RPi bootscripts into one unified bootscript which handles all Pi
+    architectures
+  * Remove uboot.env case which was only used for RPi2 (now supported by the
+    unified RPi bootscript)
+
+ -- Dave Jones <[e-mail]>  Tue, 11 Jun 2019 13:43:21 +0000
+
 flash-kernel (3.98ubuntu1) eoan; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/functions b/functions
index f1894ad..b34d3ac 100644
--- a/functions
+++ b/functions
@@ -525,19 +525,6 @@ mkimage_multi() {
 	echo "done." >&2
 }
 
-mkimage_env() {
-	local esize="$1"
-	local edata="$2"
-	local escript="$3"
-
-	# FIXME: should leverage gen_ubootenv
-	printf "Generating u-boot environment image... " >&2
-	mkenvimage -r -s "$esize" -o "$escript" "$edata"
-	echo "done." >&2
-
-
-}
-
 # Return a nonempty string *unless* NO_CREATE_DOT_BAK_FILES is set.
 get_dot_bak_preference() {
 	. /etc/default/flash-kernel
@@ -878,9 +865,6 @@ uiaddr="$(get_machine_field "$machine" "U-Boot-Initrd-Address")" || :
 umaddr="$(get_machine_field "$machine" "U-Boot-Multi-Address")" || :
 usaddr="$(get_machine_field "$machine" "U-Boot-Script-Address")" || :
 usname="$(get_machine_field "$machine" "U-Boot-Script-Name")" || :
-# FIXME: currently hard coded because only RPi2 uses this; let's not define
-# new fields without consulting with Debian.
-ussize=16384
 boot_device="$(get_machine_field "$machine" "Boot-Device")" || :
 boot_kernel_path="$(get_machine_field "$machine" "Boot-Kernel-Path")" || :
 boot_initrd_path="$(get_machine_field "$machine" "Boot-Initrd-Path")" || :
@@ -1078,14 +1062,6 @@ case "$method" in
 					boot_script="$tmpdir/boot.scr"
 					backup_and_install "$boot_script" "$boot_script_path"
 				;;
-				uboot.env*)
-					boot_script_path="$boot_mnt_dir/$boot_script_path"
-					boot_script="$BOOTSCRIPTS_DIR/$usname"
-					mkimage_env "$ussize" "$boot_script" \
-						"$tmpdir/uboot.env"
-					boot_script="$tmpdir/uboot.env"
-					backup_and_install "$boot_script" "$boot_script_path"
-				;;
 				uEnvtxt*)
 					VOLID=${VOLID:-"$(get_root_uuid)"}
 					boot_script_in="$BOOTSCRIPTS_DIR/$usname"