projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganize netfilter kernel modules and package nftables kernel support
[openwrt.git]
/
include
/
target.mk
diff --git
a/include/target.mk
b/include/target.mk
index
7ca556e
..
f8c2375
100644
(file)
--- a/
include/target.mk
+++ b/
include/target.mk
@@
-12,9
+12,9
@@
__target_inc=1
DEVICE_TYPE?=router
# Default packages - the really basic set
DEVICE_TYPE?=router
# Default packages - the really basic set
-DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd
+DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd
fstools
# For router targets
# For router targets
-DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-
ipt-nathelper firewall 6relay
d odhcp6c
+DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-
nf-nathelper firewall odhcp
d odhcp6c
DEFAULT_PACKAGES.bootloader:=
ifneq ($(DUMP),)
DEFAULT_PACKAGES.bootloader:=
ifneq ($(DUMP),)
@@
-51,6
+51,9
@@
endif
# Add device specific packages (here below to allow device type set from subtarget)
DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
# 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:=
define Profile/Default
NAME:=
PACKAGES:=
@@
-65,7
+68,7
@@
define Profile
DUMPINFO += \
echo "Target-Profile: $(1)"; \
echo "Target-Profile-Name: $(NAME)"; \
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; \
if [ -f ./config/profile-$(1) ]; then \
echo "Target-Profile-Kconfig: yes"; \
fi; \
@@
-76,7
+79,7
@@
define Profile
$(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Description)"; \
echo "@@"; \
echo;
$(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Description)"; \
echo "@@"; \
echo;
- ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_)
$(1)
)),y)
+ ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_)
)$(1
)),y)
PROFILE=$(1)
endif
endef
PROFILE=$(1)
endif
endef
@@
-211,6
+214,8
@@
ifeq ($(DUMP),1)
CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
+ CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
+ CPU_CFLAGS_octeon = -march=octeon -mabi=64
CPU_CFLAGS_dsp = -mdsp
CPU_CFLAGS_dsp2 = -mdspr2
endif
CPU_CFLAGS_dsp = -mdsp
CPU_CFLAGS_dsp2 = -mdspr2
endif
@@
-225,14
+230,19
@@
ifeq ($(DUMP),1)
CPU_CFLAGS_arm926ej-s = -march=armv5te -mtune=arm926ej-s
CPU_CFLAGS_arm1136j-s = -march=armv6 -mtune=arm1136j-s
CPU_CFLAGS_arm1176jzf-s = -march=armv6 -mtune=arm1176jzf-s
CPU_CFLAGS_arm926ej-s = -march=armv5te -mtune=arm926ej-s
CPU_CFLAGS_arm1136j-s = -march=armv6 -mtune=arm1136j-s
CPU_CFLAGS_arm1176jzf-s = -march=armv6 -mtune=arm1176jzf-s
+ CPU_CFLAGS_cortex-a5 = -march=armv7-a -mtune=cortex-a5
CPU_CFLAGS_cortex-a7 = -march=armv7-a -mtune=cortex-a7
CPU_CFLAGS_cortex-a8 = -march=armv7-a -mtune=cortex-a8
CPU_CFLAGS_cortex-a9 = -march=armv7-a -mtune=cortex-a9
CPU_CFLAGS_cortex-a7 = -march=armv7-a -mtune=cortex-a7
CPU_CFLAGS_cortex-a8 = -march=armv7-a -mtune=cortex-a8
CPU_CFLAGS_cortex-a9 = -march=armv7-a -mtune=cortex-a9
+ CPU_CFLAGS_cortex-a15 = -march=armv7-a -mtune=cortex-a15
CPU_CFLAGS_fa526 = -march=armv4 -mtune=fa526
CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore
CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale
CPU_CFLAGS_fa526 = -march=armv4 -mtune=fa526
CPU_CFLAGS_mpcore = -march=armv6k -mtune=mpcore
CPU_CFLAGS_xscale = -march=armv5te -mtune=xscale
- CPU_CFLAGS_vfp = -mfpu=vfp -mfloat-abi=softfp
- CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 -mfloat-abi=softfp
+ ifeq ($(CONFIG_SOFT_FLOAT),)
+ CPU_CFLAGS_neon = -mfpu=neon
+ CPU_CFLAGS_vfp = -mfpu=vfp
+ CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16
+ endif
endif
ifeq ($(ARCH),powerpc)
CPU_CFLAGS_603e:=-mcpu=603e
endif
ifeq ($(ARCH),powerpc)
CPU_CFLAGS_603e:=-mcpu=603e
@@
-267,7
+277,7
@@
define BuildTargets/DumpCurrent
echo 'Target-Description:'; \
$(SH_FUNC) getvar $(call shvar,Target/Description); \
echo '@@'; \
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
$(DUMPINFO)
$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); ))
endef