diff -Nru u-boot-2019.07+dfsg/debian/changelog u-boot-2019.07+dfsg/debian/changelog
--- u-boot-2019.07+dfsg/debian/changelog	2020-01-24 11:40:38.000000000 +0000
+++ u-boot-2019.07+dfsg/debian/changelog	2020-02-11 10:43:57.000000000 +0000
@@ -1,3 +1,13 @@
+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 ]
diff -Nru u-boot-2019.07+dfsg/debian/patches/series u-boot-2019.07+dfsg/debian/patches/series
--- u-boot-2019.07+dfsg/debian/patches/series	2020-01-23 22:41:17.000000000 +0000
+++ u-boot-2019.07+dfsg/debian/patches/series	2020-02-11 10:43:57.000000000 +0000
@@ -26,3 +26,4 @@
 rpi4.patch
 rpi-board-dt.patch
 python2.patch
+ubuntu-nitrogen6q2g-temporary-config-fixup.patch
diff -Nru u-boot-2019.07+dfsg/debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch u-boot-2019.07+dfsg/debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch
--- u-boot-2019.07+dfsg/debian/patches/ubuntu-nitrogen6q2g-temporary-config-fixup.patch	1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2019.07+dfsg/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
+