Merge https://source.denx.de/u-boot/custodians/u-boot-socfpga

- One-liner env fix
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 9fadc01..42e4f98 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -106,6 +106,7 @@
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_NAND_MXS_DT=y
+CONFIG_SYS_NAND_ONFI_DETECTION=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0xe00000
 CONFIG_PHYLIB=y