X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Ftarget.mk;h=c99c2825f211c1d0261c24f1c6805a4e6e17f989;hb=bd4880e204ac4f777c3bbfd33f8d362243773268;hp=51c1a59dca9f7191590b6250f450dedf22825b5c;hpb=835ea35726abfbd228284555540a136bf16fb297;p=openwrt.git diff --git a/include/target.mk b/include/target.mk index 51c1a59dca..c99c2825f2 100644 --- a/include/target.mk +++ b/include/target.mk @@ -51,6 +51,9 @@ endif # Add device specific packages (here below to allow device type set from subtarget) DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) +filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1)) +extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo) + define Profile/Default NAME:= PACKAGES:= @@ -65,7 +68,7 @@ define Profile DUMPINFO += \ echo "Target-Profile: $(1)"; \ echo "Target-Profile-Name: $(NAME)"; \ - echo "Target-Profile-Packages: $(PACKAGES)"; \ + echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \ if [ -f ./config/profile-$(1) ]; then \ echo "Target-Profile-Kconfig: yes"; \ fi; \ @@ -231,7 +234,8 @@ ifeq ($(DUMP),1) CPU_CFLAGS_fa526 = -march=armv4 -mtune=fa526 CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale - ifneq ($(CONFIG_SOFT_FLOAT),) + ifeq ($(CONFIG_SOFT_FLOAT),) + CPU_CFLAGS_neon = -mfpu=neon CPU_CFLAGS_vfp = -mfpu=vfp CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 endif @@ -269,7 +273,7 @@ define BuildTargets/DumpCurrent echo 'Target-Description:'; \ $(SH_FUNC) getvar $(call shvar,Target/Description); \ echo '@@'; \ - echo 'Default-Packages: $(DEFAULT_PACKAGES)'; \ + echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \ $(DUMPINFO) $(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); )) endef