X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fboot%2Fuboot-imx6%2FMakefile;h=0c989f3cfb54d8328f991bc4af6e7cbde1da77fc;hp=16465c78e2df8aeaeabe328175291a95b36963d8;hb=eede23f774b63081d0923a3c30dd6da2fb9a94eb;hpb=cd2b47684e54f74315f462b8ca8488eb284f2c70

diff --git a/package/boot/uboot-imx6/Makefile b/package/boot/uboot-imx6/Makefile
index 16465c78e2..0c989f3cfb 100644
--- a/package/boot/uboot-imx6/Makefile
+++ b/package/boot/uboot-imx6/Makefile
@@ -8,13 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
-PKG_VERSION:=2013.04
+PKG_VERSION:=2013.10
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=21bf962d69938ed4ed783b792b2b074e
+PKG_SOURCE_URL:= \
+	http://mirror2.openwrt.org/sources \
+	ftp://ftp.denx.de/pub/u-boot
+PKG_MD5SUM:=a076a044b64371edc52f7e562b13f6b2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,17 +26,52 @@ define uboot/Default
   IMAGE:=
 endef
 
-define uboot/wandboard_solo
-  TITLE:=U-Boot for the Wandboard Solo
+define uboot/nitrogen6dl
+  TITLE:=U-Boot for Nitrogen6x i.MX6Dual-Lite 1GB board
+endef
+
+define uboot/nitrogen6dl2g
+  TITLE:=U-Boot for Nitrogen6x i.MX6Dual-Lite 2GB board
+endef
+
+define uboot/nitrogen6q
+  TITLE:=U-Boot for Nitrogen6x/SABRE Lite (MX6Q/1GB)
+endef
+
+define uboot/nitrogen6q2g
+  TITLE:=U-Boot for Nitrogen6x i.MX6Quad 2GB board
+endef
+
+define uboot/nitrogen6s
+  TITLE:=U-Boot for Nitrogen6x i.MX6Solo 512MB board
+endef
+
+define uboot/nitrogen6s1g
+  TITLE:=U-Boot for Nitrogen6x i.MX6Solo 1GB board
 endef
 
 define uboot/wandboard_dl
   TITLE:=U-Boot for the Wandboard Dual Lite
 endef
 
+define uboot/wandboard_quad
+  TITLE:=U-Boot for the Wandboard Quad
+endef
+
+define uboot/wandboard_solo
+  TITLE:=U-Boot for the Wandboard Solo
+endef
+
 UBOOTS := \
-	wandboard_solo \
-	wandboard_dl
+	nitrogen6dl \
+	nitrogen6dl2g \
+	nitrogen6q \
+	nitrogen6q2g \
+	nitrogen6s \
+	nitrogen6s1g \
+	wandboard_dl \
+	wandboard_quad \
+	wandboard_solo
 
 define Package/uboot/template
 define Package/uboot-imx6-$(1)
@@ -61,13 +98,11 @@ UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin
 endif
 
 define Build/Configure
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(UBOOT_CONFIG)_config
+	$(MAKE) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIG)_config
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CROSS_COMPILE=$(TARGET_CROSS)
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS)
 endef
 
 define Package/uboot/install/default