X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fwigyori.git;a=blobdiff_plain;f=include%2Ftarget.mk;h=c5f6e8bedeb3e1c150098d85a22d2b99dc53cef4;hp=868fe6b3758e2c80b893facd80bc956cb4e9a72e;hb=b73986a8264016883a8a7d666687a340cb810934;hpb=4a31037a34167a41705de319cdf989a63519debb diff --git a/include/target.mk b/include/target.mk index 868fe6b375..c5f6e8bede 100644 --- a/include/target.mk +++ b/include/target.mk @@ -67,19 +67,12 @@ ifndef Profile define Profile $(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 "@@"; \ @@ -98,7 +91,7 @@ else endef endif -PROFILE:=$(call qstrip,$(CONFIG_TARGET_PROFILE)) +PROFILE?=$(call qstrip,$(CONFIG_TARGET_PROFILE)) ifeq ($(TARGET_BUILD),1) ifneq ($(DUMP),) @@ -111,7 +104,9 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),) 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_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) +GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) +GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") __config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default @@ -162,45 +157,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,37 +166,31 @@ 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_24kc = -mips32r2 -mtune=24kc - 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 ifeq ($(ARCH),i386) - CPU_TYPE ?= i486 - CPU_CFLAGS_i486 = -march=i486 + CPU_TYPE ?= pentium + CPU_CFLAGS_pentium = -march=pentium-mmx CPU_CFLAGS_pentium4 = -march=pentium4 - CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow 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_cortex-a53 = -march=armv8-a -mtune=cortex-a53 - 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 @@ -253,27 +203,82 @@ 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 CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc endif ifeq ($(ARCH),aarch64) - CPU_TYPE ?= armv8-a - CPU_CFLAGS_armv8-a = -mcpu=armv8-a + CPU_TYPE ?= generic + CPU_CFLAGS_generic = -mcpu=generic + CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53 endif ifeq ($(ARCH),arc) CPU_TYPE ?= arc700 CPU_CFLAGS += -matomic - CPU_CFLAGS_arc700 = -marc700 - CPU_CFLAGS_archs = -marchs + CPU_CFLAGS_arc700 = -mcpu=arc700 + CPU_CFLAGS_archs = -mcpu=archs + endif + ifneq ($(CPU_TYPE),) + ifndef CPU_CFLAGS_$(CPU_TYPE) + $(warning CPU_TYPE "$(CPU_TYPE)" doesn't correspond to a known type) + endif 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 + CUR_SUBTARGET := default endif define BuildTargets/DumpCurrent