diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-28 08:00:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-28 08:00:22 -0400 |
| commit | 0352e878d2b80b2575e02310e891e936251b3992 (patch) | |
| tree | 3a35d816b28031ae2f5a8243afcf324779b4031f /include | |
| parent | cb8cc1d8fbf9c4254a2018ad697fc6fd08fbb158 (diff) | |
| parent | 0ac662da35e48b859b5d43e0c86f233f25730ee5 (diff) | |
Merge tag 'u-boot-imx-20190628' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2019.07
- menlo board
- allow SDB on Sabre
- HAB for mx6sl
- apalis board
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apalis_imx6.h | 5 | ||||
| -rw-r--r-- | include/configs/m53menlo.h | 4 | ||||
| -rw-r--r-- | include/configs/pico-imx7d.h | 1 | ||||
| -rw-r--r-- | include/sdp.h | 9 |
4 files changed, 13 insertions, 6 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 4b0a3fb26b..db37fa7b73 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 @@ -121,8 +122,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...; " \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index fc0b1f480c..7b68c1c0a1 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" \ diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 9a3b3b1e80..91015402ef 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" \ diff --git a/include/sdp.h b/include/sdp.h index f6252d027f..6ac64fb1f3 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 <spl.h> + +int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image); +#else +int sdp_handle(int controller_index); +#endif #endif /* __SDP_H_ */ |