solidrun-imx6: use upstream u-boot, the imx6 variant does not compile with gcc5

3 files changed, 1 insertions, 99 deletions

diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile
deleted file mode 100644
index df0a22d16..000000000
--- a/package/u-boot-imx6/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		u-boot-imx6
-PKG_VERSION:=		20140819
-PKG_RELEASE:=		1
-PKG_HASH:=		a4e1202241d9a1035217fcd5c4c8bc999c606a3628b4dbf7b0f7ab5260385a29
-PKG_DESCR:=		bootloader for imx6 (cubox-i/hummingboard)
-PKG_SECTION:=		base/boot
-PKG_URL:=		https://github.com/SolidRun/u-boot-imx6.git
-PKG_SITES:=		http://distfiles.openadk.org/
-
-PKG_SYSTEM_DEPENDS:=	solidrun-imx6
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,U_BOOT_IMX6,u-boot-imx6,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-# u-boot uses ld directly
-TARGET_LDFLAGS:=
-INSTALL_STYLE:=		manual
-
-do-configure:
-	cd ${WRKBUILD}; $(MAKE) mx6_cubox-i_config
-
-u-boot-imx6-install:
-	$(INSTALL_DIR) ${FW_DIR}
-	$(CP) ${WRKBUILD}/SPL ${FW_DIR}
-	$(CP) ${WRKBUILD}/u-boot.img ${FW_DIR}
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h b/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h
deleted file mode 100644
index cd02db031..000000000
--- a/package/u-boot-imx6/patches/patch-include_configs_mx6_cubox-i_h
+++ /dev/null
@@ -1,64 +0,0 @@
---- u-boot-imx6-20140819.orig/include/configs/mx6_cubox-i.h	2014-08-19 09:42:57.000000000 +0200
-+++ u-boot-imx6-20140819/include/configs/mx6_cubox-i.h	2014-08-19 13:26:15.775439757 +0200
-@@ -158,7 +158,7 @@
-         "script=boot.scr\0" \
-         "bootfile=auto\0" \
-         "bootenv=uEnv.txt\0" \
--        "boot_prefixes=/ /boot/\0" \
-+        "boot_prefixes=/boot/\0" \
-         "console=ttymxc0\0" \
-         "stdin=serial,usbkbd\0" \
-         "stdout=serial,vga\0" \
-@@ -171,7 +171,7 @@
-         "ip_dyn=yes\0" \
-         "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-         "mmcpart=1\0" \
--        "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-+        "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
-         "update_sd_firmware_filename=u-boot.imx\0" \
-         "update_sd_firmware=" \
-                 "if test ${ip_dyn} = yes; then " \
-@@ -217,7 +217,7 @@
-         "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
-                 "env import -t ${loadaddr} ${filesize};\0" \
-         "autoboot=echo Booting ${boot_file}; " \
--		"if test ${boot_file} = zImage; then " \
-+		"if test ${boot_file} = kernel; then " \
- 		    "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
- 		"else " \
- 		    "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
-@@ -232,14 +232,14 @@
- 		"else " \
- 		    "setenv ramdisk_addr -; " \
-                 "fi; " \
--                "if test ${boot_file} = zImage; then " \
-+                "if test ${boot_file} = kernel; then " \
-                     "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                         "if run loadfdt; then " \
- 			    "echo Loaded ${fdt_file}; " \
-                         "else " \
- 			    "setenv fdt_addr; " \
-                             "if test ${boot_fdt} = try; then " \
--                                  "echo WARN: Cannot load the DTB and boot file is type zImage;" \
-+                                  "echo WARN: Cannot load the DTB and boot file is type kernel;" \
-                                   "echo if you have not appended a dtb to the file it may;" \
-                                   "echo hang after displaying Starting kernel...;" \
-                                   "echo ;" \
-@@ -269,7 +269,7 @@
-                     "setenv get_cmd tftp; " \
-                 "fi; " \
-                 "if test ${bootfile} = auto; then " \
--                     "setenv bootfile zImage; " \
-+                     "setenv bootfile kernel; " \
-                      "if ${get_cmd} ${bootfile}; then " \
-                          "run bootit; " \
-                      "else " \
-@@ -295,7 +295,7 @@
- 			   "fi; " \
-                            "if test ${bootfile} = auto; then " \
-                                    "setenv origbootfile auto; " \
--                                   "setenv bootfile zImage; " \
-+                                   "setenv bootfile kernel; " \
-                                    "if run loadbootfile; then " \
-                                         "run mmcboot; " \
-                                    "else " \
diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6
index cb1c630da..828348ea2 100644
--- a/target/arm/systems/solidrun-imx6
+++ b/target/arm/systems/solidrun-imx6
@@ -19,6 +19,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_PACKAGE_U_BOOT
 	help
 	  Solidrun IMX6 Embedded Systems.
 	  http://www.solid-run.com