Merge ~ethan.hsieh/+git/u-boot:devel into ~ethan.hsieh/+git/u-boot:ubuntu/bionic-proposed

[ethan.hsieh]

[ethan.hsieh (ethan.hsieh)]

@Lukasz
I have no permission to send MP to https://code.launchpad.net/~usd-import-team/ubuntu/+source/u-boot/+git/u-boot/+ref/ubuntu/bionic-proposed
Could you help to review this patch?

[ethan.hsieh (ethan.hsieh)]

This patch is based on the following MP.
https://code.launchpad.net/~anthonywong/ubuntu/+source/u-boot/+git/u-boot/+merge/371860

[Łukasz Zemczak (sil2100)]

If I understand this correctly: since our u-boot isn't up-to-date, we're missing the 2 commits that migrate CONFIG_SYS_REDUNDAND_ENVIRONMENT (and others) to Kconfig, so those config changes were ignored on the defconfig.

This seems like a decent workaround for this, certainly feels safer than cherry-picking two rather big commits. Looks good to me.

review: Approve

Unmerged commits

56708cf... by ethan.hsieh on 2020-01-03

u-boot-imx: Fix bad CRC issue (LP: #1853395)
  - define env size
  - enable CONFIG_SYS_REDUNDAND_ENVIRONMENT

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 843cdab..346f793 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -37,7 +37,6 @@ 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
@@ -66,4 +65,3 @@ CONFIG_USB_ETH_CDC=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index cb5da38..5a8b627 100644
--- 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 */
@@ -160,7 +164,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