From 09cf9e7485fdcdf644789bc6286f417962363199 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sat, 15 Sep 2018 00:05:19 +0200 Subject: include/target.mk : remove firewall module from DEFAULT_PACKAGES.router, add some CPU_FLAGS_* --- include/target.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index e36cdd6..9afb312 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,7 +14,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools # For router targets -DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall odhcpd odhcp6c +DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-ipt-nathelper odhcpd odhcp6c DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) @@ -113,6 +113,8 @@ endif GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") +MT7615_PATCH_DIR := $(TOPDIR)/target/linux/wifi/mt7615-patch +MT76x2_PATCH_DIR := $(TOPDIR)/target/linux/wifi/mt76x2-patch __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default __config_list = $(firstword $(wildcard $(call __config_name_list,$(1)))) @@ -215,6 +217,7 @@ ifeq ($(DUMP),1) CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc + CPU_CFLAGS_1004kc = -mips32r2 -mtune=1004kc CPU_CFLAGS_octeon = -march=octeon -mabi=64 CPU_CFLAGS_dsp = -mdsp CPU_CFLAGS_dsp2 = -mdspr2 @@ -230,6 +233,7 @@ 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_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 @@ -253,6 +257,10 @@ ifeq ($(DUMP),1) CPU_TYPE = sparc CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc endif + ifeq ($(ARCH),aarch64) + CPU_TYPE ?= armv8-a + CPU_CFLAGS_armv8-a = -mcpu=armv8-a + endif DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE))) endif -- cgit v1.1