Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: u-boot

u-boot (2019.07+dfsg-1ubuntu6) focal; urgency=medium [ Ethan Hsieh ] * d/p/ubuntu-nitrogen6q2g-temporary-config-fixup.patch: Fix bad CRC issue. The env size and redundant environment config variables have not yet been migrated to Kconfig, so setting them in _defconfig has no effect. Set those manually. -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 11 Feb 2020 11:43:57 +0100 u-boot (2019.07+dfsg-1ubuntu5) focal; urgency=medium [ Matthias Klose ] * Use python2 for the build. [ Dave Jones ] * Added d/p/python2.patch to fix-up remaining scripts still using bare "python" -- Dave Jones <dave.jones@canonical.com> Fri, 24 Jan 2020 11:29:15 +0000 u-boot (2019.07+dfsg-1ubuntu4) focal; urgency=medium * Do not include the vc4-fkms-v3d overlay; this breaks book on the 3A+ (LP: #1848247) * Handle differing root partition labels during migration * Ensure boot.scr is from recent flash-kernel -- Dave Jones <dave.jones@canonical.com> Fri, 17 Jan 2020 13:31:35 +0000 u-boot (2019.07+dfsg-1ubuntu3) eoan; urgency=medium * Avoid device-tree memory fixup on Raspberry Pi 4; this allows access to the all the RAM on models with more than 1Gb (LP: #1847500) -- Dave Jones <dave.jones@canonical.com> Sat, 12 Oct 2019 01:02:29 +0100 u-boot (2019.07+dfsg-1ubuntu2) eoan; urgency=medium * Don't attempt config migration when /boot/firmware is a chroot * Use vc4-fkms-v3d overlay on all models of Raspberry Pi -- Dave Jones <dave.jones@canonical.com> Wed, 09 Oct 2019 12:35:06 +0100 u-boot (2019.07+dfsg-1ubuntu1) eoan; urgency=medium * New upstream release to support Pi 4 boot (LP: #1846329) * Removed patches applied upstream: - d/p/dreamplug/Commit-ARM-CPU-arm926ejs-Consolidate-cache-routines-.patch - d/p/mkimage/0001-fdt-Fix-mkimage-list-to-try-every-header-type.patch - d/p/sunxi/teres-i.patch * Updated patch: - d/p/am57xx/omap5_distro_bootcmd * Add missing build dependency on arm/arm64 * Correct odroid README paths * Add d/p/rpi4.patch to support Raspberry Pi 4 boot * Remove redundant d/p/rpi-import-mkknlimg.patch * Add script to migrate old boot configurations to split, selective style * Use the board's device-tree instead of an embedded one -- Dave Jones <dave.jones@canonical.com> Tue, 23 Jul 2019 10:02:04 +0000 u-boot (2019.04+dfsg-2ubuntu3) eoan; urgency=medium [ Shrirang Bagul ] * Enable Ubuntu support for the Nitrogen6x board (LP: #1838064) - Add d/p/ubuntu-nitrogen6q2g-config-tweaks.patch to tweak the nitrogen6q2g configs to better fit our Ubuntu usage. - Start building the nitrogen6x2g target for u-boot. -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 03 Sep 2019 11:39:53 +0200 u-boot (2019.04+dfsg-2ubuntu2) eoan; urgency=low * Enable FIT signing support (LP: #1831942) - Enable CONFIG_FIT_SIGNATURE so we can sign FIT images. - Add libssl-dev to Build-Depends: to enable crypto functionality. - Limit key names to keys within the keydir. -- Andy Whitcroft <apw@ubuntu.com> Mon, 10 Jun 2019 15:44:35 +0100 u-boot (2019.04+dfsg-2ubuntu1) eoan; urgency=medium * Merge with 2019.04+dfsg-2 from Debian experimental. Remaining changes: - d/p/rpi-import-mkknlimg.patch import tools/mkknlimg from Xenial/raspi2 - scripts/mkknlimg @ 83a3ebb - d/p/rpi2-rpi3-config-tweaks.patch: basing on the earlier rpi2-config-tweaks.patch, make configuration adjustments to the rpi2 and rpi3 configs. - d/u-boot-rpi.postinst: support the fact that we now ship multiple uboot binaries for multiple Pi platforms in one package. Try to determine which device we're running on and use the right binary during upgrade/installation. * debian/patches: - d/p/lzo-to-lzno.patch: use gzip instead of lzo compression for FIT images as lzop in Ubuntu is in universe. This should be temporary and in the next releases ideally we should follow what Debian does. - debian/control: Add missing dependency on binutils (for strings) (LP: #1814930) - debian/patches: Refreshed patches. * Obsoleted; applied upstream: - Removed d/p/odroid-xu3/bootdelay -- Dave Jones <dave.jones@canonical.com> Mon, 03 Jun 2019 14:41:23 +0000

Modifications :
  1. Download patch debian/patches/test-imagetools-test-fixes

    --- 2019.07+dfsg-1/debian/patches/test-imagetools-test-fixes 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/test-imagetools-test-fixes 2020-01-22 10:52:16.000000000 +0000 @@ -1,10 +1,8 @@ This patch allows testing in an alternate directory and also detects failures to execute commands, treating that as a failure. -Index: u-boot/test/image/test-imagetools.sh -=================================================================== ---- u-boot.orig/test/image/test-imagetools.sh -+++ u-boot/test/image/test-imagetools.sh +--- a/test/image/test-imagetools.sh ++++ b/test/image/test-imagetools.sh @@ -11,7 +11,7 @@ # make O=sandbox # ./test/image/test-imagetools.sh @@ -14,7 +12,7 @@ Index: u-boot/test/image/test-imagetools SRCDIR=${BASEDIR}/boot IMAGE_NAME="v1.0-test" IMAGE_MULTI=linux.img -@@ -94,7 +94,7 @@ create_multi_image() +@@ -94,7 +94,7 @@ echo -e "\nBuilding multi-file image..." do_cmd ${MKIMAGE} -A x86 -O linux -T multi -n \"${IMAGE_NAME}\" \ @@ -23,7 +21,7 @@ Index: u-boot/test/image/test-imagetools echo "done." } -@@ -102,10 +102,10 @@ create_multi_image() +@@ -102,10 +102,10 @@ extract_multi_image() { echo -e "\nExtracting multi-file image contents..." @@ -38,7 +36,7 @@ Index: u-boot/test/image/test-imagetools echo "done." } -@@ -158,7 +158,7 @@ create_fit_image() +@@ -158,7 +158,7 @@ " > ${IMAGE_FIT_ITS} echo -e "\nBuilding FIT image..." @@ -47,7 +45,7 @@ Index: u-boot/test/image/test-imagetools echo "done." } -@@ -166,10 +166,10 @@ create_fit_image() +@@ -166,10 +166,10 @@ extract_fit_image() { echo -e "\nExtracting FIT image contents..." @@ -62,7 +60,7 @@ Index: u-boot/test/image/test-imagetools echo "done." } -@@ -181,8 +181,8 @@ list_image() +@@ -181,8 +181,8 @@ local image="$1" echo -e "\nListing image contents..."
  2. Download patch debian/u-boot-qemu.README.Debian

    --- 2019.07+dfsg-1/debian/u-boot-qemu.README.Debian 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-qemu.README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - -Booting a qemu/kvm guest with u-boot -==================================== - -To boot a qemu guest with u-boot, start qemu-system with the '-bios -u-boot.bin' option. Use the full path to the u-boot.bin file that corresponds -with the archicture you are trying to boot. - - -Booting from disk ------------------ - -To allow a qemu guest to boot from disk, you need a u-boot config file on the -disk. There is no need to install u-boot in the guest, as you are passing -u-boot directly to qemu. The u-boot config file can be automatically created -by installing the u-boot-menu package. Alternatively, the flash-kernel package -can also create u-boot config files, but it currently doesn't recognise qemu -guests. - - -Netboot -------- - -u-boot supports the e1000 network driver to boot from the network. Please note -that u-boot will initially output "Net: No ethernet found.", before -continuing with the netboot. - - -Device tree ------------ - -On architectures where a device tree file is needed to boot, qemu will -generate the device tree based on the virtual hardware that is configured. -u-boot should be able to find this data at the default address where u-boot -looks for this data (${fdt_addr}, so you should use that address in your -u-boot script. - - -Examples -======== - -TODO - -
  3. Download patch debian/patches/n900-bootz-raw-initrd.diff

    --- 2019.07+dfsg-1/debian/patches/n900-bootz-raw-initrd.diff 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/n900-bootz-raw-initrd.diff 2020-01-22 10:52:16.000000000 +0000 @@ -1,11 +1,9 @@ Enable booting of zImage/vmlinuz and initrd without requiring the use of mkimage to create uImage/uInitrd. -Index: u-boot/include/configs/nokia_rx51.h -=================================================================== ---- u-boot.orig/include/configs/nokia_rx51.h -+++ u-boot/include/configs/nokia_rx51.h -@@ -160,6 +160,9 @@ +--- a/include/configs/nokia_rx51.h ++++ b/include/configs/nokia_rx51.h +@@ -140,6 +140,9 @@ #define PART6_OFFS 0x004c0000 #define PART6_MASK 0x00000000
  4. Download patch debian/bin/rpi-config-migration
  5. Download patch debian/u-boot-qemu.lintian-overrides

    --- 2019.07+dfsg-1/debian/u-boot-qemu.lintian-overrides 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-qemu.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ - -# There are no file conflicts across architectures for u-boot, as each -# target is only installed on a single architecture. In theory, some -# targets could be built on multiple architectures, but could instead install -# the package for the architecture needed. -u-boot-qemu binary: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/*/uboot.elf - -# These bootloaders need to be statically linked. -u-boot-qemu binary: statically-linked-binary usr/lib/u-boot/*/uboot.elf - -# These are bootloader binaries, and have no external dependency information -u-boot-qemu binary: shared-lib-without-dependency-information usr/lib/u-boot/*/uboot.elf - -u-boot-qemu: description-synopsis-starts-with-article - - -# These are binary firmware blobs -u-boot-qemu binary: arch-independent-package-contains-binary-or-object usr/lib/u-boot/*/uboot.elf
  6. Download patch debian/patches/dreamplug/Commit-ARM-CPU-arm926ejs-Consolidate-cache-routines-.patch

    --- 2019.07+dfsg-1/debian/patches/dreamplug/Commit-ARM-CPU-arm926ejs-Consolidate-cache-routines-.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/dreamplug/Commit-ARM-CPU-arm926ejs-Consolidate-cache-routines-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -From 655659a4d8505402e08510e827608fc19f58ac19 Mon Sep 17 00:00:00 2001 -From: Leigh Brown <leigh@solinno.co.uk> -Date: Wed, 27 Feb 2019 11:32:16 +0000 -Subject: [PATCH] Commit "ARM: CPU: arm926ejs: Consolidate cache routines to - common file" breaks u-boot on Dreamplug - -Hello, - -Vagrant Cascadian asked for people to test the version of u-boot packaged -for Debian Buster. I tested u-boot on my Dreamplug and found it was not -working correctly. I raised a bug for Debian[1] but I have also tested -with the mainline version of u-boot and found the same issues. - -The first issue is that the following commit caused u-boot to no longer -be able to access usb storage on the Dreamplug: - -commit 93b283d49f933f95f3a6f40762936f454ac655a8 -Author: Adam Ford <aford173@gmail.com> -Date: Thu Aug 16 13:23:11 2018 -0500 - - ARM: CPU: arm926ejs: Consolidate cache routines to common file - - Four different boards had different options for enabling cache - that were virtually all the same. This consolidates these - common functions into arch/arm/cpu/arm926ejs/cache.c - - This also has the positive side-effect of enabling cache on - the Davinci (da850) boards. - - Signed-off-by: Adam Ford <aford173@gmail.com> - [trini: Add mach-at91 to the list of consolidations] - Signed-off-by: Tom Rini <trini@konsulko.com> - -I don't have much knowledge of ARM caching, but the following patch makes -it work again on my Dreamplug. ---- - arch/arm/mach-kirkwood/cpu.c | 1 - - include/configs/dreamplug.h | 2 ++ - 2 files changed, 2 insertions(+), 1 deletion(-) - -Index: u-boot/include/configs/dreamplug.h -=================================================================== ---- u-boot.orig/include/configs/dreamplug.h -+++ u-boot/include/configs/dreamplug.h -@@ -73,4 +73,6 @@ - #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET - #endif /*CONFIG_MVSATA_IDE*/ - -+#define CONFIG_SYS_DCACHE_OFF -+ - #endif /* _CONFIG_DREAMPLUG_H */
  7. Download patch debian/patches/sh4-fix-linker-name-prefix.patch

    --- 2019.07+dfsg-1/debian/patches/sh4-fix-linker-name-prefix.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/sh4-fix-linker-name-prefix.patch 2020-01-22 10:52:16.000000000 +0000 @@ -17,10 +17,8 @@ Forwarded: (not yet) Reviewed-By: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Last-Update: 2014-12-10 -Index: u-boot/arch/sh/config.mk -=================================================================== ---- u-boot.orig/arch/sh/config.mk -+++ u-boot/arch/sh/config.mk +--- a/arch/sh/config.mk ++++ b/arch/sh/config.mk @@ -4,7 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  8. Download patch debian/bin/update-lintian-overrides

    --- 2019.07+dfsg-1/debian/bin/update-lintian-overrides 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/bin/update-lintian-overrides 2020-01-22 10:52:16.000000000 +0000 @@ -45,14 +45,3 @@ ${package}: description-synopsis-starts- EOF done - -package=u-boot-qemu -overrides=debian/${package}.lintian-overrides -cat >>${overrides}<<EOF - -# These are binary firmware blobs -EOF - -sed -n "/^all:.*[[:space:]]qemu[[:space:]]/p" ${target_file} | while read arch subarch2 platform targets ; do - echo "${package} binary: arch-independent-package-contains-binary-or-object usr/lib/u-boot/*/uboot.elf" -done | LC_ALL=C sort -u >> ${overrides}
  9. Download patch debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch

    --- 2019.07+dfsg-1/debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch 2020-01-22 10:52:16.000000000 +0000 @@ -0,0 +1,53 @@ +Description: limit keyname to prevent escape from keydir + Limit key names to keys within the keydir by refusing keynames containing + a slash. +Author: Andy Whitcroft <apw@canonical.com> +Forwarded: no +Last-Update: 2019-05-31 + +--- + +Index: u-boot-2018.07~rc3+dfsg1--clean/lib/rsa/rsa-sign.c +=================================================================== +--- u-boot-2018.07~rc3+dfsg1--clean.orig/lib/rsa/rsa-sign.c ++++ u-boot-2018.07~rc3+dfsg1--clean/lib/rsa/rsa-sign.c +@@ -61,6 +61,11 @@ static int rsa_pem_get_pub_key(const cha + FILE *f; + int ret; + ++ if (strchr(name, '/')) { ++ fprintf(stderr, "Invalid key name '%s': contains '/' \n", name); ++ return -EACCES; ++ } ++ + *rsap = NULL; + snprintf(path, sizeof(path), "%s/%s.crt", keydir, name); + f = fopen(path, "r"); +@@ -199,6 +204,11 @@ static int rsa_pem_get_priv_key(const ch + RSA *rsa; + FILE *f; + ++ if (strchr(name, '/')) { ++ fprintf(stderr, "Invalid key name '%s': contains '/' \n", name); ++ return -EACCES; ++ } ++ + *rsap = NULL; + snprintf(path, sizeof(path), "%s/%s.key", keydir, name); + f = fopen(path, "r"); +Index: u-boot-2018.07~rc3+dfsg1--clean/tools/kwbimage.c +=================================================================== +--- u-boot-2018.07~rc3+dfsg1--clean.orig/tools/kwbimage.c ++++ u-boot-2018.07~rc3+dfsg1--clean/tools/kwbimage.c +@@ -395,6 +395,11 @@ static int kwb_load_rsa_key(const char * + if (!keydir) + keydir = "."; + ++ if (strchr(name, '/')) { ++ fprintf(stderr, "Invalid key name '%s': contains '/' \n", name); ++ return -EACCES; ++ } ++ + snprintf(path, sizeof(path), "%s/%s.key", keydir, name); + f = fopen(path, "r"); + if (!f) {
  10. Download patch debian/patches/Makefile-add-kwb-target-to-all.patch

    --- 2019.07+dfsg-1/debian/patches/Makefile-add-kwb-target-to-all.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/Makefile-add-kwb-target-to-all.patch 2020-01-22 10:52:16.000000000 +0000 @@ -1,10 +1,8 @@ Add u-boot.kwb to "make all" target on Kirkwood. -Index: u-boot/Makefile -=================================================================== ---- u-boot.orig/Makefile -+++ u-boot/Makefile -@@ -799,6 +799,7 @@ ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.im +--- a/Makefile ++++ b/Makefile +@@ -830,6 +830,7 @@ endif endif ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
  11. Download patch debian/rules

    --- 2019.07+dfsg-1/debian/rules 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/rules 2020-01-23 22:41:17.000000000 +0000 @@ -31,29 +31,17 @@ LDFLAGS := $(patsubst -Wl$(comma)%,%,$(L dh $@ configs/novena-rawsd_defconfig: - sed -e 's,CONFIG_SPL_FS_FAT=y,# CONFIG_SPL_FS_FAT is not set,' \ + sed -e 's,CONFIG_SPL_FAT_SUPPORT=y,# CONFIG_SPL_FAT_SUPPORT is not set,' \ configs/novena_defconfig > configs/novena-rawsd_defconfig configs/am335x_boneblack_defconfig: sed -e 's,CONFIG_OF_LIST=.*,CONFIG_OF_LIST="am335x-evm am335x-boneblack",g' \ configs/am335x_evm_defconfig > configs/am335x_boneblack_defconfig -override_dh_auto_build-arch: TOOLSDIR := debian/build/tools -override_dh_auto_build-arch: TARGETARCH := $(DEB_HOST_ARCH) -ifeq (,$(filter pkg.uboot.notools,$(DEB_BUILD_PROFILES))) -override_dh_auto_build-arch: build-targets build-tools -else -override_dh_auto_build-arch: build-targets -endif - -override_dh_auto_build-indep: TOOLSDIR := debian/build/tools -override_dh_auto_build-indep: TARGETARCH := all -override_dh_auto_build-indep: build-targets - -build-targets: configs/novena-rawsd_defconfig configs/am335x_boneblack_defconfig - echo run build-targets for $(TARGETARCH) - set -e; grep ^$(TARGETARCH)[^a-z0-9] debian/targets \ - | while read arch subarch platform targets; do \ +override_dh_auto_build: TOOLSDIR := debian/build/tools +override_dh_auto_build: configs/novena-rawsd_defconfig configs/am335x_boneblack_defconfig + set -e; sed -n 's/^$(DEB_HOST_ARCH)[[:space:]]\+//p' debian/targets \ + | while read subarch platform targets; do \ builddir=debian/build/$$platform; \ case $$platform in \ novena-rawsd) targets="$$targets" ;\ @@ -68,24 +56,13 @@ build-targets: configs/novena-rawsd_defc *) subpackage="u-boot-$$subarch" ;\ ;; \ esac;\ - case $$arch in \ - all:armhf) export CROSS_COMPILE=arm-linux-gnueabihf- ;;\ - all:arm64) export CROSS_COMPILE=aarch64-linux-gnu- ;;\ - all:mips) export CROSS_COMPILE=mips-linux-gnu- ;;\ - all:mipsel) export CROSS_COMPILE=mipsel-linux-gnu- ;;\ - all:mips64el) export CROSS_COMPILE=mips64el-linux-gnuabi64- ;;\ - all:riscv64) export CROSS_COMPILE=riscv64-linux-gnu- ;;\ - all:i386) export CROSS_COMPILE=i686-linux-gnu- ;;\ - all:amd64) export CROSS_COMPILE=x86_64-linux-gnu- ;;\ - *) ;; \ - esac;\ mkdir -p $$builddir; \ $(MAKE) V=$(VERBOSE) O=$$builddir $${platform}_defconfig; \ $(MAKE) V=$(VERBOSE) $(DEB_UBOOT_FLAGS) O=$$builddir $${maketargets}; \ case "$$targets" in \ *uboot.elf*) \ install -m 644 $$builddir/u-boot $$builddir/uboot.elf; \ - $${CROSS_COMPILE}strip --remove-section=.comment \ + $(CROSS_COMPILE)strip --remove-section=.comment \ --remove-section=.note \ $$builddir/uboot.elf; \ ;; \ @@ -109,20 +86,24 @@ build-targets: configs/novena-rawsd_defc esac; \ done -build-tools: - $(MAKE) V=$(VERBOSE) O=$(TOOLSDIR) CROSS_COMPILE=$(CROSS_COMPILE) tools-only_defconfig - # Disable fit signatures, which requires OpenSSL which triggers - # licensing incompatibilities with the GPL: - # https://people.gnome.org/~markmc/openssl-and-the-gpl.html - sed -i -e 's,CONFIG_FIT_SIGNATURE=y,# CONFIG_FIT_SIGNATURE is not set,g' $(TOOLSDIR)/.config + # Load dummy config + echo CONFIG_SYS_TEXT_BASE=0 > configs/tools_defconfig + # enable signatures + echo CONFIG_FIT=y >> configs/tools_defconfig + echo CONFIG_FIT_SIGNATURE=y >> configs/tools_defconfig + $(MAKE) V=$(VERBOSE) O=$(TOOLSDIR) \ + PYTHON=python2 \ + CROSS_COMPILE=$(CROSS_COMPILE) tools_defconfig cp $(TOOLSDIR)/.config $(TOOLSDIR)/config # board-independent tools $(MAKE) V=$(VERBOSE) O=$(TOOLSDIR) $(DEB_UBOOT_FLAGS) \ + PYTHON=python2 \ CROSS_COMPILE=$(CROSS_COMPILE) \ CROSS_BUILD_TOOLS=$(cross_build_tools) \ NO_SDL=1 \ tools-only $(MAKE) V=$(VERBOSE) O=$(TOOLSDIR) $(DEB_UBOOT_FLAGS) \ + PYTHON=python2 \ CROSS_COMPILE=$(CROSS_COMPILE) \ NO_SDL=1 \ envtools @@ -136,18 +117,12 @@ build-tools: override_dh_auto_test: ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) # only run tests on native builds - if [ -e debian/build/tools/tools/mkimage ] ; then \ - BASEDIR=debian/build/tools test/image/test-imagetools.sh ;\ - fi + BASEDIR=debian/build/tools test/image/test-imagetools.sh endif -override_dh_strip: - # dh_strip tries to strip the cross compiled qemu images, which doesn't - # work - dh_strip -X qemu - override_dh_clean: rm -rf debian/build/ + rm -f configs/tools_defconfig rm -f configs/novena-rawsd_defconfig rm -f configs/am335x_boneblack_defconfig rm -f linux.itb linux.its
  12. Download patch debian/control

    --- 2019.07+dfsg-1/debian/control 2019-07-08 22:19:26.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/control 2020-01-23 22:41:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: u-boot Section: admin Priority: optional -Maintainer: Vagrant Cascadian <vagrant@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Vagrant Cascadian <vagrant@debian.org> Uploaders: Loïc Minier <lool@debian.org>, Clint Adams <clint@debian.org> Build-Depends: bc, @@ -11,26 +12,15 @@ Build-Depends: dpkg-dev (>= 1.17.14), flex, libfdt-dev:native [arm64], - libc6:arm64 [arm64] <cross !pkg.uboot.notools>, - libc6:armhf [armhf] <cross !pkg.uboot.notools>, - libc6:armel [armel] <cross !pkg.uboot.notools>, - libc6:riscv64 [riscv64] <cross !pkg.uboot.notools>, - libpython-dev:native [linux-any], - python:any [linux-any], - python-pyelftools [arm64], + libc6:arm64 [arm64] <cross>, + libc6:armhf [armhf] <cross>, + libc6:armel [armel] <cross>, + libpython2-dev:native [armhf arm64], + libssl-dev, + python2:any [armhf arm64], + python-pyelftools [armhf arm64], skales:native [arm64], - swig [linux-any], - lzop [armhf] <!cross> | lzop:native [armhf] <cross>, -Build-Depends-Indep: -# For u-boot-qemu targets - gcc-i686-linux-gnu [!i386], - gcc-arm-linux-gnueabihf [!armhf], - gcc-aarch64-linux-gnu [!arm64], - gcc-mips-linux-gnu [!mips], - gcc-mips64el-linux-gnuabi64 [!mips64el], - gcc-mipsel-linux-gnu [!mipsel], - gcc-riscv64-linux-gnu [!riscv64], - gcc-x86-64-linux-gnu [!amd64], + swig [armhf arm64], Standards-Version: 4.3.0 Homepage: http://www.denx.de/wiki/U-Boot/ Vcs-Browser: https://salsa.debian.org/debian/u-boot @@ -40,7 +30,7 @@ Package: u-boot Architecture: armel armhf avr32 mips sh4 Multi-Arch: same Depends: ${misc:Depends}, - u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf], u-boot-exynos [armhf], u-boot-qemu [mips] + u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf], u-boot-exynos [armhf] Description: A boot loader for embedded systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is @@ -80,21 +70,6 @@ Description: A boot loader for imx syste This package includes boot loaders for various imx platforms. ${uboot:platforms} -Package: u-boot-qemu -Architecture: all -Depends: ${misc:Depends} -Breaks: u-boot (<< 2019.01+dfsg-2) -Replaces: u-boot (<< 2019.01+dfsg-2) -Description: A boot loader for qemu - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for qemu/kvm. - ${uboot:platforms} - Package: u-boot-qcom Architecture: arm64 Multi-Arch: same @@ -205,7 +180,8 @@ Description: A boot loader for rockchip Package: u-boot-rpi Architecture: armel armhf arm64 Multi-Arch: same -Depends: ${misc:Depends} +Depends: ${misc:Depends}, awk +Breaks: flash-kernel (<< 3.98ubuntu8) Description: A boot loader for Raspberry PI systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is @@ -217,26 +193,10 @@ Description: A boot loader for Raspberry platforms. ${uboot:platforms} -Package: u-boot-sifive -Architecture: riscv64 -Multi-Arch: same -Depends: ${misc:Depends} -Description: A boot loader for SiFive systems - Das U-Boot is a cross-platform bootloader for embedded systems, - used as the default boot loader by several board vendors. It is - intended to be easy to port and to debug, and runs on many - supported architectures, including PPC, ARM, MIPS, x86, m68k, - NIOS, and Microblaze. - . - This package includes boot loaders for various SiFive - platforms. - ${uboot:platforms} - Package: u-boot-tools Architecture: linux-any -Build-Profiles: <!pkg.uboot.notools> Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, binutils Recommends: device-tree-compiler Breaks: uboot-envtools (<< 20081215-3~), uboot-mkimage (<= 0.4build1),
  13. Download patch debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch

    --- 2019.07+dfsg-1/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch 2020-01-22 10:52:16.000000000 +0000 @@ -25,11 +25,9 @@ Signed-off-by: Benjamin Drung <bdrung@de include/configs/trats2.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) -Index: u-boot/board/samsung/common/bootscripts/autoboot.cmd -=================================================================== ---- u-boot.orig/board/samsung/common/bootscripts/autoboot.cmd -+++ u-boot/board/samsung/common/bootscripts/autoboot.cmd -@@ -12,7 +12,7 @@ setenv initrdaddr "42000000" +--- a/board/samsung/common/bootscripts/autoboot.cmd ++++ b/board/samsung/common/bootscripts/autoboot.cmd +@@ -12,7 +12,7 @@ setenv loaddtb "load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} ${fdtfile}" setenv loadinitrd "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} ${initrdname}" setenv loadkernel "load mmc ${mmcbootdev}:${mmcbootpart} '${kerneladdr}' '${kernelname}'" @@ -38,10 +36,8 @@ Index: u-boot/board/samsung/common/boots #### Routine: check_dtb - check that target.dtb exists on boot partition setenv check_dtb " -Index: u-boot/board/samsung/common/bootscripts/bootzimg.cmd -=================================================================== ---- u-boot.orig/board/samsung/common/bootscripts/bootzimg.cmd -+++ u-boot/board/samsung/common/bootscripts/bootzimg.cmd +--- a/board/samsung/common/bootscripts/bootzimg.cmd ++++ b/board/samsung/common/bootscripts/bootzimg.cmd @@ -1,5 +1,5 @@ setenv kernelname zImage; -setenv boot_kernel "setenv bootargs \"${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}\"; @@ -49,17 +45,15 @@ Index: u-boot/board/samsung/common/boots load mmc ${mmcbootdev}:${mmcbootpart} 0x40007FC0 '${kernelname}'; if load mmc ${mmcbootdev}:${mmcbootpart} 40800000 ${fdtfile}; then bootz 0x40007FC0 - 40800000; -@@ -7,4 +7,4 @@ else +@@ -7,4 +7,4 @@ echo Warning! Booting without DTB: '${fdtfile}'!; bootz 0x40007FC0 -; fi;" -run boot_kernel; \ No newline at end of file +run boot_kernel; -Index: u-boot/board/samsung/common/dfu_sample_env.txt -=================================================================== ---- u-boot.orig/board/samsung/common/dfu_sample_env.txt -+++ u-boot/board/samsung/common/dfu_sample_env.txt +--- a/board/samsung/common/dfu_sample_env.txt ++++ b/board/samsung/common/dfu_sample_env.txt @@ -1,9 +1,9 @@ -mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait ${console}; run loaduimage; bootm 0x40007FC0 +mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait console=${console}; run loaduimage; bootm 0x40007FC0 @@ -72,10 +66,8 @@ Index: u-boot/board/samsung/common/dfu_s +console=ttySAC2,115200n8 bootcmd=run mmcboot dfu_alt_info=u-boot mmc 80 800;params.bin mmc 0x38 0x8;uImage ext4 0 2 -Index: u-boot/include/configs/odroid.h -=================================================================== ---- u-boot.orig/include/configs/odroid.h -+++ u-boot/include/configs/odroid.h +--- a/include/configs/odroid.h ++++ b/include/configs/odroid.h @@ -40,7 +40,7 @@ /* Console configuration */ @@ -94,10 +86,8 @@ Index: u-boot/include/configs/odroid.h "mmcbootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ -Index: u-boot/include/configs/odroid_xu3.h -=================================================================== ---- u-boot.orig/include/configs/odroid_xu3.h -+++ u-boot/include/configs/odroid_xu3.h +--- a/include/configs/odroid_xu3.h ++++ b/include/configs/odroid_xu3.h @@ -30,7 +30,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) @@ -116,10 +106,8 @@ Index: u-boot/include/configs/odroid_xu3 "fdtfile=exynos5422-odroidxu3.dtb\0" \ "board_name=odroidxu3\0" \ "mmcbootdev=0\0" \ -Index: u-boot/include/configs/s5p_goni.h -=================================================================== ---- u-boot.orig/include/configs/s5p_goni.h -+++ u-boot/include/configs/s5p_goni.h +--- a/include/configs/s5p_goni.h ++++ b/include/configs/s5p_goni.h @@ -87,7 +87,7 @@ #define CONFIG_BOOTCOMMAND "run mmcboot" @@ -138,10 +126,8 @@ Index: u-boot/include/configs/s5p_goni.h "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ -Index: u-boot/include/configs/s5pc210_universal.h -=================================================================== ---- u-boot.orig/include/configs/s5pc210_universal.h -+++ u-boot/include/configs/s5pc210_universal.h +--- a/include/configs/s5pc210_universal.h ++++ b/include/configs/s5pc210_universal.h @@ -27,7 +27,7 @@ /* Console configuration */ @@ -160,10 +146,8 @@ Index: u-boot/include/configs/s5pc210_un "mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "mbrparts=" MBRPARTS_DEFAULT \ "meminfo=crashkernel=32M@0x50000000\0" \ -Index: u-boot/include/configs/trats.h -=================================================================== ---- u-boot.orig/include/configs/trats.h -+++ u-boot/include/configs/trats.h +--- a/include/configs/trats.h ++++ b/include/configs/trats.h @@ -36,7 +36,7 @@ #define CONFIG_MACH_TYPE MACH_TYPE_TRATS @@ -182,10 +166,8 @@ Index: u-boot/include/configs/trats.h "meminfo=crashkernel=32M@0x50000000\0" \ "nfsroot=/nfsroot/arm\0" \ "bootblock=" CONFIG_BOOTBLOCK "\0" \ -Index: u-boot/include/configs/trats2.h -=================================================================== ---- u-boot.orig/include/configs/trats2.h -+++ u-boot/include/configs/trats2.h +--- a/include/configs/trats2.h ++++ b/include/configs/trats2.h @@ -34,7 +34,7 @@ /* Console configuration */
  14. Download patch debian/targets

    --- 2019.07+dfsg-1/debian/targets 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/targets 2020-01-22 10:52:16.000000000 +0000 @@ -43,6 +43,9 @@ armhf imx mx6qsabrelite u-boot.imx # Hector Oron <zumbi@debian.org> armhf imx nitrogen6q u-boot.imx +# Shrirang Bagul <shrirang.bagul@canonical.com> +armhf imx nitrogen6q2g u-boot.imx + # Vagrant Cascadian <vagrant@debian.org> armhf imx novena u-boot.img SPL armhf imx novena-rawsd SPL @@ -157,9 +160,6 @@ armhf sunxi Mini-X u-boot-sunxi-with-sp # Paul Tagliamonte <paultag@debian.org> armhf sunxi nanopi_neo u-boot-sunxi-with-spl.bin -# Philip Hands <phil@hands.com> -armhf sunxi nanopi_neo_air u-boot-sunxi-with-spl.bin - # Vagrant Cascadian <vagrant@debian.org>, Orange PI Plus2 armhf sunxi orangepi_plus u-boot-sunxi-with-spl.bin @@ -204,21 +204,12 @@ arm64 rpi rpi_3 u-boot.bin # Rodrigo Exterckötter Tjäder <rodrigo@tjader.xyz> arm64 sunxi a64-olinuxino u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-olinuxino.dtb -# Domenico Andreoli <cavok@debian.org> -arm64 sunxi nanopi_neo2 u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-h5-nanopi-neo2.dtb - -# Steev Klimaszewski <steev@kali.org> -arm64 sunxi nanopi_neo_plus2 u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dtb - # Frederic Danis <frederic.danis@collabora.com> arm64 sunxi orangepi_zero_plus2 u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dtb # Vagrant Cascadian <vagrant@debian.org> arm64 sunxi pine64_plus u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-pine64-plus.dtb arch/arm/dts/sun50i-a64-pine64.dtb -# Sunil Mohan Adapa <sunil@medhas.org> -arm64 sunxi pine64-lts u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-pine64-lts.dtb arch/arm/dts/sun50i-a64-pine64.dtb - # Vagrant Cascadian <vagrant@debian.org> arm64 sunxi pinebook u-boot.bin spl/sunxi-spl.bin u-boot-nodtb.bin arch/arm/dts/sun50i-a64-pinebook.dtb @@ -230,17 +221,12 @@ arm64 tegra p2371-2180 u-boot.bin avr32 - hammerhead u-boot.img -# Hector Oron <zumbi@debian.org> -riscv64 sifive sifive_fu540 u-boot.bin +mips - qemu_mips u-boot.bin sh4 - r2dplus u-boot.bin -all:amd64 qemu qemu-x86_64 u-boot.bin -all:armhf qemu qemu_arm u-boot.bin -all:arm64 qemu qemu_arm64 u-boot.bin -all:i386 qemu qemu-x86 u-boot.bin -all:mips qemu qemu_mips u-boot.bin -all:mipsel qemu qemu_mipsel u-boot.bin -all:mips64el qemu qemu_mips64el u-boot.bin -all:riscv64 qemu qemu-riscv64 u-boot.bin -all:riscv64 qemu qemu-riscv64_smode u-boot.bin +sh4 - sh7785lcr_32bit u-boot.bin + +# Dave Jones <dave.jones@canonical.com> +armhf rpi rpi_4_32b u-boot.bin +arm64 rpi rpi_4 u-boot.bin
  15. Download patch debian/patches/qemu-riscv64/qemu-riscv64-raw-initrd.patch

    --- 2019.07+dfsg-1/debian/patches/qemu-riscv64/qemu-riscv64-raw-initrd.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/qemu-riscv64/qemu-riscv64-raw-initrd.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Index: u-boot/configs/qemu-riscv64_defconfig -=================================================================== ---- u-boot.orig/configs/qemu-riscv64_defconfig -+++ u-boot/configs/qemu-riscv64_defconfig -@@ -8,3 +8,4 @@ CONFIG_DISPLAY_CPUINFO=y - CONFIG_DISPLAY_BOARDINFO=y - # CONFIG_CMD_MII is not set - CONFIG_OF_PRIOR_STAGE=y -+CONFIG_SUPPORT_RAW_INITRD=y -Index: u-boot/configs/qemu-riscv64_smode_defconfig -=================================================================== ---- u-boot.orig/configs/qemu-riscv64_smode_defconfig -+++ u-boot/configs/qemu-riscv64_smode_defconfig -@@ -9,3 +9,4 @@ CONFIG_DISPLAY_CPUINFO=y - CONFIG_DISPLAY_BOARDINFO=y - # CONFIG_CMD_MII is not set - CONFIG_OF_PRIOR_STAGE=y -+CONFIG_SUPPORT_RAW_INITRD=y
  16. Download patch debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch

    --- 2019.07+dfsg-1/debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch 2020-01-22 10:52:16.000000000 +0000 @@ -0,0 +1,48 @@ +--- a/configs/nitrogen6q2g_defconfig ++++ b/configs/nitrogen6q2g_defconfig +@@ -17,8 +17,10 @@ + CONFIG_SYS_ALT_MEMTEST=y + # CONFIG_CMD_FLASH is not set + CONFIG_CMD_GPIO=y ++CONFIG_CMD_GPT=y + CONFIG_CMD_I2C=y + CONFIG_CMD_MMC=y ++CONFIG_CMD_PART=y + CONFIG_CMD_SATA=y + CONFIG_CMD_SF=y + CONFIG_CMD_USB=y +@@ -34,10 +36,16 @@ + CONFIG_CMD_EXT4_WRITE=y + CONFIG_CMD_FAT=y + CONFIG_CMD_FS_GENERIC=y +-CONFIG_ENV_IS_IN_SPI_FLASH=y ++CONFIG_ENV_IS_IN_FAT=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto" ++CONFIG_ENV_FAT_FILE="uboot.env" ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DWC_AHSATA=y + CONFIG_USB_FUNCTION_FASTBOOT=y + CONFIG_FASTBOOT_BUF_ADDR=0x12000000 ++CONFIG_FAT_WRITE=y ++CONFIG_FS_FAT=y + CONFIG_FSL_ESDHC=y + CONFIG_SPI_FLASH=y + CONFIG_SF_DEFAULT_MODE=0 +@@ -63,3 +71,4 @@ + CONFIG_VIDEO=y + # CONFIG_VIDEO_SW_CURSOR is not set + CONFIG_OF_LIBFDT=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +--- a/include/configs/nitrogen6x.h ++++ b/include/configs/nitrogen6x.h +@@ -150,7 +150,9 @@ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + + /* Environment organization */ ++#ifndef CONFIG_ENV_SIZE + #define CONFIG_ENV_SIZE (8 * 1024) ++#endif + + #if defined(CONFIG_ENV_IS_IN_MMC) + #define CONFIG_ENV_OFFSET (6 * 64 * 1024)
  17. Download patch debian/patches/add-debian-revision-to-u-boot-version

    --- 2019.07+dfsg-1/debian/patches/add-debian-revision-to-u-boot-version 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/add-debian-revision-to-u-boot-version 2020-01-22 10:52:16.000000000 +0000 @@ -1,11 +1,9 @@ Add the debian revision to the U-boot version, which is displayed at boot and can be helpful to determine which specific version is used. -Index: u-boot/Makefile -=================================================================== ---- u-boot.orig/Makefile -+++ u-boot/Makefile -@@ -350,7 +350,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ +--- a/Makefile ++++ b/Makefile +@@ -388,7 +388,7 @@ # Read UBOOTRELEASE from include/config/uboot.release (if it exists) UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
  18. Download patch debian/u-boot-rpi.postinst

    --- 2019.07+dfsg-1/debian/u-boot-rpi.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-rpi.postinst 2020-01-23 16:54:12.000000000 +0000 @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +BOOT="/boot/firmware" + +. /usr/share/u-boot/rpi-config-migration + +case "$1" in + configure) + if ischroot; then + echo "chroot detected; skipping postinst" + exit 0 + fi + if ! mountpoint -q "$BOOT"; then + echo "Error: missing $BOOT, did you forget to mount it?" >&2 + exit 1 + fi + + # The u-boot-rpi package now ships more than just one u-boot binary. Copy + # all supported u-boot binaries to the boot partition to support the + # case of switching the SD card between Pis + for uboot_binary in /usr/lib/u-boot/*/u-boot.bin; do + dest_binary=uboot_$(basename $(dirname "$uboot_binary")).bin + cp "$uboot_binary" "$BOOT/$dest_binary" + done + + # If necessary, migrate boot configuration from the pre-eoan default + # configuration (monolithic config.txt, single u-boot binary) to the new + # style (modular selective config.txt, multiple u-boot binaries) + if dpkg --compare-versions "$2" lt "2019.07+dfsg-1ubuntu1~" && is_old_config; then + echo -n "Migrating boot configuration..." + migrate_config + echo "done" + echo "Old configuration has been preserved in $BOOT/config.bak" + fi + ;; +esac + +exit 0 + +#DEBHELPER#
  19. Download patch debian/patches/am57xx/omap5_distro_bootcmd

    --- 2019.07+dfsg-1/debian/patches/am57xx/omap5_distro_bootcmd 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/am57xx/omap5_distro_bootcmd 2020-01-22 10:52:16.000000000 +0000 @@ -1,9 +1,7 @@ Enable distro_bootcmd support (doc/README.distro) for omap5 targets. -Index: u-boot/include/configs/ti_omap5_common.h -=================================================================== ---- u-boot.orig/include/configs/ti_omap5_common.h -+++ u-boot/include/configs/ti_omap5_common.h +--- a/include/configs/ti_omap5_common.h ++++ b/include/configs/ti_omap5_common.h @@ -58,6 +58,21 @@ #include <environment/ti/mmc.h> #include <environment/ti/nand.h> @@ -26,11 +24,11 @@ Index: u-boot/include/configs/ti_omap5_c #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ -@@ -67,6 +82,7 @@ +@@ -66,6 +81,7 @@ + DEFAULT_FDT_TI_ARGS \ DFUARGS \ NETARGS \ - NANDARGS \ + BOOTENV \ + NANDARGS \ /* - * SPL related defines. The Public RAM memory map the ROM defines the
  20. Download patch debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch

    --- 2019.07+dfsg-1/debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch 2020-02-11 10:43:57.000000000 +0000 @@ -0,0 +1,44 @@ +Author: Ethan Hsieh <ethan.hsieh@canonical.com> +Description: Fix bad CRC issue + Some of the config options defined in the original Ubuntu nitrogen6x patch + are not yet migrated to Kconfig as of our current u-boot version. As a + workaround, define those the old-fashoned way. +--- a/configs/nitrogen6q2g_defconfig ++++ b/configs/nitrogen6q2g_defconfig +@@ -40,7 +40,6 @@ + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto" + CONFIG_ENV_FAT_FILE="uboot.env" +-CONFIG_ENV_SIZE=0x20000 + CONFIG_DWC_AHSATA=y + CONFIG_USB_FUNCTION_FASTBOOT=y + CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +@@ -72,4 +71,3 @@ + CONFIG_VIDEO=y + # CONFIG_VIDEO_SW_CURSOR is not set + CONFIG_OF_LIBFDT=y +-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +--- a/include/configs/nitrogen6x.h ++++ b/include/configs/nitrogen6x.h +@@ -11,6 +11,10 @@ + + #include "mx6_common.h" + ++#if defined(CONFIG_TARGET_NITROGEN6X) ++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT ++#endif ++ + #define CONFIG_MACH_TYPE 3769 + + /* Size of malloc() pool */ +@@ -149,7 +153,9 @@ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + + /* Environment organization */ +-#ifndef CONFIG_ENV_SIZE ++#if defined(CONFIG_TARGET_NITROGEN6X) ++#define CONFIG_ENV_SIZE SZ_128K ++#else + #define CONFIG_ENV_SIZE (8 * 1024) + #endif +
  21. Download patch debian/patches/tools-generic-builds.patch

    --- 2019.07+dfsg-1/debian/patches/tools-generic-builds.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/tools-generic-builds.patch 2020-01-22 10:52:16.000000000 +0000 @@ -1,11 +1,9 @@ Description: Enable generic tools build Author: Hector Oron <zumbi@debian.org> -Index: u-boot/tools/Makefile -=================================================================== ---- u-boot.orig/tools/Makefile -+++ u-boot/tools/Makefile -@@ -54,7 +54,7 @@ HOSTCFLAGS_xway-swap-bytes.o := -pedanti +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -53,7 +53,7 @@ hostprogs-y += mkenvimage mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o
  22. Download patch debian/u-boot-sifive.install

    --- 2019.07+dfsg-1/debian/u-boot-sifive.install 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-sifive.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -debian/bin/u-boot-install-targets sifive "doc/README.sifive-fu540"
  23. Download patch debian/patches/series

    --- 2019.07+dfsg-1/debian/patches/series 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/series 2020-02-11 10:43:57.000000000 +0000 @@ -19,7 +19,11 @@ test-imagetools-test-fixes exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch -# Patches to fix https://bugs.debian.org/923379 -dreamplug/Commit-ARM-CPU-arm926ejs-Consolidate-cache-routines-.patch - -qemu-riscv64/qemu-riscv64-raw-initrd.patch +rpi2-rpi3-config-tweaks.patch +lzo-to-lzno.patch +ubuntu-hardening-limit-keynames-to-keydir.patch +ubuntu-nitrogen6q2g-config-tweaks.patch +rpi4.patch +rpi-board-dt.patch +python2.patch +ubuntu-nitrogen6q2g-temporary-config-fixup.patch
  24. Download patch debian/patches/ensure-config-sandbox-for-make-env.patch

    --- 2019.07+dfsg-1/debian/patches/ensure-config-sandbox-for-make-env.patch 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/ensure-config-sandbox-for-make-env.patch 2020-01-22 10:52:16.000000000 +0000 @@ -2,11 +2,9 @@ Ensure that CONFIG_SANDBOX is set when r failure to build caused by config_distro_bootcmd.h following the wrong codepath... -Index: u-boot/include/configs/sandbox.h -=================================================================== ---- u-boot.orig/include/configs/sandbox.h -+++ u-boot/include/configs/sandbox.h -@@ -74,6 +74,9 @@ +--- a/include/configs/sandbox.h ++++ b/include/configs/sandbox.h +@@ -63,6 +63,9 @@ func(HOST, host, 1) \ func(HOST, host, 0)
  25. Download patch debian/patches/lzo-to-lzno.patch

    --- 2019.07+dfsg-1/debian/patches/lzo-to-lzno.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/lzo-to-lzno.patch 2020-01-22 10:52:16.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Dave Jones <dave.jones@canonical.com> +Description: Remove lzo as a dependency + On ubuntu, while gzip is in the main archive, lzop is in universe. In order + to avoid having to add lzop to main, and given that only a single + configuration is affected, the dra7xx configuration is adjusted to use + gzip compression for multi-dtb FIT images over lzo (the default). +Forwarded: not-needed +--- a/configs/dra7xx_evm_defconfig ++++ b/configs/dra7xx_evm_defconfig +@@ -34,6 +34,8 @@ + CONFIG_DEFAULT_DEVICE_TREE="dra7-evm" + CONFIG_OF_LIST="dra7-evm dra72-evm dra72-evm-revc dra71-evm dra76-evm" + CONFIG_SPL_MULTI_DTB_FIT=y ++CONFIG_SPL_MULTI_DTB_FIT_LZO=n ++CONFIG_SPL_MULTI_DTB_FIT_GZIP=y + CONFIG_SPL_MULTI_DTB_FIT_UNCOMPRESS_SZ=0x9000 + CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" + # CONFIG_ENV_IS_IN_FAT is not set
  26. Download patch debian/u-boot-rpi.install

    --- 2019.07+dfsg-1/debian/u-boot-rpi.install 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-rpi.install 2020-01-22 10:52:16.000000000 +0000 @@ -1,2 +1,4 @@ #!/bin/sh debian/bin/u-boot-install-targets rpi + +echo debian/bin/rpi-config-migration /usr/share/u-boot
  27. Download patch debian/patches/python2.patch

    --- 2019.07+dfsg-1/debian/patches/python2.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/python2.patch 2020-01-23 22:41:17.000000000 +0000 @@ -0,0 +1,61 @@ +Author: Dave Jones <dave.jones@canonical.com> +Description: Use the python2 interpreter explicitly rather than python + As part of the deprecation of python2, the "python" symlink should no longer + be used in the shebang of scripts. This patch replaces all such occurrences + with "python2" explicitly. +--- a/arch/arm/mach-rockchip/make_fit_atf.py ++++ b/arch/arm/mach-rockchip/make_fit_atf.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + """ + # SPDX-License-Identifier: GPL-2.0+ + # +--- a/lib/libfdt/test_libfdt.py ++++ b/lib/libfdt/test_libfdt.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import os + import sys +--- a/tools/concurrencytest/concurrencytest.py ++++ b/tools/concurrencytest/concurrencytest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # SPDX-License-Identifier: GPL-2.0+ + # + # Modified by: Corey Goldberg, 2013 +--- a/tools/dtoc/dtb_platdata.py ++++ b/tools/dtoc/dtb_platdata.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # SPDX-License-Identifier: GPL-2.0+ + # + # Copyright (C) 2017 Google, Inc +--- a/tools/dtoc/fdt.py ++++ b/tools/dtoc/fdt.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # SPDX-License-Identifier: GPL-2.0+ + # + # Copyright (C) 2016 Google, Inc +--- a/tools/dtoc/fdt_util.py ++++ b/tools/dtoc/fdt_util.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # SPDX-License-Identifier: GPL-2.0+ + # + # Copyright (C) 2016 Google, Inc +--- a/tools/dtoc/test_fdt.py ++++ b/tools/dtoc/test_fdt.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # SPDX-License-Identifier: GPL-2.0+ + # Copyright (c) 2018 Google, Inc + # Written by Simon Glass <sjg@chromium.org>
  28. Download patch debian/u-boot-omap.README.Debian

    --- 2019.07+dfsg-1/debian/u-boot-omap.README.Debian 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-omap.README.Debian 2020-01-22 10:52:16.000000000 +0000 @@ -2,17 +2,19 @@ At this point, you must install U-Boot to flash yourself. -The BeagleBone Black (am335x_boneblack) can be flashed to microSD or eMMC -directly: +The BeagleBone Black (am335x_evm) can be flashed to microSD or eMMC +directly, but requires a partition start sector of 8192 (default is +usually 2048) if you intend to use the first partition for anything: dd conv=fsync,notrunc seek=256 if=/usr/lib/u-boot/am335x_evm/MLO of=/dev/mmcblkX dd conv=fsync,notrunc seek=768 if=/usr/lib/u-boot/am335x_evm/u-boot.img of=/dev/mmcblkX -The am335x_evm supports multiple targets (BeagleBone, BeagleBone -Black, BeagleBone Green, PocketBeagle) and can be installed to the -same offsets, but the first partition should start at 4MB (sector -8192) rather than the typical 1MB (sector 2048), as it is large enough -to overlap with the start of the partition. +Alternately, you can install the MLO as above, and create a small FAT +partition, and copy the u-boot.img to that partition: + + dd conv=fsync,notrunc seek=256 if=/usr/lib/u-boot/am335x_evm/MLO of=/dev/mmcblkX + mount /dev/mmcblkXp1 /mnt + cp -vb /usr/lib/u-boot/am335x_evm/u-boot.img /mnt/ On OpenPandora: @@ -22,5 +24,3 @@ On OpenPandora: == U-Boot environment tools == fw_printenv / fw_setenv read /etc/fw_env.config for configuration. - - -- Vagrant Cascadian <vagrant@debian.org>, Thu, 16 May 2019 20:57:30 -0700
  29. Download patch debian/u-boot-qemu.install

    --- 2019.07+dfsg-1/debian/u-boot-qemu.install 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-qemu.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -debian/bin/u-boot-install-targets qemu
  30. Download patch debian/patches/no-force-CROSS_COMPILE-powerpc.diff

    --- 2019.07+dfsg-1/debian/patches/no-force-CROSS_COMPILE-powerpc.diff 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/no-force-CROSS_COMPILE-powerpc.diff 2020-01-22 10:52:16.000000000 +0000 @@ -1,10 +1,8 @@ Debian typically builds natively, so disable forced use of cross-compile. -Index: u-boot/arch/powerpc/config.mk -=================================================================== ---- u-boot.orig/arch/powerpc/config.mk -+++ u-boot/arch/powerpc/config.mk +--- a/arch/powerpc/config.mk ++++ b/arch/powerpc/config.mk @@ -3,10 +3,6 @@ # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  31. Download patch debian/patches/rpi2-rpi3-config-tweaks.patch

    --- 2019.07+dfsg-1/debian/patches/rpi2-rpi3-config-tweaks.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/rpi2-rpi3-config-tweaks.patch 2020-01-22 10:52:16.000000000 +0000 @@ -0,0 +1,66 @@ +Author: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> +Description: Configuration adjustments to the RPi2 and RPi3 configs + Based off of the original rpi2-config-tweaks.patch created by Steve Langasek. + To keep the snappy rpi2 and rpi3 configs in sync with what we have in archive, + we're tweaking the config so it's as close as possible what's used in the + rpi* gadgets. + +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -13,6 +13,12 @@ + #define CONFIG_SKIP_LOWLEVEL_INIT + #endif + ++#if defined(CONFIG_TARGET_RPI_3) || \ ++ defined(CONFIG_TARGET_RPI_3_32B) || \ ++ defined(CONFIG_TARGET_RPI_2) ++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT ++#endif ++ + /* Architecture, CPU, etc.*/ + #define CONFIG_ARCH_CPU_INIT + +@@ -71,9 +77,19 @@ + #define CONFIG_SYS_CBSIZE 1024 + + /* Environment */ ++#if defined(CONFIG_TARGET_RPI_3) || defined(CONFIG_TARGET_RPI_3_32B) ++#define FAT_ENV_FILE "uboot.env" ++#define CONFIG_ENV_SIZE SZ_128K ++#define CONFIG_PREBOOT \ ++ "usb start; if test ! \"mmc dev 0\"; then " \ ++ "fatload usb 0:1 0x3000000 "FAT_ENV_FILE"; " \ ++ "env import -b 0x3000000; " \ ++ "fi;" ++#else + #define CONFIG_ENV_SIZE SZ_16K +-#define CONFIG_SYS_LOAD_ADDR 0x1000000 + #define CONFIG_PREBOOT "usb start" ++#endif ++#define CONFIG_SYS_LOAD_ADDR 0x1000000 + + /* Shell */ + +--- a/configs/rpi_2_defconfig ++++ b/configs/rpi_2_defconfig +@@ -38,3 +38,4 @@ + CONFIG_CONSOLE_SCROLL_LINES=10 + CONFIG_PHYS_TO_BUS=y + CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SUPPORT_RAW_INITRD=y +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -41,3 +41,5 @@ + CONFIG_CONSOLE_SCROLL_LINES=10 + CONFIG_PHYS_TO_BUS=y + CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SUPPORT_RAW_INITRD=y ++CONFIG_ENV_IS_IN_FAT=y +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig +@@ -41,3 +41,5 @@ + CONFIG_CONSOLE_SCROLL_LINES=10 + CONFIG_PHYS_TO_BUS=y + CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_SUPPORT_RAW_INITRD=y ++CONFIG_ENV_IS_IN_FAT=y
  32. Download patch debian/u-boot-sifive.lintian-overrides

    --- 2019.07+dfsg-1/debian/u-boot-sifive.lintian-overrides 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/u-boot-sifive.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ - -# There are no file conflicts across architectures for u-boot, as each -# target is only installed on a single architecture. In theory, some -# targets could be built on multiple architectures, but could instead install -# the package for the architecture needed. -u-boot-sifive binary: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/*/uboot.elf - -# These bootloaders need to be statically linked. -u-boot-sifive binary: statically-linked-binary usr/lib/u-boot/*/uboot.elf - -# These are bootloader binaries, and have no external dependency information -u-boot-sifive binary: shared-lib-without-dependency-information usr/lib/u-boot/*/uboot.elf - -u-boot-sifive: description-synopsis-starts-with-article -
  33. Download patch debian/patches/arndale/board-spl-rule.diff

    --- 2019.07+dfsg-1/debian/patches/arndale/board-spl-rule.diff 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/arndale/board-spl-rule.diff 2020-01-22 10:52:16.000000000 +0000 @@ -1,11 +1,9 @@ Description: Add spl/arndale-spl.bin rule Author: Ian Campbell <ijc@debian.org> -Index: u-boot/Makefile -=================================================================== ---- u-boot.orig/Makefile -+++ u-boot/Makefile -@@ -1406,6 +1406,9 @@ spl/u-boot-spl.sfp: spl/u-boot-spl +--- a/Makefile ++++ b/Makefile +@@ -1674,6 +1674,9 @@ spl/boot.bin: spl/u-boot-spl @:
  34. Download patch debian/bin/u-boot-install-sunxi64

    --- 2019.07+dfsg-1/debian/bin/u-boot-install-sunxi64 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/bin/u-boot-install-sunxi64 2020-01-22 10:52:16.000000000 +0000 @@ -6,12 +6,9 @@ if [ -z "$TARGET" ] && [ -f "${dtmodel}" case $(cat "${dtmodel}") in Pinebook) TARGET="/usr/lib/u-boot/pinebook" ;; Pine64+) TARGET="/usr/lib/u-boot/pine64_plus" ;; - "Pine64 LTS") TARGET="/usr/lib/u-boot/pine64-lts" ;; "Olimex A64-Olinuxino") TARGET="/usr/lib/u-boot/a64-olinuxino/" ;; "Olimex A64 Teres-I") TARGET="/usr/lib/u-boot/teres_i/" ;; "OrangePi Zero Plus2") TARGET="/usr/lib/u-boot/orangepi_zero_plus2/" ;; - "FriendlyARM NanoPi NEO 2") TARGET="/usr/lib/u-boot/nanopi_neo2/" ;; - "FriendlyARM NanoPi NEO Plus2") TARGET="/usr/lib/u-boot/nanopi_neo_plus2/" ;; esac fi
  35. Download patch debian/patches/rpi-board-dt.patch

    --- 2019.07+dfsg-1/debian/patches/rpi-board-dt.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/rpi-board-dt.patch 2020-01-22 10:52:16.000000000 +0000 @@ -0,0 +1,62 @@ +Author: Dave Jones <dave.jones@canonical.com> +Description: Use the board's device-tree rather than embedded + Our u-boot binaries should accept the device-tree passed by the firmware + rather than use an embedded one. Firstly, the OF_EMBED option is actively + discouraged by u-boot itself, and secondly it allows the same binary to + operate correctly on platforms with differing serial configurations, e.g. the + Pi 3 and Compute Module 3. +--- a/configs/rpi_2_defconfig ++++ b/configs/rpi_2_defconfig +@@ -14,7 +14,7 @@ + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -15,7 +15,7 @@ + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig +@@ -15,7 +15,7 @@ + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -15,7 +15,7 @@ + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_DEFAULT_DEVICE_TREE="bcm2838-rpi-4-b" + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -15,7 +15,7 @@ + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_DEFAULT_DEVICE_TREE="bcm2838-rpi-4-b" + CONFIG_ENV_FAT_INTERFACE="mmc" + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
  36. Download patch debian/patches/rpi4.patch
  37. Download patch debian/patches/mx53loco

    --- 2019.07+dfsg-1/debian/patches/mx53loco 2019-07-08 21:53:52.000000000 +0000 +++ 2019.07+dfsg-1ubuntu6/debian/patches/mx53loco 2020-01-22 10:52:16.000000000 +0000 @@ -1,10 +1,8 @@ Enables support for ext4, the "load" command, and using bootz with raw initrds. -Index: u-boot/configs/mx53loco_defconfig -=================================================================== ---- u-boot.orig/configs/mx53loco_defconfig -+++ u-boot/configs/mx53loco_defconfig -@@ -20,6 +20,7 @@ CONFIG_CMD_DHCP=y +--- a/configs/mx53loco_defconfig ++++ b/configs/mx53loco_defconfig +@@ -19,6 +19,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y
  1. u-boot