diff -Nru u-boot-2021.07+dfsg/debian/changelog u-boot-2021.07+dfsg/debian/changelog
--- u-boot-2021.07+dfsg/debian/changelog	2021-10-13 03:59:55.000000000 +0000
+++ u-boot-2021.07+dfsg/debian/changelog	2021-10-13 09:05:23.000000000 +0000
@@ -1,3 +1,14 @@
+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 <wgrant@ubuntu.com>  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
diff -Nru u-boot-2021.07+dfsg/debian/patches/kconfig-eol.patch u-boot-2021.07+dfsg/debian/patches/kconfig-eol.patch
--- u-boot-2021.07+dfsg/debian/patches/kconfig-eol.patch	1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.07+dfsg/debian/patches/kconfig-eol.patch	2021-10-13 09:05:23.000000000 +0000
@@ -0,0 +1,17 @@
+Author: William Grant <wgrant@ubuntu.com>
+Description: Add missing newline to the end of cmd_stm32prog/Kconfig
+ This could occasionally cause check-config.sh to erroneously fail, e.g. on
+ armhf when mach-imx/Kconfig happened to sort afterwards and the first line was
+ merged, rendering CONFIG_HAS_CAAM invisible.
+
+Index: u-boot-2021.07+dfsg/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
+===================================================================
+--- u-boot-2021.07+dfsg.orig/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
++++ u-boot-2021.07+dfsg/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig
+@@ -31,4 +31,4 @@ config CMD_STM32PROG_SERIAL
+ 	help
+ 		activate the command "stm32prog serial" for STM32MP soc family
+ 		with the tools STM32CubeProgrammer using U-Boot serial device
+-		and UART protocol.
+\ No newline at end of file
++		and UART protocol.
diff -Nru u-boot-2021.07+dfsg/debian/patches/series u-boot-2021.07+dfsg/debian/patches/series
--- u-boot-2021.07+dfsg/debian/patches/series	2021-08-25 16:22:24.000000000 +0000
+++ u-boot-2021.07+dfsg/debian/patches/series	2021-10-13 09:04:54.000000000 +0000
@@ -45,3 +45,4 @@
 riscv64/lp1937246.patch
 riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
 riscv64/use-preboot.patch
+kconfig-eol.patch