Merge version 2024.01+dfsg-6+rpi1 and 2024.01+dfsg-7 to produce 2024.01+dfsg-7+rpi1

diff --cc debian/changelog
index d335a21377933f2768b393c49516fc94029973e6,232c8065091942b082a676a486a5277b4d498403..88ab49b1102de2c0a7ffac573d065c24232e036b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,26 @@@
- u-boot (2024.01+dfsg-6+rpi1) trixie-staging; urgency=medium
++u-boot (2024.01+dfsg-7+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2014.10+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 06:00:07 +0000]
 +  * Don't build versions for various armv7 devices, build rpi version instead.
 +
 +  [changes introduced in 2021.01+dfsg-4+rpi1 by Peter Michael Green]
 +  * Don't build powerpc targets for qemu, my attempts to build the nessacery
 +    cross-compiler in raspbian failed.
 +
 +  [changes introduced in 2024.01+dfsg-5+rpi1 by Peter Michael Green]
 +  * Don't build mips* targets for quemu either. I don't want to add
 +    more cross-compilers to raspbian.
 +  * Always pass armv7 flags when building for armv7 (don't use cc-option,
 +    whatever that is).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Jan 2025 18:08:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 13:35:10 +0000
++
+ u-boot (2024.01+dfsg-7) unstable; urgency=medium
+ 
+   * debian/control: Bump versioned dependency on arm-trusted-firmware to
+     2.10.10 or newer.
+ 
+  -- Vagrant Cascadian <vagrant@debian.org>  Thu, 09 Jan 2025 11:14:04 -0800
  
  u-boot (2024.01+dfsg-6) unstable; urgency=medium
  

diff --cc debian/control
Simple merge