diff options
| author | John Crispin <john@openwrt.org> | 2011-07-03 17:38:23 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-07-03 17:38:23 +0000 |
| commit | 058eca0b3b91089de84e565bb496dbe8e54f1868 (patch) | |
| tree | 8616f14044305407935eb14d06787fcfe07205b9 | |
| parent | 43771202d35da68615a4af0743816aabe97a85e4 (diff) | |
| download | upstream-058eca0b3b91089de84e565bb496dbe8e54f1868.tar.gz upstream-058eca0b3b91089de84e565bb496dbe8e54f1868.tar.bz2 upstream-058eca0b3b91089de84e565bb496dbe8e54f1868.zip | |
automatic subtarget enumaration
SVN-Revision: 27407
| -rw-r--r-- | include/target.mk | 9 | ||||
| -rw-r--r-- | target/linux/lantiq/Makefile | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/target.mk b/include/target.mk index 676b983271..cfd7c9f3c3 100644 --- a/include/target.mk +++ b/include/target.mk @@ -17,9 +17,6 @@ DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall DEFAULT_PACKAGES.bootloader:= -# Add device specific packages -DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) - ifneq ($(DUMP),) all: dumpinfo endif @@ -30,6 +27,9 @@ ifeq ($(DUMP),) SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir)))) else PLATFORM_DIR:=${CURDIR} + ifeq ($(SUBTARGETS),) + SUBTARGETS:=$(strip $(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk))) + endif endif TARGETID:=$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET)) @@ -48,6 +48,9 @@ else endif endif +# Add device specific packages (here below to allow device type set from subtarget) +DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) + define Profile/Default NAME:= PACKAGES:= diff --git a/target/linux/lantiq/Makefile b/target/linux/lantiq/Makefile index c09be31a6e..0f5064c3fc 100644 --- a/target/linux/lantiq/Makefile +++ b/target/linux/lantiq/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=lantiq BOARDNAME:=Lantiq GPON/XWAY FEATURES:=squashfs jffs2 -SUBTARGETS:=xway falcon ase +#SUBTARGETS:=xway falcon ase LINUX_VERSION:=2.6.39.2 |