diff --git a/debian/changelog b/debian/changelog index bd8cceea4..3b72f591d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,68 @@ +u-boot (2022.01+dfsg-2ubuntu1) jammy; urgency=medium + + [ Dave Jones ] + * Merge from Debian unstable (LP: #1964365). Remaining changes: + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - Enable FIT signing support + - Limit key names to keys within the keydir. + - Enable Ubuntu support for the Nitrogen6x board + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + - Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + - Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support + - Add d/p/rpi-maxargs.patch for new Core 18 boot-env + - Removed d/u-boot-rpi.postinst. The task of copying the u-boot binaries + to the boot partition is now performed by flash-kernel + - Revert '* debian/rules: Ensure debugging symbols are enabled.' as it + breaks riscv64 booting. + - Implement u-boot-sifive.postinst to upgrade u-boot in loader1/loader2 + partitions upon package upgrades. Maybe this should move to flash- + kernel, and update SPI too. + - Provide compat symlinks for old unleashed & unmatched platform names + - sifive boards: re-enable back USE_PREBOOT< it used to be there in + 2021.01 releases, and I suspect it affects unleashed bootability. + - In postinst support Unmatched model name without A00 suffix, as used by + meta-sifive kernels and may be contributed upstream in the future. + - Fix Unleashed name typo that resulted in an unbootable image due to + missing OpenSBI. + * Removed obsolete patches/changes: + - fix cmd_sysconfig in qemu + - set default fdtfile names for sifive boards + - Drop unleashed hunk from + riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch, as + the same preboot is specified in unleashed board include. + - Cherrypick patch from Heinrich Schuchardt (xypron) to fix failure to + boot on Unmatched. + - Drop 75efe7dc996ddb9835590b1a8970f19b5c4b1ade.patch included upstream. + - Remove unreferenced fe01f41d57b79d9ca94604503a25e55175744d42.patch, + included as riscv64/0013-riscv-sifive-Set-default-fdtfile-names.patch. + - Build against opensbi with reboot support on Unmatched + - Add missing trailing \n to arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig. + Fixes a rare (but reliable) FTBFS from check-config.sh. In the original + case on LP armhf, mach-imx/Kconfig sorted immediately after + cmd_stm32prog/Kconfig, causing lines to run together and the sed to not + match the "config HAS_CAAM" line, causing the dh_imx6 defconfig to + appear invalid. + - Import meta-sifive patch series. + - Refreshed rk3399 patches for new release + * Refreshed patches for new release + * Re-added target for nitrogen6q2 u-boot binary (missed in prior merge) + * Fixed nitrogen6q2g patch to build properly on armhf + + [ Heinrich Schuchardt ] + * d/p/efivars-commands.patch: Enable commands for displaying and configuring + the UEFI environment + * d/p/efi-part-list.patch: Permit listing of non-contiguous partitions in + GPT tables + * d/p/efi-loader-copy-guid.patch: Copy GUID in InstallProtocolInterface to + avoid crash with systemd-boot + + -- Dave Jones Thu, 10 Mar 2022 16:54:01 +0000 + u-boot (2022.01+dfsg-2) unstable; urgency=medium * debian/patches: Fix building qemu-ppce500 target with binutils @@ -86,6 +151,109 @@ u-boot (2021.07+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Sat, 24 Jul 2021 18:35:37 -0700 +u-boot (2021.07+dfsg-0ubuntu10) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Fri, 03 Dec 2021 14:16:56 +0000 + +u-boot (2021.07+dfsg-0ubuntu9) jammy; urgency=medium + + * No change rebuild with new opensbi snapshot. + + -- Dimitri John Ledkov Tue, 02 Nov 2021 12:41:21 +0000 + +u-boot (2021.07+dfsg-0ubuntu8) impish; urgency=medium + + * Add missing trailing \n to arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig. + Fixes a rare (but reliable) FTBFS from check-config.sh. In the original + case on LP armhf, mach-imx/Kconfig sorted immediately after + cmd_stm32prog/Kconfig, causing lines to run together and the sed to not + match the "config HAS_CAAM" line, causing the dh_imx6 defconfig to appear + invalid. + + -- William Grant Wed, 13 Oct 2021 20:05:23 +1100 + +u-boot (2021.07+dfsg-0ubuntu7) impish; urgency=medium + + * Fix Unleashed name typo that resulted in an unbootable image due to + missing OpenSBI (LP: #1946913). + + -- William Grant Wed, 13 Oct 2021 14:59:55 +1100 + +u-boot (2021.07+dfsg-0ubuntu6) impish; urgency=medium + + * Build against opensbi with reboot support on Unmatched + * In postinst support Unmatched model name without A00 suffix, as used + by meta-sifive kernels and may be contributed upstream in the future. + + -- Dimitri John Ledkov Wed, 25 Aug 2021 17:22:24 +0100 + +u-boot (2021.07+dfsg-0ubuntu4) impish; urgency=medium + + * sifive boards: re-enable back USE_PREBOOT< it used to be there in + 2021.01 releases, and I suspect it affects unleashed bootability. + * control: add crust-firmware build-dep, it is now available in the + archive. + * Remove unreferenced fe01f41d57b79d9ca94604503a25e55175744d42.patch, + included as riscv64/0013-riscv-sifive-Set-default-fdtfile-names.patch. + * Skip removed/incorrect 0ubuntu3 upload. + + -- Dimitri John Ledkov Wed, 04 Aug 2021 11:18:25 +0100 + +u-boot (2021.07+dfsg-0ubuntu2) impish; urgency=medium + + * Import meta-sifive patch series. + + -- Dimitri John Ledkov Fri, 23 Jul 2021 17:14:09 +0100 + +u-boot (2021.07+dfsg-0ubuntu1) impish; urgency=medium + + * New upstream release. + - Drop 75efe7dc996ddb9835590b1a8970f19b5c4b1ade.patch included upstream. + + -- Dimitri John Ledkov Fri, 23 Jul 2021 12:45:26 +0100 + +u-boot (2021.07~rc4+dfsg-1ubuntu2) impish; urgency=medium + + * Cherrypick patch from Heinrich Schuchardt (xypron) to fix failure to + boot on Unmatched. LP: #1937246 + + -- Dimitri John Ledkov Thu, 22 Jul 2021 12:33:49 +0100 + +u-boot (2021.07~rc4+dfsg-1ubuntu1) impish; urgency=medium + + * Merge from Debian Experimental, remaining changes: + - Implement u-boot-sifive.postinst to upgrade u-boot in + loader1/loader2 partitions upon package upgrades. LP: #1936370 Maybe + this should move to flash-kernel, and update SPI too. + - Revert '* debian/rules: Ensure debugging symbols are enabled.' as it + breaks riscv64 booting. + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - Enable FIT signing support + - Limit key names to keys within the keydir. + - Enable Ubuntu support for the Nitrogen6x board + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + - Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + - Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support + - Add d/p/rpi-maxargs.patch for new Core 18 boot-env + * Cherrypick upstream patches to: + - fix cmd_sysconfig in qemu + - set default fdtfile names for sifive boards + * Provide compat symlinks for old unleashed & unmatched platform names + * Drop unleashed hunk from + riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch, as + the same preboot is specified in unleashed board include. + * Drop crust-firmware build-dep, until it is available in Ubuntu, + currently in impish NEW queue. + + -- Dimitri John Ledkov Tue, 20 Jul 2021 12:30:01 +0100 + u-boot (2021.07~rc4+dfsg-1) experimental; urgency=medium [ Nicolas Boulenguez ] @@ -169,6 +337,55 @@ u-boot (2021.04~rc3+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Fri, 12 Mar 2021 16:22:35 -0800 +u-boot (2021.01+dfsg-4ubuntu3) impish; urgency=medium + + * Implement u-boot-sifive.postinst to upgrade u-boot in loader1/loader2 + partitions upon package upgrades. LP: #1936370 + + -- Dimitri John Ledkov Thu, 15 Jul 2021 13:01:50 +0100 + +u-boot (2021.01+dfsg-4ubuntu2) impish; urgency=medium + + * Revert '* debian/rules: Ensure debugging symbols are enabled.' as it + breaks riscv64 booting. + + -- Dimitri John Ledkov Wed, 02 Jun 2021 16:52:03 +0100 + +u-boot (2021.01+dfsg-4ubuntu1) impish; urgency=medium + + * Merge from Debian unstable (LP: #1928777). Remaining changes: + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - Enable FIT signing support + - Limit key names to keys within the keydir. + - Enable Ubuntu support for the Nitrogen6x board + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + - Enable u-boot spl for unleashed. + - Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + - Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support + - Add d/p/rpi-maxargs.patch for new Core 18 boot-env + - Import meta-sifive u-boot patches. + - Enable sifive_hifive_unmatched_fu740 target. + - Build-depend on opensbi with fu740 errata fix. + - Set default FDT files for the sifive boards. + - Set USE_PREBOOT on unmatched board too (just like unleashed & qemu), + otherwise u-boot's fdtfile from itb is not used (i.e. when extlinux.conf + does not specify fdtdir). LP: #1923162 + - Unapply unmatched patches, whilst building unleashed platform. Fixes + failure to boot from sd-card on Unleashed. LP: #1924761 + - Skip processing fdtdir on qemu-riscv64_smode target, as it crashes the + riscv qemu VM. LP: #1925267 LP: #1923162 + - sifive-unleashed-default-fdt-files.patch: split into unleashed & + unmatched separate patches, for ease of upstreaming to meta-sifive and + u-boot upstreams. Also this ensures that unleashed target is built with + fdtfile= set, as unleashed target unapplies lots of patches. + + -- Dave Jones Tue, 18 May 2021 11:07:17 +0100 + u-boot (2021.01+dfsg-4) unstable; urgency=medium [ Arnaud Ferraris ] @@ -184,6 +401,83 @@ u-boot (2021.01+dfsg-4) unstable; urgency=medium -- Vagrant Cascadian Fri, 12 Mar 2021 15:00:43 -0800 +u-boot (2021.01+dfsg-3ubuntu9) hirsute; urgency=medium + + * sifive-unleashed-default-fdt-files.patch: split into unleashed & + unmatched separate patches, for ease of upstreaming to meta-sifive and + u-boot upstreams. Also this ensures that unleashed target is built + with fdtfile= set, as unleashed target unapplies lots of patches. + + -- Dimitri John Ledkov Wed, 21 Apr 2021 18:05:00 +0100 + +u-boot (2021.01+dfsg-3ubuntu8) hirsute; urgency=medium + + * Skip processing fdtdir on qemu-riscv64_smode target, as it crashes the + riscv qemu VM. LP: #1925267 LP: #1923162 + + -- Dimitri John Ledkov Wed, 21 Apr 2021 01:25:13 +0100 + +u-boot (2021.01+dfsg-3ubuntu7) hirsute; urgency=medium + + * Unapply unmatched patches, whilst building unleashed platform. Fixes + failure to boot from sd-card on Unleashed. LP: #1924761 + + -- Dimitri John Ledkov Fri, 16 Apr 2021 14:07:49 +0100 + +u-boot (2021.01+dfsg-3ubuntu6) hirsute; urgency=medium + + * Set USE_PREBOOT on unmatched board too (just like unleashed & qemu), + otherwise u-boot's fdtfile from itb is not used (i.e. when + extlinux.conf does not specify fdtdir). LP: #1923162 + + -- Dimitri John Ledkov Tue, 13 Apr 2021 14:52:32 +0100 + +u-boot (2021.01+dfsg-3ubuntu5) hirsute; urgency=medium + + * Set default FDT files for the sifive boards. + + -- Dimitri John Ledkov Tue, 16 Mar 2021 18:03:09 +0000 + +u-boot (2021.01+dfsg-3ubuntu4) hirsute; urgency=medium + + * Update patch for unmatched. + + -- Dimitri John Ledkov Mon, 15 Mar 2021 21:26:35 +0000 + +u-boot (2021.01+dfsg-3ubuntu3) hirsute; urgency=medium + + * Update patches for unmatched. + + -- Dimitri John Ledkov Mon, 15 Mar 2021 16:29:23 +0000 + +u-boot (2021.01+dfsg-3ubuntu2) hirsute; urgency=medium + + * Import meta-sifive u-boot patches. + * Enable sifive_hifive_unmatched_fu740 target. + * Build-depend on opensbi with fu740 errata fix. + + -- Dimitri John Ledkov Wed, 10 Mar 2021 12:27:57 +0000 + +u-boot (2021.01+dfsg-3ubuntu1) hirsute; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - Enable FIT signing support + - Limit key names to keys within the keydir. + - Enable Ubuntu support for the Nitrogen6x board + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + - Enable u-boot spl for unleashed. + - Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + - Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support + - Add d/p/rpi-maxargs.patch for new Core 18 boot-env + + -- Dave Jones Wed, 10 Mar 2021 12:02:04 +0000 + u-boot (2021.01+dfsg-3) unstable; urgency=medium [ Domenico Andreoli ] @@ -216,6 +510,33 @@ u-boot (2021.01+dfsg-3) unstable; urgency=medium -- Vagrant Cascadian Mon, 01 Mar 2021 00:00:18 -0800 +u-boot (2021.01+dfsg-2ubuntu1) hirsute; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - Enable FIT signing support + - Limit key names to keys within the keydir. + - Enable Ubuntu support for the Nitrogen6x board + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + - Enable u-boot spl for unleashed. + - Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + - Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support + - Add d/p/rpi-maxargs.patch for new Core 18 boot-env + * Dropped changes, included in Debian: + - Enable FIT signing support + - Enable CONFIG_FIT_SIGNATURE so we can sign FIT images. + - Add libssl-dev to Build-Depends: to enable crypto functionality. + * Dropped changes, no longer needed: + - Added d/u-boot-rpi.postinst to install u-boot binaries + (previously unnoted) + + -- Dave Jones Thu, 18 Feb 2021 18:15:04 +0000 + u-boot (2021.01+dfsg-2) unstable; urgency=medium * debian/patches: Disable USE_PREBOOT on rockpro64 and pinebook-pro to @@ -331,6 +652,63 @@ u-boot (2020.10+dfsg-2) unstable; urgency=medium -- Vagrant Cascadian Mon, 04 Jan 2021 19:59:11 -0800 +u-boot (2020.10+dfsg-1ubuntu6) hirsute; urgency=medium + + * Add d/p/rpi-8gb-pci.patch for Pi400 and Pi4-8Gb support (LP: #1906552) + * Add d/p/rpi-cm4-sdhci.patch for CM4 eMMC support + * Add d/p/rpi-maxargs.patch for new Core 18 boot-env (LP: #1910094) + * Remove redundant d/targets entries + + -- Dave Jones Thu, 10 Dec 2020 23:44:09 +0000 + +u-boot (2020.10+dfsg-1ubuntu5) hirsute; urgency=medium + + * Use flat binary rather than ELF OpenSBI; U-Boot SPL doesn't support ELF. + * Switch back to generic OpenSBI, as modern versions detect the platform. + + -- William Grant Mon, 21 Dec 2020 10:32:59 +1100 + +u-boot (2020.10+dfsg-1ubuntu4) hirsute; urgency=medium + + * Use the right opensbi fw_dynamic for fu540. + + -- Dimitri John Ledkov Tue, 08 Dec 2020 09:04:00 +0000 + +u-boot (2020.10+dfsg-1ubuntu3) hirsute; urgency=medium + + * Enable u-boot spl for unleashed. LP: #1905274 + + -- Dimitri John Ledkov Mon, 23 Nov 2020 12:51:03 +0000 + +u-boot (2020.10+dfsg-1ubuntu2) hirsute; urgency=medium + + * No-change rebuild to build with python3.9 as default. + + -- Matthias Klose Thu, 19 Nov 2020 18:38:58 +0100 + +u-boot (2020.10+dfsg-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - 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. + - 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. + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + + * Removed obsolete patches/changes: + - 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. + + -- Dave Jones Tue, 06 Oct 2020 03:18:18 +0000 + u-boot (2020.10+dfsg-1) unstable; urgency=medium * New upstream release. @@ -416,6 +794,53 @@ u-boot (2020.07~rc2+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Mon, 18 May 2020 17:16:07 -0700 +u-boot (2020.04+dfsg-2ubuntu1) groovy; urgency=medium + + * Merge with 2020.04+dfsg-2 from Debian unstable. Remaining changes: + - 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. + - 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. + - d/p/rpi-config-tweaks.patch: Configuration adjustments to the RPi + configs + - 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. + - d/p/rpi-board-dt.patch: use the board's device-tree instead of an + embedded one + + * Removed obsolete patches/changes: + - Handle differing root partition labels during migration + - Add script to migrate old boot configurations to split, selective style + - Don't attempt config migration when /boot/firmware is a chroot + - Use vc4-fkms-v3d overlay on all models of Raspberry Pi + - Do not include the vc4-fkms-v3d overlay; this breaks book on the 3A+ + - Ensure boot.scr is from recent flash-kernel + - d/p/rpi-import-mkknlimg.patch import tools/mkknlimg from Xenial/raspi2 - + scripts/mkknlimg @ 83a3ebb + - Remove redundant d/p/rpi-import-mkknlimg.patch + - 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. + + * Removed patches obsoleted/merged by upstream: + - Use python2 for the build. + - Added d/p/python2.patch to fix-up remaining scripts still using bare + "python" + - d/p/am57xx/omap5_distro_bootcmd + - Correct odroid README paths + - Add d/p/rpi4.patch to support Raspberry Pi 4 boot + - Avoid device-tree memory fixup on Raspberry Pi 4; this allows access to + the all the RAM on models with more than 1Gb + - Add missing build dependency on arm/arm64 + + -- Dave Jones Sat, 16 May 2020 01:02:53 +0000 + u-boot (2020.04+dfsg-2) unstable; urgency=medium * debian/patches: @@ -561,6 +986,68 @@ u-boot (2019.10~rc4+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Tue, 24 Sep 2019 01:03:23 -0700 +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 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 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 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 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 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 Tue, 23 Jul 2019 10:02:04 +0000 + u-boot (2019.07+dfsg-1) experimental; urgency=medium * New upstream release. @@ -667,6 +1154,48 @@ u-boot (2019.07~rc1+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Fri, 03 May 2019 16:58:13 -0700 +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 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 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 Mon, 03 Jun 2019 14:41:23 +0000 + u-boot (2019.04+dfsg-2) experimental; urgency=medium [ Vagrant Cascadian ] @@ -867,6 +1396,29 @@ u-boot (2018.07+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Mon, 09 Jul 2018 13:34:06 -0700 +u-boot (2018.07~rc3+dfsg1-0ubuntu2) disco; urgency=medium + + * d/control: Add missing dependency on binutils (for strings) (LP: #1814930) + + -- Dave Jones Wed, 06 Feb 2019 16:40:22 +0000 + +u-boot (2018.07~rc3+dfsg1-0ubuntu1) disco; urgency=medium + + * New interim upstream release. + - We pull in an rc version because that's the u-boot version we use in + our current core18 images and we want to provide 'feature parity'. + * debian/control: + - Added missing build-deps bison and flex. + * debian/patches: + - Refresh am57xx/omap5_distro_bootcmd. + - Refreshed patches. + - Removed odroid-xu3/bootdelay which was applied upstream. + - Add lzo-to-lzno.patch to 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. + + -- Dave Jones Fri, 11 Jan 2019 16:43:27 +0000 + u-boot (2018.07~rc2+dfsg-1) experimental; urgency=medium * New upstream release candidate: @@ -928,6 +1480,26 @@ u-boot (2018.05~rc2+dfsg-1) experimental; urgency=medium -- Vagrant Cascadian Tue, 17 Apr 2018 16:05:55 -0700 +u-boot (2018.03+dfsg1-2ubuntu2) disco; urgency=medium + + * debian/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. + + -- Łukasz 'sil2100' Zemczak Thu, 29 Nov 2018 01:16:07 +0100 + +u-boot (2018.03+dfsg1-2ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - rpi-import-mkknlimg.patch import tools/mkknlimg from Xenial/raspi2 - + scripts/mkknlimg @ 83a3ebb + * debian/patches/rpi2-rpi3-config-tweaks.patch: basing on the earlier + rpi2-config-tweaks.patch, make configuration adjustments to the rpi2 and + rpi3 configs. + + -- Łukasz 'sil2100' Zemczak Fri, 27 Apr 2018 12:38:24 +0100 + u-boot (2018.03+dfsg1-2) unstable; urgency=medium [ Riku Voipio ] @@ -1404,6 +1976,26 @@ u-boot (2016.05~rc3+dfsg1-1) experimental; urgency=medium -- Vagrant Cascadian Sat, 30 Apr 2016 18:53:04 -0700 +u-boot (2016.03+dfsg1-6ubuntu2) zesty; urgency=medium + + * From upstream u-boot: (LP: #1636838) + - debian/patches/rpi-import-mkknlimg.patch: import tools/mkknlimg from + Xenial/raspi2 - scripts/mkknlimg @ 83a3ebb + - debian/u-boot-rpi.postinst: pass u-boot.bin through mkknlimg before + installing it as /boot/firmware/uboot.bin + - debian/patches/serial-pl01x-Add-support-for-devices-with-the-rate-p.patch: + Skip serial clock initialization when it's done by the firmware. + + -- Paolo Pisati Wed, 09 Nov 2016 17:09:29 +0200 + +u-boot (2016.03+dfsg1-6ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/rpi2-config-tweaks.patch: configuration adjustments + to the RPi2 config. + + -- Steve Langasek Wed, 06 Jul 2016 17:30:44 -0700 + u-boot (2016.03+dfsg1-6) unstable; urgency=medium [ Vagrant Cascadian ] @@ -1425,6 +2017,14 @@ u-boot (2016.03+dfsg1-6) unstable; urgency=medium -- Vagrant Cascadian Tue, 28 Jun 2016 09:38:27 +0200 +u-boot (2016.03+dfsg1-5ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/rpi2-config-tweaks.patch: configuration adjustments + to the RPi2 config. + + -- Steve Langasek Fri, 10 Jun 2016 21:46:33 -0700 + u-boot (2016.03+dfsg1-5) unstable; urgency=medium [ Vagrant Cascadian ] @@ -1450,6 +2050,14 @@ u-boot (2016.03+dfsg1-5) unstable; urgency=medium -- Vagrant Cascadian Sun, 29 May 2016 14:29:59 -0700 +u-boot (2016.03+dfsg1-4ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/rpi2-config-tweaks.patch: configuration adjustments + to the RPi2 config. + + -- Steve Langasek Tue, 26 Apr 2016 21:06:04 -0700 + u-boot (2016.03+dfsg1-4) unstable; urgency=medium * Add patch to fix detected ram size on Firefly boards by reverting @@ -1508,6 +2116,14 @@ u-boot (2016.03~rc2+dfsg1-1) experimental; urgency=medium -- Vagrant Cascadian Tue, 16 Feb 2016 15:01:48 -0800 +u-boot (2016.01+dfsg1-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/rpi2-config-tweaks.patch: configuration adjustments + to the RPi2 config. + + -- Steve Langasek Thu, 11 Feb 2016 21:55:38 -0800 + u-boot (2016.01+dfsg1-2) unstable; urgency=medium * u-boot-omap: @@ -1521,6 +2137,13 @@ u-boot (2016.01+dfsg1-2) unstable; urgency=medium -- Vagrant Cascadian Mon, 08 Feb 2016 20:14:04 -0800 +u-boot (2016.01+dfsg1-1ubuntu1) xenial; urgency=medium + + * debian/patches/rpi2-config-tweaks.patch: configuration adjustments + to the RPi2 config. + + -- Steve Langasek Tue, 02 Feb 2016 11:43:50 -0800 + u-boot (2016.01+dfsg1-1) unstable; urgency=medium * u-boot-sunxi: Enable orangepi_plus target. @@ -2583,3 +3206,4 @@ u-boot (2010.03-1) unstable; urgency=low * Initial packaging. closes: #583605. -- Clint Adams Fri, 28 May 2010 16:20:39 -0400 + diff --git a/debian/control b/debian/control index a292137f4..a9c32dd42 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: u-boot Section: admin Priority: optional -Maintainer: Vagrant Cascadian +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Vagrant Cascadian Uploaders: Loïc Minier , Clint Adams Build-Depends: arm-trusted-firmware (>= 2.6~) [arm64], @@ -238,6 +239,7 @@ Package: u-boot-rpi Architecture: armel armhf arm64 Multi-Arch: same Depends: ${misc:Depends} +Breaks: flash-kernel (<< 3.104) 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 diff --git a/debian/patches/efi-loader-copy-guid.patch b/debian/patches/efi-loader-copy-guid.patch new file mode 100644 index 000000000..498b3f0f4 --- /dev/null +++ b/debian/patches/efi-loader-copy-guid.patch @@ -0,0 +1,204 @@ +From patchwork Wed Mar 9 21:57:56 2022 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Heinrich Schuchardt +X-Patchwork-Id: 1603587 +Return-Path: +X-Original-To: incoming@patchwork.ozlabs.org +Delivered-To: patchwork-incoming@bilbo.ozlabs.org +Authentication-Results: bilbo.ozlabs.org; + dkim=pass (2048-bit key; + unprotected) header.d=canonical.com header.i=@canonical.com + header.a=rsa-sha256 header.s=20210705 header.b=gkVBx4C4; + dkim-atps=neutral +Authentication-Results: ozlabs.org; + spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de + (client-ip=85.214.62.61; helo=phobos.denx.de; + envelope-from=u-boot-bounces@lists.denx.de; receiver=) +Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) + (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) + key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest + SHA256) + (No client certificate requested) + by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KDR4H2CSHz9ryY + for ; Thu, 10 Mar 2022 09:01:48 +1100 (AEDT) +Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) + by phobos.denx.de (Postfix) with ESMTP id 937D7839A5; + Wed, 9 Mar 2022 23:01:38 +0100 (CET) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=canonical.com +Authentication-Results: phobos.denx.de; + spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de +Authentication-Results: phobos.denx.de; + dkim=pass (2048-bit key; + unprotected) header.d=canonical.com header.i=@canonical.com + header.b="gkVBx4C4"; + dkim-atps=neutral +Received: by phobos.denx.de (Postfix, from userid 109) + id 218E6839A5; Wed, 9 Mar 2022 23:01:36 +0100 (CET) +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de +X-Spam-Level: +X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, + DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, + SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no + version=3.4.2 +Received: from smtp-relay-canonical-0.canonical.com + (smtp-relay-canonical-0.canonical.com [185.125.188.120]) + (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) + (No client certificate requested) + by phobos.denx.de (Postfix) with ESMTPS id 4546B8399B + for ; Wed, 9 Mar 2022 23:01:32 +0100 (CET) +Authentication-Results: phobos.denx.de; + dmarc=pass (p=none dis=none) header.from=canonical.com +Authentication-Results: phobos.denx.de; spf=pass + smtp.mailfrom=heinrich.schuchardt@canonical.com +Received: from LT2ubnt.fritz.box (ip-088-152-144-107.um26.pools.vodafone-ip.de + [88.152.144.107]) + (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) + key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest + SHA256) + (No client certificate requested) + by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 67E883F650; + Wed, 9 Mar 2022 22:01:28 +0000 (UTC) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; + s=20210705; t=1646863288; + bh=5C/Q5wM6qkJMI0BRG6rAEjMukk6fv3LtW68e9cHigL0=; + h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; + b=gkVBx4C4ODnME10Kk0qnLOu6w9JZiZ1AhPUKX0bcmfyy5Ey+lEtYarPfx/0Osxfau + KVAbRKiF8N/sk7D8IT0Cb+3CbE69PQOWD+fXvxhQxoICPz8eF1/OV85rLRhLjEKLet + mbbv6w13dQ0aJoVaKHTrvr0FjXSTfCB5+9I+cp3NGmbXPPDwuJxYB8aoiZRfmmag0J + F/3641hUkN/6WQpe9pu4ixnSOGz6SwfFGt+i6K9agnuDnnunw9MFyCn1LT5phi5hAp + jNfbeaPXzRK9X0TIc4rnk0p9hmGyco284lUuzpEZmi6lvAur6K+d/Te3knjOZvQlKe + umyq0w2n5imyA== +From: Heinrich Schuchardt +To: u-boot@lists.denx.de +Cc: Heinrich Schuchardt , + Joerie de Gram +Subject: [PATCH 1/1] efi_loader: copy GUID in InstallProtocolInterface() +Date: Wed, 9 Mar 2022 22:57:56 +0100 +Message-Id: <20220309215756.17959-1-heinrich.schuchardt@canonical.com> +X-Mailer: git-send-email 2.34.1 +MIME-Version: 1.0 +X-BeenThere: u-boot@lists.denx.de +X-Mailman-Version: 2.1.39 +Precedence: list +List-Id: U-Boot discussion +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Errors-To: u-boot-bounces@lists.denx.de +Sender: "U-Boot" +X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de +X-Virus-Status: Clean + +InstallProtocolInterface() is called with a pointer to the protocol GUID. +There is not guarantee that the memory used by the caller for the protocol +GUID stays allocated. To play it safe the GUID should be copied to U-Boot's +internal structures. + +Reported-by: Joerie de Gram +Signed-off-by: Heinrich Schuchardt +--- + include/efi_loader.h | 2 +- + lib/efi_loader/efi_boottime.c | 14 +++++++------- + lib/efi_loader/efi_image_loader.c | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/include/efi_loader.h b/include/efi_loader.h +index e390d323a9..110d8ae79c 100644 +--- a/include/efi_loader.h ++++ b/include/efi_loader.h +@@ -342,7 +342,7 @@ struct efi_open_protocol_info_item { + */ + struct efi_handler { + struct list_head link; +- const efi_guid_t *guid; ++ const efi_guid_t guid; + void *protocol_interface; + struct list_head open_infos; + }; +diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c +index 82128ac1d5..d0f3e05e70 100644 +--- a/lib/efi_loader/efi_boottime.c ++++ b/lib/efi_loader/efi_boottime.c +@@ -552,7 +552,7 @@ efi_status_t efi_search_protocol(const efi_handle_t handle, + struct efi_handler *protocol; + + protocol = list_entry(lhandle, struct efi_handler, link); +- if (!guidcmp(protocol->guid, protocol_guid)) { ++ if (!guidcmp(&protocol->guid, protocol_guid)) { + if (handler) + *handler = protocol; + return EFI_SUCCESS; +@@ -604,7 +604,7 @@ efi_status_t efi_remove_all_protocols(const efi_handle_t handle) + list_for_each_entry_safe(protocol, pos, &efiobj->protocols, link) { + efi_status_t ret; + +- ret = efi_remove_protocol(handle, protocol->guid, ++ ret = efi_remove_protocol(handle, &protocol->guid, + protocol->protocol_interface); + if (ret != EFI_SUCCESS) + return ret; +@@ -1131,7 +1131,7 @@ efi_status_t efi_add_protocol(const efi_handle_t handle, + handler = calloc(1, sizeof(struct efi_handler)); + if (!handler) + return EFI_OUT_OF_RESOURCES; +- handler->guid = protocol; ++ memcpy((void *)&handler->guid, protocol, sizeof(efi_guid_t)); + handler->protocol_interface = protocol_interface; + INIT_LIST_HEAD(&handler->open_infos); + list_add_tail(&handler->link, &efiobj->protocols); +@@ -1227,7 +1227,7 @@ static efi_status_t efi_get_drivers(efi_handle_t handle, + + /* Count all driver associations */ + list_for_each_entry(handler, &handle->protocols, link) { +- if (protocol && guidcmp(handler->guid, protocol)) ++ if (protocol && guidcmp(&handler->guid, protocol)) + continue; + list_for_each_entry(item, &handler->open_infos, link) { + if (item->info.attributes & +@@ -1249,7 +1249,7 @@ static efi_status_t efi_get_drivers(efi_handle_t handle, + return EFI_OUT_OF_RESOURCES; + /* Collect unique driver handles */ + list_for_each_entry(handler, &handle->protocols, link) { +- if (protocol && guidcmp(handler->guid, protocol)) ++ if (protocol && guidcmp(&handler->guid, protocol)) + continue; + list_for_each_entry(item, &handler->open_infos, link) { + if (item->info.attributes & +@@ -2446,7 +2446,7 @@ static efi_status_t EFIAPI efi_protocols_per_handle( + + protocol = list_entry(protocol_handle, + struct efi_handler, link); +- (*protocol_buffer)[j] = (void *)protocol->guid; ++ (*protocol_buffer)[j] = (void *)&protocol->guid; + ++j; + } + } +@@ -3094,7 +3094,7 @@ close_next: + (efi_handle_t)image_obj) + continue; + r = EFI_CALL(efi_close_protocol +- (efiobj, protocol->guid, ++ (efiobj, &protocol->guid, + info->info.agent_handle, + info->info.controller_handle + )); +diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c +index 5df35939f7..9611398885 100644 +--- a/lib/efi_loader/efi_image_loader.c ++++ b/lib/efi_loader/efi_image_loader.c +@@ -91,7 +91,7 @@ void efi_print_image_infos(void *pc) + + list_for_each_entry(efiobj, &efi_obj_list, link) { + list_for_each_entry(handler, &efiobj->protocols, link) { +- if (!guidcmp(handler->guid, &efi_guid_loaded_image)) { ++ if (!guidcmp(&handler->guid, &efi_guid_loaded_image)) { + efi_print_image_info( + (struct efi_loaded_image_obj *)efiobj, + handler->protocol_interface, pc); diff --git a/debian/patches/efi-part-list.patch b/debian/patches/efi-part-list.patch new file mode 100644 index 000000000..d3ddc1626 --- /dev/null +++ b/debian/patches/efi-part-list.patch @@ -0,0 +1,33 @@ +For GPT partition tables the 'part list' command stops at the first invalid +partition number. But Ubuntu has images with partitions number + + 1, 12, 13, 14, 15 + +In this case only partition 1 was listed by 'part list'. + +Fixes: 38a3021edc54 ("disk: part_efi: remove indent level from loop") +Reported-by: Alexandre Ghiti +Signed-off-by: Heinrich Schuchardt +--- + disk/part_efi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/disk/part_efi.c b/disk/part_efi.c +index 0ca7effc32..3809333078 100644 +--- a/disk/part_efi.c ++++ b/disk/part_efi.c +@@ -236,9 +236,9 @@ void part_print_efi(struct blk_desc *dev_desc) + printf("\tPartition GUID\n"); + + for (i = 0; i < le32_to_cpu(gpt_head->num_partition_entries); i++) { +- /* Stop at the first non valid PTE */ ++ /* Skip invalid PTE */ + if (!is_pte_valid(&gpt_pte[i])) +- break; ++ continue; + + printf("%3d\t0x%08llx\t0x%08llx\t\"%s\"\n", (i + 1), + le64_to_cpu(gpt_pte[i].starting_lba), +-- +2.33.1 + diff --git a/debian/patches/efivars-commands.patch b/debian/patches/efivars-commands.patch new file mode 100644 index 000000000..fa70359cc --- /dev/null +++ b/debian/patches/efivars-commands.patch @@ -0,0 +1,31 @@ +Enable commands for display and manipulation of UEFI boot options by +default. + +Signed-off-by: Heinrich Schuchardt +--- + cmd/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmd/Kconfig b/cmd/Kconfig +index 02c298fdbe..cfc4563f59 100644 +--- a/cmd/Kconfig ++++ b/cmd/Kconfig +@@ -502,6 +502,7 @@ config CMD_ENV_FLAGS + config CMD_NVEDIT_EFI + bool "env [set|print] -e - set/print UEFI variables" + depends on EFI_LOADER ++ default y + imply HEXDUMP + help + UEFI variables are encoded as some form of U-Boot variables. +@@ -1757,6 +1758,7 @@ config CMD_CLS + config CMD_EFIDEBUG + bool "efidebug - display/configure UEFI environment" + depends on EFI_LOADER ++ default y + select EFI_DEVICE_PATH_TO_TEXT + help + Enable the 'efidebug' command which provides a subset of UEFI +-- +2.33.1 + diff --git a/debian/patches/riscv64/use-preboot.patch b/debian/patches/riscv64/use-preboot.patch new file mode 100644 index 000000000..9220d0448 --- /dev/null +++ b/debian/patches/riscv64/use-preboot.patch @@ -0,0 +1,26 @@ +Description: sifive: re-enable back USE_PREBOOT + re-enable back USE_PREBOOT. it used to be there in 2021.01 releases, + and xnox suspects it affects unleashed bootability. +Author: Dimitri John Ledkov + + +--- a/configs/sifive_unmatched_defconfig ++++ b/configs/sifive_unmatched_defconfig +@@ -18,6 +18,7 @@ + CONFIG_SYS_LOAD_ADDR=0x80200000 + CONFIG_FIT=y + CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 ++CONFIG_USE_PREBOOT=y + CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb" + CONFIG_DISPLAY_CPUINFO=y + CONFIG_DISPLAY_BOARDINFO=y +--- a/configs/sifive_unleashed_defconfig ++++ b/configs/sifive_unleashed_defconfig +@@ -16,6 +16,7 @@ + CONFIG_SYS_LOAD_ADDR=0x80200000 + CONFIG_FIT=y + CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 ++CONFIG_USE_PREBOOT=y + CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unleashed-a00.dtb" + CONFIG_DISPLAY_CPUINFO=y + CONFIG_DISPLAY_BOARDINFO=y diff --git a/debian/patches/rpi-8gb-pci.patch b/debian/patches/rpi-8gb-pci.patch new file mode 100644 index 000000000..1aed2b454 --- /dev/null +++ b/debian/patches/rpi-8gb-pci.patch @@ -0,0 +1,30 @@ +Author: Dave Jones +Forwarded: yes +Description: Disable Broadcom PCI driver + The Broadcom PCI driver seems to break u-boot when booting on a Pi 4B with + 8Gb of RAM, when no monitor is attached. This is a brute-force and ignorance + patch and further (upstream) investigation is warranted to discover why this + is the case. Commit 3113c84ba25ec3ceae072cc5ad450c4238425939 (a merge, + annoyingly) is the first bad commit in the u-boot repository when bisecting + this issue. + +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -34,7 +34,6 @@ + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y + CONFIG_PCI=y +-CONFIG_PCI_BRCMSTB=y + CONFIG_PINCTRL=y + # CONFIG_PINCTRL_GENERIC is not set + CONFIG_DM_RESET=y +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -34,7 +34,6 @@ + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y + CONFIG_PCI=y +-CONFIG_PCI_BRCMSTB=y + CONFIG_PINCTRL=y + # CONFIG_PINCTRL_GENERIC is not set + CONFIG_DM_RESET=y diff --git a/debian/patches/rpi-board-dt.patch b/debian/patches/rpi-board-dt.patch new file mode 100644 index 000000000..bee8fafef --- /dev/null +++ b/debian/patches/rpi-board-dt.patch @@ -0,0 +1,46 @@ +Author: Dave Jones +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. +Index: u-boot-2021.07~rc4+dfsg/configs/rpi_2_defconfig +=================================================================== +--- u-boot-2021.07~rc4+dfsg.orig/configs/rpi_2_defconfig ++++ u-boot-2021.07~rc4+dfsg/configs/rpi_2_defconfig +@@ -17,7 +17,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y +Index: u-boot-2021.07~rc4+dfsg/configs/rpi_3_32b_defconfig +=================================================================== +--- u-boot-2021.07~rc4+dfsg.orig/configs/rpi_3_32b_defconfig ++++ u-boot-2021.07~rc4+dfsg/configs/rpi_3_32b_defconfig +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y +Index: u-boot-2021.07~rc4+dfsg/configs/rpi_3_defconfig +=================================================================== +--- u-boot-2021.07~rc4+dfsg.orig/configs/rpi_3_defconfig ++++ u-boot-2021.07~rc4+dfsg/configs/rpi_3_defconfig +@@ -18,7 +18,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_MMC=y + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y +-CONFIG_OF_EMBED=y ++CONFIG_OF_BOARD=y + CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/debian/patches/rpi-cm4-sdhci.patch b/debian/patches/rpi-cm4-sdhci.patch new file mode 100644 index 000000000..1d61dd831 --- /dev/null +++ b/debian/patches/rpi-cm4-sdhci.patch @@ -0,0 +1,26 @@ +Author: Dave Jones +Forwarded: yes +Description: Revert commit c6b9fbf7566f84a807a5c116288648085fa529df + This commit adds SDHCI DMA support which works happily with the SD card + interface on the Pi 4, but breaks eMMC support on the CM4 + +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -30,7 +30,6 @@ + CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 + CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 + CONFIG_MMC_SDHCI=y +-CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -30,7 +30,6 @@ + CONFIG_SYS_DFU_DATA_BUF_SIZE=0x100000 + CONFIG_SYS_DFU_MAX_FILE_SIZE=0x200000 + CONFIG_MMC_SDHCI=y +-CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_BCM2835=y + CONFIG_DM_ETH=y + CONFIG_BCMGENET=y diff --git a/debian/patches/rpi-config-tweaks.patch b/debian/patches/rpi-config-tweaks.patch new file mode 100644 index 000000000..ab17210db --- /dev/null +++ b/debian/patches/rpi-config-tweaks.patch @@ -0,0 +1,104 @@ +Author: Dave Jones +Description: Configuration adjustments to the RPi2 and RPi3 configs + Based off rpi2-config-tweaks.patch created by Steve Langasek, and + subsequently rpi2-rpi3-config-tweaks.patch created by Łukasz Zemczak, this + ensures that all pi-related configurations are consistent. + Specifically that enable the "redundant" environment setting + (entirely pointlessly but this changes the env header and, again, + several related code-bases now assume this). + +--- a/configs/rpi_2_defconfig ++++ b/configs/rpi_2_defconfig +@@ -5,7 +5,7 @@ + CONFIG_SYS_TEXT_BASE=0x00008000 + CONFIG_TARGET_RPI_2=y + CONFIG_NR_DRAM_BANKS=1 +-CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SYS_LOAD_ADDR=0x1000000 +@@ -20,6 +20,7 @@ + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y + CONFIG_OF_EMBED=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +--- a/configs/rpi_3_32b_defconfig ++++ b/configs/rpi_3_32b_defconfig +@@ -6,7 +6,7 @@ + CONFIG_SYS_MALLOC_F_LEN=0x2000 + CONFIG_TARGET_RPI_3_32B=y + CONFIG_NR_DRAM_BANKS=1 +-CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SYS_LOAD_ADDR=0x1000000 +@@ -21,6 +21,7 @@ + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y + CONFIG_OF_EMBED=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +--- a/configs/rpi_3_defconfig ++++ b/configs/rpi_3_defconfig +@@ -5,7 +5,7 @@ + CONFIG_SYS_MALLOC_F_LEN=0x2000 + CONFIG_TARGET_RPI_3=y + CONFIG_NR_DRAM_BANKS=1 +-CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SYS_LOAD_ADDR=0x1000000 +@@ -20,6 +20,7 @@ + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y + CONFIG_OF_EMBED=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +--- a/configs/rpi_4_32b_defconfig ++++ b/configs/rpi_4_32b_defconfig +@@ -3,7 +3,7 @@ + CONFIG_SYS_TEXT_BASE=0x00008000 + CONFIG_SYS_MALLOC_F_LEN=0x2000 + CONFIG_TARGET_RPI_4_32B=y +-CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SYS_LOAD_ADDR=0x1000000 + CONFIG_OF_BOARD_SETUP=y +@@ -20,6 +20,7 @@ + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y + CONFIG_OF_BOARD=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +--- a/configs/rpi_4_defconfig ++++ b/configs/rpi_4_defconfig +@@ -3,7 +3,7 @@ + CONFIG_SYS_TEXT_BASE=0x00080000 + CONFIG_SYS_MALLOC_F_LEN=0x2000 + CONFIG_TARGET_RPI_4=y +-CONFIG_ENV_SIZE=0x4000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SYS_LOAD_ADDR=0x1000000 + CONFIG_OF_BOARD_SETUP=y +@@ -20,6 +20,7 @@ + CONFIG_CMD_USB=y + CONFIG_CMD_FS_UUID=y + CONFIG_OF_BOARD=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/debian/patches/rpi-maxargs.patch b/debian/patches/rpi-maxargs.patch new file mode 100644 index 000000000..8f9e9b224 --- /dev/null +++ b/debian/patches/rpi-maxargs.patch @@ -0,0 +1,17 @@ +Author: Dave Jones +Forwarded: no +Description: Allow more than 16 args for a command for LP: #1910094 + The default u-boot command line configuration only permits a maximum of + 16 arguments per command. Unfortunately, the fix for LP: #1900879 demands + considerably more than this. + +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -65,6 +65,7 @@ + + /* Console configuration */ + #define CONFIG_SYS_CBSIZE 1024 ++#define CONFIG_SYS_MAXARGS 64 + + /* Environment */ + diff --git a/debian/patches/series b/debian/patches/series index 89e70a7c6..f12feda8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,17 @@ disable-fit-image-tests rockchip/rockchip-inno-usb.patch fix-qemu-ppce500-with-binutils-2.38.patch + +rpi-config-tweaks.patch +ubuntu-hardening-limit-keynames-to-keydir.patch +ubuntu-nitrogen6q2g-config-tweaks.patch +rpi-board-dt.patch +rpi-cm4-sdhci.patch +rpi-8gb-pci.patch +rpi-maxargs.patch + +riscv64/use-preboot.patch + +efivars-commands.patch +efi-part-list.patch +efi-loader-copy-guid.patch diff --git a/debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch b/debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch new file mode 100644 index 000000000..8fe7f3c5f --- /dev/null +++ b/debian/patches/ubuntu-hardening-limit-keynames-to-keydir.patch @@ -0,0 +1,55 @@ +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 +Forwarded: no +Last-Update: 2019-05-31 + +--- + +Index: u-boot-2021.07~rc4+dfsg/lib/rsa/rsa-sign.c +=================================================================== +--- u-boot-2021.07~rc4+dfsg.orig/lib/rsa/rsa-sign.c ++++ u-boot-2021.07~rc4+dfsg/lib/rsa/rsa-sign.c +@@ -67,7 +67,12 @@ static int rsa_pem_get_pub_key(const cha + if (!evpp) + return -EINVAL; + +- *evpp = NULL; ++ if (strchr(name, '/')) { ++ fprintf(stderr, "Invalid key name '%s': contains '/' \n", name); ++ return -EACCES; ++ } ++ ++ *evpp = NULL; + snprintf(path, sizeof(path), "%s/%s.crt", keydir, name); + f = fopen(path, "r"); + if (!f) { +@@ -199,6 +204,11 @@ static int rsa_pem_get_priv_key(const ch + if (!evpp) + return -EINVAL; + ++ if (strchr(name, '/')) { ++ fprintf(stderr, "Invalid key name '%s': contains '/' \n", name); ++ return -EACCES; ++ } ++ + *evpp = NULL; + if (keydir && name) + snprintf(path, sizeof(path), "%s/%s.key", keydir, name); +Index: u-boot-2021.07~rc4+dfsg/tools/kwbimage.c +=================================================================== +--- u-boot-2021.07~rc4+dfsg.orig/tools/kwbimage.c ++++ u-boot-2021.07~rc4+dfsg/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) { diff --git a/debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch b/debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch new file mode 100644 index 000000000..9ef864592 --- /dev/null +++ b/debian/patches/ubuntu-nitrogen6q2g-config-tweaks.patch @@ -0,0 +1,41 @@ +--- a/configs/nitrogen6q2g_defconfig ++++ b/configs/nitrogen6q2g_defconfig +@@ -6,7 +6,7 @@ + CONFIG_NR_DRAM_BANKS=1 + CONFIG_SYS_MEMTEST_START=0x10000000 + CONFIG_SYS_MEMTEST_END=0x10010000 +-CONFIG_ENV_SIZE=0x2000 ++CONFIG_ENV_SIZE=0x20000 + CONFIG_ENV_OFFSET=0xC0000 + CONFIG_ENV_SECT_SIZE=0x2000 + CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q2g.cfg" +@@ -32,8 +32,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_USB=y + CONFIG_CMD_USB_MASS_STORAGE=y +@@ -51,7 +53,12 @@ + CONFIG_OF_CONTROL=y + CONFIG_ENV_OVERWRITE=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_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y + CONFIG_NETCONSOLE=y + CONFIG_DM=y + CONFIG_BOUNCE_BUFFER=y +@@ -96,3 +103,5 @@ + CONFIG_VIDEO_BMP_GZIP=y + CONFIG_VIDEO_BMP_RLE8=y + CONFIG_BMP_16BPP=y ++CONFIG_FAT_WRITE=y ++CONFIG_FS_FAT=y diff --git a/debian/rules b/debian/rules index fed6b6b09..4faa8076f 100755 --- a/debian/rules +++ b/debian/rules @@ -52,9 +52,10 @@ ifneq (,$(only_platforms)) $(pkg)_platforms := $(filter $(only_platforms),$($(pkg)_platforms)))) endif +## Disable, as it breaks riscv64 booting # Enable debugging symbols and remove build paths -HOSTCFLAGS = -g -ffile-prefix-map=$(CURDIR)=. -common_make_args += HOSTCFLAGS='$(HOSTCFLAGS)' +#HOSTCFLAGS = -g -ffile-prefix-map=$(CURDIR)=. +#common_make_args += HOSTCFLAGS='$(HOSTCFLAGS)' %: dh $@ diff --git a/debian/targets.mk b/debian/targets.mk index b31843ece..f20be2972 100644 --- a/debian/targets.mk +++ b/debian/targets.mk @@ -304,6 +304,10 @@ else ifeq (${DEB_HOST_ARCH},armhf) u-boot-imx_platforms += nitrogen6q nitrogen6q_targets := u-boot-dtb.imx uboot.elf + # Shrirang Bagul + u-boot-imx_platforms += nitrogen6q2g + nitrogen6q2g_targets := u-boot-dtb.imx uboot.elf + # Vagrant Cascadian u-boot-imx_platforms += novena novena_targets := SPL u-boot.img uboot.elf @@ -532,7 +536,7 @@ else ifeq (${DEB_HOST_ARCH},riscv64) # Hector Oron u-boot-sifive_platforms += sifive_unleashed sifive_unleashed_targets := u-boot.bin uboot.elf spl/u-boot-spl.bin u-boot.itb - sifive_unleased_assigns := OPENSBI=/usr/lib/riscv64-linux-gnu/opensbi/generic/fw_dynamic.bin + sifive_unleashed_assigns := OPENSBI=/usr/lib/riscv64-linux-gnu/opensbi/generic/fw_dynamic.bin # Vagrant Cascadian u-boot-sifive_platforms += sifive_unmatched diff --git a/debian/u-boot-rpi.triggers b/debian/u-boot-rpi.triggers new file mode 100644 index 000000000..b1c3678ca --- /dev/null +++ b/debian/u-boot-rpi.triggers @@ -0,0 +1 @@ +activate-noawait flash-kernel diff --git a/debian/u-boot-sifive.links b/debian/u-boot-sifive.links new file mode 100644 index 000000000..5a71e1fac --- /dev/null +++ b/debian/u-boot-sifive.links @@ -0,0 +1,2 @@ +usr/lib/u-boot/sifive_unleashed usr/lib/u-boot/sifive_fu540 +usr/lib/u-boot/sifive_unmatched usr/lib/u-boot/sifive_hifive_unmatched_fu740 diff --git a/debian/u-boot-sifive.postinst b/debian/u-boot-sifive.postinst new file mode 100755 index 000000000..8c9fbb456 --- /dev/null +++ b/debian/u-boot-sifive.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +##DEBHELPER## + +set -e + +case "$1" in + configure) + target="" + if grep -q '^SiFive HiFive Unleashed A00$' /sys/firmware/devicetree/base/model; then + target="sifive_unleashed" + fi + if grep -q '^SiFive HiFive Unmatched A00$' /sys/firmware/devicetree/base/model; then + target="sifive_unmatched" + fi + if grep -q '^SiFive HiFive Unmatched$' /sys/firmware/devicetree/base/model; then + target="sifive_unmatched" + fi + if [ -n "$target" ] && [ -e /dev/disk/by-partlabel/loader1 ] && [ -e /dev/disk/by-partlabel/loader2 ]; then + dd if=/usr/lib/u-boot/$target/u-boot-spl.bin of=/dev/disk/by-partlabel/loader1 + dd if=/usr/lib/u-boot/$target/u-boot.itb of=/dev/disk/by-partlabel/loader2 + fi + ;; +esac + +exit 0