From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 2 Apr 2011 12:43:21 +0000 (+0000)
Subject: ar71xx: use DEFAULT:= in the uboot-ar71xx package instead of adding uboot to the... 
X-Git-Tag: reboot~17068
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=624526ae1196f8d76e7012ee3b3ec0f6cace5041;p=openwrt%2Fopenwrt.git

ar71xx: use DEFAULT:= in the uboot-ar71xx package instead of adding uboot to the profiles, fixes imagebuilder issues

SVN-Revision: 26401
---

diff --git a/package/uboot-ar71xx/Makefile b/package/uboot-ar71xx/Makefile
index 86a20a8e84..fd97392f59 100644
--- a/package/uboot-ar71xx/Makefile
+++ b/package/uboot-ar71xx/Makefile
@@ -39,6 +39,7 @@ define Package/uboot-ar71xx-$(1)
   DEPENDS:=@TARGET_ar71xx_generic_Default||TARGET_ar71xx_generic_Minimal||TARGET_ar71xx_generic_NBG_460N_550N_550NH
   TITLE:=$(2)
   URL:=http://www.denx.de/wiki/U-Boot
+  DEFAULT:=y if (TARGET_ar71xx_generic_NBG_460N_550N_550NH || TARGET_ar71xx_generic_Default || CONFIG_TARGET_ar71xx_generic_Minimal)
   VARIANT:=$(1)
 endef
 endef
diff --git a/target/linux/ar71xx/generic/profiles/00-default.mk b/target/linux/ar71xx/generic/profiles/00-default.mk
index 99daf057b1..7166be5647 100644
--- a/target/linux/ar71xx/generic/profiles/00-default.mk
+++ b/target/linux/ar71xx/generic/profiles/00-default.mk
@@ -9,7 +9,7 @@ define Profile/Default
 	NAME:=Default Profile (all drivers)
 	PACKAGES:= \
 		kmod-ath9k kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig \
-		wpad-mini uboot-ar71xx-nbg460n_550n_550nh kmod-ledtrig-usbdev
+		wpad-mini kmod-ledtrig-usbdev
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/ar71xx/generic/profiles/01-minimal.mk b/target/linux/ar71xx/generic/profiles/01-minimal.mk
index d92eb15160..812ae6f1b9 100644
--- a/target/linux/ar71xx/generic/profiles/01-minimal.mk
+++ b/target/linux/ar71xx/generic/profiles/01-minimal.mk
@@ -7,7 +7,7 @@
 
 define Profile/Minimal
 	NAME:=Minimal Profile (no drivers)
-	PACKAGES:=uboot-ar71xx-nbg460n_550n_550nh
+	PACKAGES:=
 endef
 
 define Profile/Minimal/Description
diff --git a/target/linux/ar71xx/generic/profiles/zyxel.mk b/target/linux/ar71xx/generic/profiles/zyxel.mk
index 8004d150c2..b4da3041cb 100644
--- a/target/linux/ar71xx/generic/profiles/zyxel.mk
+++ b/target/linux/ar71xx/generic/profiles/zyxel.mk
@@ -7,7 +7,7 @@
 
 define Profile/NBG_460N_550N_550NH
 	NAME:=Zyxel NBG 460N/550N/550NH
-	PACKAGES:=kmod-ath9k kmod-rtc-pcf8563 swconfig uboot-ar71xx-nbg460n_550n_550nh
+	PACKAGES:=kmod-ath9k kmod-rtc-pcf8563 swconfig
 endef
 
 define Profile/NBG_460N_550N_550NH/Description