Merge pull request #4271 from vpeter4/udoo_spl

u-boot: switch to SPL for udoo boards

packages/sysutils/imx6-status-led/profile.d/01-system_type.conf

@@ -35,6 +35,9 @@ case "$SYSTEM_TYPE" in
   "SolidRun Cubox-i Dual/Quad")
     export SYSTEM_TYPE="cuboxi"
     ;;
+  "Udoo i.MX6 Dual-lite Board"|"Udoo i.MX6 Quad Board")
+    export SYSTEM_TYPE="udoo"
+    ;;
   *)
     export SYSTEM_TYPE="undef"
     ;;

packages/tools/u-boot/package.mk

@@ -74,8 +74,8 @@ make_target() {
         TARGET_NAME="cuboxi"
       elif [ "$UBOOT_TARGET" = "matrix" ]; then
         TARGET_NAME="matrix"
-      elif [ "$UBOOT_TARGET" = "udoo_quad_config" ]; then
+      elif [ "$UBOOT_TARGET" = "udoo_config" ]; then
-        TARGET_NAME="udoo_quad"
+        TARGET_NAME="udoo"
       else
         TARGET_NAME="undef"
       fi

projects/imx6/options

@@ -43,7 +43,7 @@
   # Configuration for u-boot
     UBOOT_CONFIG="mx6_cubox-i_config"
     UBOOT_CONFIG="$UBOOT_CONFIG matrix"
-    UBOOT_CONFIG="$UBOOT_CONFIG udoo_quad_config"
+    UBOOT_CONFIG="$UBOOT_CONFIG udoo_config"
 
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""

projects/imx6/patches/u-boot/101-udoo-uEnv.txt-bootz-n-fixes.patch

@@ -1,206 +0,0 @@
-From 590891a15d4f3facafeb3186a8d3217f33343eb3 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 23 Apr 2014 11:48:34 -0500
-Subject: [PATCH] udoo: uEnv.txt, bootz, n fixes
-
-diff -urN a/include/configs/udoo.h b/include/configs/udoo.h
---- a/include/configs/udoo.h	2014-11-29 15:55:08.877512289 +0100
-+++ b/include/configs/udoo.h	2014-11-29 16:14:42.716345900 +0100
-@@ -101,7 +101,7 @@
- #define CONFIG_CMD_BMODE
- #define CONFIG_CMD_SETEXPR
- 
--#define CONFIG_BOOTDELAY		5
-+#define CONFIG_BOOTDELAY		1
- 
- #define CONFIG_SYS_MEMTEST_START	0x10000000
- #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-@@ -119,101 +119,118 @@
- #define CONFIG_BOUNCE_BUFFER
- #define CONFIG_CMD_EXT2
- #define CONFIG_CMD_FAT
-+#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_FS_GENERIC
- #define CONFIG_DOS_PARTITION
- 
- #define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	"script=boot.scr\0" \
--	"uimage=/boot/uImage\0" \
-+	"image=zImage\0" \
- 	"console=ttymxc1\0" \
- 	"splashpos=m,m\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"initrd_high=0xffffffff\0" \
- 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
--	"fdt_addr=0x11000000\0" \
-+	"fdt_addr=0x18000000\0" \
- 	"boot_fdt=try\0" \
- 	"ip_dyn=yes\0" \
--	"hdmi_patch=\0" \
-+	"optargs=\0" \
-+	"video=\0" \
- 	"mmcdev=0\0" \
- 	"mmcpart=1\0" \
--	"mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
-+	"mmcroot=/dev/mmcblk0p2 ro\0" \
-+	"mmcrootfstype=ext4 rootwait\0" \
- 	"update_sd_firmware_filename=u-boot.imx\0" \
- 	"update_sd_firmware=" \
--	 "if test ${ip_dyn} = yes; then " \
--	 "setenv get_cmd dhcp; " \
--	 "else " \
--	 "setenv get_cmd tftp; " \
--	 "fi; " \
--	 "if mmc dev ${mmcdev}; then "	\
--	 "if ${get_cmd} ${update_sd_firmware_filename}; then " \
--	 "setexpr fw_sz ${filesize} / 0x200; " \
--	 "setexpr fw_sz ${fw_sz} + 1; "	\
--	 "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
--	 "fi; "	\
--	 "fi\0" \
-+		"if test ${ip_dyn} = yes; then " \
-+			"setenv get_cmd dhcp; " \
-+		"else " \
-+			"setenv get_cmd tftp; " \
-+		"fi; " \
-+		"if mmc dev ${mmcdev}; then "	\
-+			"if ${get_cmd} ${update_sd_firmware_filename}; then " \
-+				"setexpr fw_sz ${filesize} / 0x200; " \
-+				"setexpr fw_sz ${fw_sz} + 1; "	\
-+				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
-+			"fi; "	\
-+		"fi\0" \
- 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
--	 "root=${mmcroot} " \
--	 "${hdmi_patch} " \
--	 "fbmem=24M video=mxcfb0:dev=hdmi,1920x1080M@60,bpp=32\0" \
-+		"${optargs} " \
-+		"root=${mmcroot} " \
-+		"rootfstype=${mmcrootfstype} " \
-+		"video=${video}\0" \
-+	"loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
-+	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
-+		"env import -t $loadaddr $filesize\0" \
- 	"loadbootscript=" \
--	 "ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-+		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- 	"bootscript=echo Running bootscript from mmc ...; " \
--	 "source\0" \
--	"loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
--	"loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+		"source\0" \
-+	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
-+	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
-+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
- 	"mmcboot=echo Booting from mmc ...; " \
--	 "run mmcargs; " \
--	 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--	 "if run loadfdt; then " \
--	 "bootm ${loadaddr} - ${fdt_addr}; " \
--	 "else " \
--	 "if test ${boot_fdt} = try; then " \
--	 "bootm; " \
--	 "else " \
--	 "echo WARN: Cannot load the DT; " \
--	 "fi; " \
--	 "fi; " \
--	 "else " \
--	 "bootm; " \
--	 "fi;\0" \
-+		"run mmcargs; " \
-+		"bootz ${loadaddr} - ${fdt_addr};\0" \
-+	"mmcbootdefault=echo Booting from mmc ...; " \
-+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+			"if run loadfdt; then " \
-+				"bootz ${loadaddr} - ${fdt_addr}; " \
-+			"else " \
-+				"if test ${boot_fdt} = try; then " \
-+					"bootz ${loadaddr}; " \
-+				"else " \
-+					"echo WARN: Cannot load the DT; " \
-+				"fi; " \
-+			"fi; " \
-+		"else " \
-+			"bootz ${loadaddr}; " \
-+		"fi;\0" \
- 	"netargs=setenv bootargs console=${console},${baudrate} " \
--	 "root=/dev/nfs " \
--	 "${hdmi_patch} " \
-+		"root=/dev/nfs " \
- 	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
--	 "netboot=echo Booting from net ...; " \
--	 "run netargs; " \
--	 "if test ${ip_dyn} = yes; then " \
--	 "setenv get_cmd dhcp; " \
--	 "else " \
--	 "setenv get_cmd tftp; " \
--	 "fi; " \
--	 "${get_cmd} ${uimage}; " \
--	 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--	 "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
--	 "bootm ${loadaddr} - ${fdt_addr}; " \
--	 "else " \
--	 "if test ${boot_fdt} = try; then " \
--	 "bootm; " \
--	 "else " \
--	 "echo WARN: Cannot load the DT; " \
--	 "fi; " \
--	 "fi; " \
--	 "else " \
--	 "bootm; " \
--	 "fi;\0"
-+		"netboot=echo Booting from net ...; " \
-+		"run netargs; " \
-+		"if test ${ip_dyn} = yes; then " \
-+			"setenv get_cmd dhcp; " \
-+		"else " \
-+			"setenv get_cmd tftp; " \
-+		"fi; " \
-+		"${get_cmd} ${image}; " \
-+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-+				"bootz ${loadaddr} - ${fdt_addr}; " \
-+			"else " \
-+				"if test ${boot_fdt} = try; then " \
-+					"bootz; " \
-+				"else " \
-+					"echo WARN: Cannot load the DT; " \
-+				"fi; " \
-+			"fi; " \
-+		"else " \
-+			"bootz; " \
-+		"fi;\0"
- 
- #define CONFIG_BOOTCOMMAND \
--	   "mmc dev ${mmcdev}; if mmc rescan; then " \
--	   "if run loadbootscript; then " \
--	   "run bootscript; " \
--	   "else " \
--	   "if run loaduimage; then " \
--	   "run mmcboot; " \
--	   "else run netboot; " \
--	   "fi; " \
--	   "fi; " \
--	   "else run netboot; fi"
-+	"mmc dev ${mmcdev};" \
-+	"if mmc rescan; then " \
-+		"echo SD/MMC found on device ${mmcdev};" \
-+		"if run loadbootenv; then " \
-+			"run importbootenv;" \
-+		"fi;" \
-+		"echo Checking if uenvcmd is set ...;" \
-+		"if test -n $uenvcmd; then " \
-+			"echo Running uenvcmd ...;" \
-+			"run uenvcmd;" \
-+		"fi;" \
-+		"echo Running default loadimage ...;" \
-+		"if run loadimage; then " \
-+			"run loadfdt;" \
-+			"run mmcboot;" \
-+		"fi;" \
-+	"fi;"
- 
- /* Miscellaneous configurable options */
- #define CONFIG_SYS_LONGHELP

projects/imx6/patches/u-boot/102-udoo_zImage.patch

@@ -1,27 +0,0 @@
-diff -urN a/include/configs/udoo.h b/include/configs/udoo.h
---- a/include/configs/udoo.h	2014-11-29 18:58:38.930773257 +0100
-+++ b/include/configs/udoo.h	2014-11-29 19:04:06.005449364 +0100
-@@ -126,8 +126,9 @@
- #define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	"zImage=KERNEL\0" \
- 	"script=boot.scr\0" \
--	"image=zImage\0" \
-+	"image=${zImage}\0" \
- 	"console=ttymxc1\0" \
- 	"splashpos=m,m\0" \
- 	"fdt_high=0xffffffff\0" \
-@@ -168,9 +169,9 @@
- 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- 	"bootscript=echo Running bootscript from mmc ...; " \
- 		"source\0" \
--	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
--	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
--	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
-+	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${zImage}\0" \
-+	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${zImage}\0" \
-+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- 	"mmcboot=echo Booting from mmc ...; " \
- 		"run mmcargs; " \
- 		"bootz ${loadaddr} - ${fdt_addr};\0" \

projects/imx6/patches/u-boot/103-udoo_disable_lvds.patch

@@ -1,6 +1,6 @@
-diff -aurN u-boot-imx6-144b1e9/arch/arm/cpu/armv7/cpu.c a-u/arch/arm/cpu/armv7/cpu.c
+diff -aurN a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c
---- u-boot-imx6-144b1e9/arch/arm/cpu/armv7/cpu.c	2015-05-31 21:32:52.821314218 +0200
+--- a/arch/arm/cpu/armv7/cpu.c	2015-05-31 21:32:52.821314218 +0200
-+++ a-u/arch/arm/cpu/armv7/cpu.c	2015-05-31 21:27:12.292623257 +0200
++++ b/arch/arm/cpu/armv7/cpu.c	2015-05-31 21:27:12.292623257 +0200
 @@ -77,7 +77,7 @@
  	cpu_cache_initialization();
  
@@ -16,7 +16,7 @@ diff -aurN u-boot-imx6-144b1e9/board/udoo/udoo.c a-u/board/udoo/udoo.c
 @@ -260,8 +260,8 @@
  static void do_enable_lvds(struct display_info_t const *dev)
  {
- 	imx_iomux_v3_setup_multiple_pads(lvds_pads, ARRAY_SIZE(lvds_pads));
+ 	SETUP_IOMUX_PADS(lvds_pads);
 -	gpio_direction_output(IMX_GPIO_NR(1, 2), 1); /* LVDS power On */
 -	gpio_direction_output(IMX_GPIO_NR(1, 4), 1); /* LVDS backlight On */
 +	/*gpio_direction_output(IMX_GPIO_NR(1, 2), 1);*/ /* LVDS power On */