colibri-imx8qxp: forward port to 2018.03

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 3a5cc1cf85b8e22da78d794a2d71c03490f500b6)

4 files changed, 14 insertions, 28 deletions

diff --git a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c
index c3a56481dc..c865f33d1d 100644
--- a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c
+++ b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c
@@ -9,7 +9,6 @@
 #include <netdev.h>
 #include <fsl_ifc.h>
 #include <fdt_support.h>
-#include <libfdt.h>
 #include <environment.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
@@ -17,14 +16,15 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
-#include <asm/imx-common/sci/sci.h>
+#include <asm/mach-imx/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
 #include <dm.h>
 #include <imx8_hsio.h>
+#include <linux/libfdt.h>
 #include <usb.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx//video.h>
 #include <asm/arch/video_common.h>
 #include <power-domain.h>
 
@@ -418,8 +418,8 @@ int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 /* TODO move to common */
-	setenv("board_name", "Colibri iMX8QXP");
-	setenv("board_rev", "v1.0");
+	env_set("board_name", "Colibri iMX8QXP");
+	env_set("board_rev", "v1.0");
 #endif
 
 #ifdef CONFIG_ENV_IS_IN_MMC
@@ -427,9 +427,9 @@ int board_late_init(void)
 #endif
 
 #ifdef CONFIG_AHAB_BOOT
-	setenv("sec_boot", "yes");
+	env_set("sec_boot", "yes");
 #else
-	setenv("sec_boot", "no");
+	env_set("sec_boot", "no");
 #endif
 
 	return 0;
diff --git a/board/toradex/colibri-imx8qxp/pf8100.c b/board/toradex/colibri-imx8qxp/pf8100.c
index bc67538eb8..881052b827 100644
--- a/board/toradex/colibri-imx8qxp/pf8100.c
+++ b/board/toradex/colibri-imx8qxp/pf8100.c
@@ -10,7 +10,7 @@
 
 #include <common.h>
 #include <i2c.h>
-#include <asm/imx-common/sci/sci.h>
+#include <asm/mach-imx/sci/sci.h>
 #include <asm/arch/imx8-pins.h>
 #include <asm/gpio.h>
 #include <asm/arch/iomux.h>
diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index 543129772b..25f0a60527 100644
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -1,9 +1,10 @@
 CONFIG_ARM=y
 CONFIG_ARCH_IMX8=y
+CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SMC_FUSE=y
 CONFIG_TARGET_COLIBRI_IMX8QXP=y
 CONFIG_IMX_BOOTAUX=y
-CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
@@ -12,12 +13,11 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_MMC=y
+CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_CMD_FPGA is not set
-CONFIG_CMD_GPIO=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
@@ -28,12 +28,11 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
-# CONFIG_BLK is not set
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_IMX_LPI2C=y
 CONFIG_DM_MMC=y
-# CONFIG_DM_MMC_OPS is not set
 CONFIG_NETDEVICES=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8=y
@@ -54,7 +53,5 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="FSL"
-CONFIG_G_DNL_VENDOR_NUM=0x0525
-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
+CONFIG_VIDEO=y
 # CONFIG_EFI_LOADER is not set
diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h
index 947994198a..05b0c756c4 100644
--- a/include/configs/colibri-imx8qxp.h
+++ b/include/configs/colibri-imx8qxp.h
@@ -176,7 +176,6 @@
 
 /* Link Definitions */
 #define CONFIG_LOADADDR			0x80280000
-#define CONFIG_SYS_TEXT_BASE		0x80020000
 
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
@@ -189,7 +188,6 @@
 #define CONFIG_ENV_SIZE			0x2000
 
 #define CONFIG_ENV_OFFSET       (64 * SZ_64K)
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_PART		0	/* user area */
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
@@ -213,15 +211,12 @@
 #define CONFIG_BAUDRATE			115200
 
 /* Monitor Command Prompt */
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_CMDLINE_EDITING
 
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY		8000000	/* 8MHz */
@@ -232,11 +227,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
-/* USB 3.0 controller configs */
-#ifdef CONFIG_USB_XHCI_IMX8
-#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
-#endif
-
 /* USB OTG controller configs */
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_HOST_ETHER
@@ -247,7 +237,6 @@
 
 #ifdef CONFIG_USB_GADGET
 #define CONFIG_USBD_HS
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 
 /* Framebuffer */