From 2c72ead7387404eba16c556d2f204c52c36c27f9 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Tue, 4 Jun 2019 21:56:29 +0200 Subject: usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP Add support for loading u-boot FIT images over the USB SDP protocol in the SPL Signed-off-by: Frieder Schrempf [Various build fixes] Signed-off-by: Sjoerd Simons Tested-by: Fabio Estevam Tested-by: Lukasz Majewski --- include/sdp.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sdp.h b/include/sdp.h index f6252d027f0..6ac64fb1f31 100644 --- a/include/sdp.h +++ b/include/sdp.h @@ -10,6 +10,13 @@ #define __SDP_H_ int sdp_init(int controller_index); -void sdp_handle(int controller_index); + +#ifdef CONFIG_SPL_BUILD +#include + +int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image); +#else +int sdp_handle(int controller_index); +#endif #endif /* __SDP_H_ */ -- cgit v1.3.1 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') 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.3.1 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') 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.3.1 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 --- board/menlo/m53menlo/m53menlo.c | 48 +++++++++++++++++++++++++++++++++++++++-- configs/m53menlo_defconfig | 7 +++--- include/configs/m53menlo.h | 4 ++-- 3 files changed, 51 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index 340c750a819..31ba44e452d 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -28,6 +29,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -123,7 +125,6 @@ static void setup_iomux_fec(void) imx_iomux_v3_setup_multiple_pads(fec_pads, ARRAY_SIZE(fec_pads)); } -#ifdef CONFIG_VIDEO static void enable_lvds_clock(struct display_info_t const *dev, const u8 hclk) { static struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE; @@ -270,7 +271,6 @@ struct display_info_t const displays[] = { }; size_t display_count = ARRAY_SIZE(displays); -#endif #ifdef CONFIG_SPLASH_SCREEN static struct splash_location default_splash_locations[] = { @@ -289,6 +289,50 @@ int splash_screen_prepare(void) } #endif +int board_late_init(void) +{ +#if defined(CONFIG_VIDEO_IPUV3) + struct udevice *dev; + int xpos, ypos, ret; + char *s; + void *dst; + ulong addr, len; + + splash_get_pos(&xpos, &ypos); + + s = env_get("splashimage"); + if (!s) + return 0; + + addr = simple_strtoul(s, NULL, 16); + dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE); + if (!dst) + return -ENOMEM; + + ret = splash_screen_prepare(); + if (ret < 0) + return ret; + + len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE; + ret = gunzip(dst + 2, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE - 2, + (uchar *)addr, &len); + if (ret) { + printf("Error: no valid bmp or bmp.gz image at %lx\n", addr); + free(dst); + return ret; + } + + ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); + if (ret) + return ret; + + ret = video_bmp_display(dev, (ulong)dst + 2, xpos, ypos, true); + if (ret) + return ret; +#endif + return 0; +} + #define I2C_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \ PAD_CTL_PUS_100K_UP | PAD_CTL_ODE) diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index c9a8b0dff91..5a1fbf52985 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -18,9 +18,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/menlo/m53menlo/imximage.cfg" CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttymxc0,115200" -# CONFIG_CONSOLE_MUX is not set -CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_VERSION_VARIABLE=y +CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_TEXT_BASE=0x70008000 CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_NAND_SUPPORT=y @@ -81,8 +80,8 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_FAT_WRITE=y 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.3.1 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') 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.3.1