X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Ftarget.mk;h=61489cabe707225d25d89d210700ce76ce810a8c;hp=db501e06c760f296dc143604f60336a978921579;hb=7c7ea090041dc2a5e51b36d0bc3115a8830525bf;hpb=40da7aae54ad7f098064f18e28eb8201afedfd5c diff --git a/include/target.mk b/include/target.mk index db501e06c7..61489cabe7 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,5 +1,6 @@ # # Copyright (C) 2007-2008 OpenWrt.org +# Copyright (C) 2016 LEDE Project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,11 +13,11 @@ __target_inc=1 DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd # For nas targets -DEFAULT_PACKAGES.nas:=block-mount fdisk lvm2 lsblk mdadm +DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets -DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe kmod-nf-nathelper firewall odhcpd odhcp6c +DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe firewall odhcpd odhcp6c DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) @@ -56,34 +57,26 @@ 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 +define ProfileDefault NAME:= + PRIORITY:= PACKAGES:= endef ifndef Profile define Profile - $(eval $(call Profile/Default)) + $(eval $(call ProfileDefault)) $(eval $(call Profile/$(1))) - dumpinfo : $(call shexport,Profile/$(1)/Config) dumpinfo : $(call shexport,Profile/$(1)/Description) DUMPINFO += \ echo "Target-Profile: $(1)"; \ + $(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \ echo "Target-Profile-Name: $(NAME)"; \ echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \ - if [ -f ./config/profile-$(1) ]; then \ - echo "Target-Profile-Kconfig: yes"; \ - fi; \ - echo "Target-Profile-Config: "; \ - echo "$$$$$$$$$(call shvar,Profile/$(1)/Config)"; \ - echo "@@"; \ echo "Target-Profile-Description:"; \ echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \ echo "@@"; \ echo; - ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y) - PROFILE=$(1) - endif endef endif @@ -98,10 +91,10 @@ else endef endif +PROFILE?=$(call qstrip,$(CONFIG_TARGET_PROFILE)) + ifeq ($(TARGET_BUILD),1) - $(eval $(call IncludeProfiles)) -else - ifeq ($(DUMP),) + ifneq ($(DUMP),) $(eval $(call IncludeProfiles)) endif endif @@ -162,45 +155,6 @@ LINUX_RECONF_DIFF = $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET) ifeq ($(DUMP),1) BuildTarget=$(BuildTargets/DumpCurrent) - ifneq ($(BOARD),) - TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID)) - $(TMP_CONFIG): $(LINUX_KCONFIG_LIST) - $(LINUX_CONF_CMD) > $@ || rm -f $@ - -include $(TMP_CONFIG) - .SILENT: $(TMP_CONFIG) - .PRECIOUS: $(TMP_CONFIG) - - ifneq ($(CONFIG_OF),) - FEATURES += dt - endif - ifneq ($(CONFIG_GENERIC_GPIO)$(CONFIG_GPIOLIB),) - FEATURES += gpio - endif - ifneq ($(CONFIG_PCI),) - FEATURES += pci - endif - ifneq ($(CONFIG_PCIEPORTBUS),) - FEATURES += pcie - endif - ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),) - ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),) - FEATURES += usb - endif - endif - ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),) - FEATURES += pcmcia - endif - ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),) - FEATURES += display - endif - ifneq ($(CONFIG_RTC_CLASS),) - FEATURES += rtc - endif - FEATURES += $(foreach v,v4 v5 v6 v7,$(if $(findstring -march=arm$(v),$(CFLAGS)),arm_$(v))) - - # remove duplicates - FEATURES:=$(sort $(FEATURES)) - endif CPU_CFLAGS = -Os -pipe ifneq ($(findstring mips,$(ARCH)),) ifneq ($(findstring mips64,$(ARCH)),) @@ -210,38 +164,36 @@ ifeq ($(DUMP),1) endif CPU_CFLAGS += -mno-branch-likely CPU_CFLAGS_mips32 = -mips32 -mtune=mips32 - CPU_CFLAGS_mips32r2 = -mips32r2 -mtune=mips32r2 CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64 - CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec - CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc + CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc CPU_CFLAGS_octeon = -march=octeon -mabi=64 - CPU_CFLAGS_dsp = -mdsp - CPU_CFLAGS_dsp2 = -mdspr2 endif ifeq ($(ARCH),i386) - CPU_TYPE ?= i486 - CPU_CFLAGS_i486 = -march=i486 - CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow + CPU_TYPE ?= pentium + CPU_CFLAGS_pentium = -march=pentium-mmx + CPU_CFLAGS_pentium4 = -march=pentium4 endif ifneq ($(findstring arm,$(ARCH)),) CPU_TYPE ?= xscale - CPU_CFLAGS_arm920t = -march=armv4t -mtune=arm920t - 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-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_arm920t = -mcpu=arm920t + CPU_CFLAGS_arm926ej-s = -mcpu=arm926ej-s + CPU_CFLAGS_arm1136j-s = -mcpu=arm1136j-s + CPU_CFLAGS_arm1176jzf-s = -mcpu=arm1176jzf-s + CPU_CFLAGS_cortex-a5 = -mcpu=cortex-a5 + CPU_CFLAGS_cortex-a7 = -mcpu=cortex-a7 + CPU_CFLAGS_cortex-a8 = -mcpu=cortex-a8 + CPU_CFLAGS_cortex-a9 = -mcpu=cortex-a9 + CPU_CFLAGS_cortex-a15 = -mcpu=cortex-a15 + CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53 + CPU_CFLAGS_fa526 = -mcpu=fa526 + CPU_CFLAGS_mpcore = -mcpu=mpcore + CPU_CFLAGS_xscale = -mcpu=xscale ifeq ($(CONFIG_SOFT_FLOAT),) CPU_CFLAGS_neon = -mfpu=neon CPU_CFLAGS_vfp = -mfpu=vfp CPU_CFLAGS_vfpv3 = -mfpu=vfpv3-d16 + CPU_CFLAGS_neon-vfpv4 = -mfpu=neon-vfpv4 endif endif ifeq ($(ARCH),powerpc) @@ -249,6 +201,7 @@ ifeq ($(DUMP),1) CPU_CFLAGS_8540:=-mcpu=8540 CPU_CFLAGS_405:=-mcpu=405 CPU_CFLAGS_440:=-mcpu=440 + CPU_CFLAGS_464fp:=-mcpu=464fp endif ifeq ($(ARCH),sparc) CPU_TYPE = sparc @@ -257,8 +210,68 @@ ifeq ($(DUMP),1) ifeq ($(ARCH),aarch64) CPU_TYPE ?= armv8-a CPU_CFLAGS_armv8-a = -mcpu=armv8-a + CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53 + endif + ifeq ($(ARCH),arc) + CPU_TYPE ?= arc700 + CPU_CFLAGS += -matomic + CPU_CFLAGS_arc700 = -mcpu=arc700 + CPU_CFLAGS_archs = -mcpu=archs endif DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE))) + + ifneq ($(BOARD),) + TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID)) + $(TMP_CONFIG): $(LINUX_KCONFIG_LIST) + $(LINUX_CONF_CMD) > $@ || rm -f $@ + -include $(TMP_CONFIG) + .SILENT: $(TMP_CONFIG) + .PRECIOUS: $(TMP_CONFIG) + + ifneq ($(CONFIG_OF),) + FEATURES += dt + endif + ifneq ($(CONFIG_GENERIC_GPIO)$(CONFIG_GPIOLIB),) + FEATURES += gpio + endif + ifneq ($(CONFIG_PCI),) + FEATURES += pci + endif + ifneq ($(CONFIG_PCIEPORTBUS),) + FEATURES += pcie + endif + ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),) + ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),) + FEATURES += usb + endif + endif + ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),) + FEATURES += pcmcia + endif + ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),) + FEATURES += display + endif + ifneq ($(CONFIG_RTC_CLASS),) + FEATURES += rtc + endif + ifneq ($(CONFIG_VIRTIO),) + FEATURES += virtio + endif + ifneq ($(CONFIG_CPU_MIPS32_R2),) + ifneq ($(CPU_SUBTYPE),nomips16) + FEATURES += mips16 + endif + endif + FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v))) + + # remove duplicates + FEATURES:=$(sort $(FEATURES)) + endif +endif + +CUR_SUBTARGET:=$(SUBTARGET) +ifeq ($(SUBTARGETS),) + CUR_SUBTARGET := default endif define BuildTargets/DumpCurrent @@ -268,9 +281,8 @@ define BuildTargets/DumpCurrent @echo 'Target: $(TARGETID)'; \ echo 'Target-Board: $(BOARD)'; \ echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \ - echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'; \ echo 'Target-Arch: $(ARCH)'; \ - echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD))'; \ + echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(ARCH)$(if $(CPU_TYPE),_$(CPU_TYPE))$(if $(CPU_SUBTYPE),_$(CPU_SUBTYPE)))'; \ echo 'Target-Features: $(FEATURES)'; \ echo 'Target-Depends: $(DEPENDS)'; \ echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \ @@ -284,6 +296,7 @@ define BuildTargets/DumpCurrent echo '@@'; \ echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \ $(DUMPINFO) + $(if $(CUR_SUBTARGET),$(SUBMAKE) -r --no-print-directory -C image -s DUMP=1 SUBTARGET=$(CUR_SUBTARGET)) $(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); )) endef