summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-02 12:43:21 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-02 12:43:21 +0000
commit76707734e8a057688f539d36461b5e87fba76bf1 (patch)
tree0b1a779ff36cabf0931aee1a7bf7eef1bdff13c9
parentbf4af64e061d49308273988f6334a76b770c3dd2 (diff)
ar71xx: use DEFAULT:= in the uboot-ar71xx package instead of adding uboot to the profiles, fixes imagebuilder issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26401 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/uboot-ar71xx/Makefile1
-rw-r--r--target/linux/ar71xx/generic/profiles/00-default.mk2
-rw-r--r--target/linux/ar71xx/generic/profiles/01-minimal.mk2
-rw-r--r--target/linux/ar71xx/generic/profiles/zyxel.mk2
4 files changed, 4 insertions, 3 deletions
diff --git a/package/uboot-ar71xx/Makefile b/package/uboot-ar71xx/Makefile
index 86a20a8e8..fd97392f5 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 99daf057b..7166be564 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 d92eb1516..812ae6f1b 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 8004d150c..b4da3041c 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