From 936675c6f447f8333d9dde988917bf8a3d0c6422 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Tue, 25 Jun 2019 14:48:06 +0300 Subject: apalis_imx6: fix set_emmcargs wrapper Fix set_emmcargs wrapper, which prepares proper bootargs for booting from eMMC. Signed-off-by: Igor Opaniuk Reviewed-by: Philippe Schenker --- include/configs/apalis_imx6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4b0a3fb26b3..cffb90a6906 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -121,8 +121,8 @@ "imx6q-apalis-cam-eval.dtb fat 0 1" #define EMMC_BOOTCMD \ - "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} ro,noatime " \ - "rootfstype=ext4 rootwait\0" \ + "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \ + "ro,noatime rootfstype=ext4 rootwait\0" \ "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ "${vidargs}; echo Booting from internal eMMC chip...; " \ -- cgit v1.2.3 From 6de474340652af22574913aeffadd08913d00702 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Tue, 7 May 2019 23:53:48 +0200 Subject: pico-imx7d: remove unused 'script' variable Since the pico-pi uses the distroboot, this commit remove the 'script' variable (cf boot_scripts). Signed-off-by: Pierre-Jean Texier Reviewed-by: Fabio Estevam --- include/configs/pico-imx7d.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 9a3b3b1e80b..91015402efd 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ "image=zImage\0" \ "splashpos=m,m\0" \ "console=ttymxc4\0" \ -- cgit v1.2.3 From f0be8ff45fb89d02ae4aa5b87076edd034cad9fc Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 9 Jun 2019 18:46:46 +0200 Subject: ARM: imx: m53menlo: Convert to DM VIDEO Enable DM Video support on iMX53 M53Menlo and fix minor details to restore previous behavior of the system. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Stefano Babic --- include/configs/m53menlo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index fc0b1f480ce..7b68c1c0a1e 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -136,7 +136,6 @@ /* * LCD */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SPLASH_SCREEN @@ -145,7 +144,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) -#endif /* LVDS display */ #define CONFIG_SYS_LDB_CLOCK 33260000 @@ -205,6 +203,8 @@ "splashfile=boot/usplash.bmp.gz\0" \ "splashimage=0x88000000\0" \ "splashpos=m,m\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "addcons=" \ "setenv bootargs ${bootargs} " \ "console=${consdev},${baudrate}\0" \ -- cgit v1.2.3 From 0ac662da35e48b859b5d43e0c86f233f25730ee5 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Mon, 24 Jun 2019 11:39:14 +0300 Subject: apalis_imx6: increase phy autoneg timeout Default value (4000ms) of PHY_ANEG_TIMEOUT for Micrel KSZ9031 contoller isn't sufficient to finish auto-negotiation, which sometimes leads to timeout errors: Apalis iMX6 # dhcp FEC Waiting for PHY auto negotiation to complete......... TIMEOUT ! Increase the auto-negotiation time-out to 15000ms. Signed-off-by: Igor Opaniuk Reviewed-by: Philippe Schenker --- include/configs/apalis_imx6.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/configs') diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index cffb90a6906..db37fa7b731 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -58,6 +58,7 @@ #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC" +#define PHY_ANEG_TIMEOUT 15000 /* PHY needs longer aneg time */ #define CONFIG_FEC_MXC_PHYADDR 6 #define CONFIG_TFTP_TSIZE -- cgit v1.2.3