X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cadbb5f37cbf5a6e1ba01563a5ab64a6610318a3..885f06942ed191ec3ff2b8c30042aa36d8746393:/include/target.mk diff --git a/include/target.mk b/include/target.mk index 2f62c2a8c..676b98327 100644 --- a/include/target.mk +++ b/include/target.mk @@ -12,16 +12,11 @@ __target_inc=1 DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg hotplug2 # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall DEFAULT_PACKAGES.bootloader:= -# Additional packages for Linux 2.6 -ifneq ($(KERNEL),2.4) - DEFAULT_PACKAGES += udevtrigger hotplug2 -endif - # Add device specific packages DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) @@ -72,10 +67,10 @@ define Profile echo "Target-Profile-Kconfig: yes"; \ fi; \ echo "Target-Profile-Config: "; \ - getvar "$(call shvar,Profile/$(1)/Config)"; \ + $(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Config)"; \ echo "@@"; \ echo "Target-Profile-Description:"; \ - getvar "$(call shvar,Profile/$(1)/Description)"; \ + $(SH_FUNC) getvar "$(call shvar,Profile/$(1)/Description)"; \ echo "@@"; \ echo; ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_)$(1))),y) @@ -109,25 +104,58 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),) include $(INCLUDE_DIR)/kernel-version.mk endif -GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL) +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)") -GENERIC_LINUX_CONFIG?=$(firstword $(wildcard $(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER) $(GENERIC_PLATFORM_DIR)/config-default)) -LINUX_CONFIG?=$(firstword $(wildcard $(foreach subdir,$(PLATFORM_DIR) $(PLATFORM_SUBDIR),$(subdir)/config-$(KERNEL_PATCHVER) $(subdir)/config-default)) $(PLATFORM_DIR)/config-$(KERNEL_PATCHVER)) -LINUX_SUBCONFIG?=$(firstword $(wildcard $(PLATFORM_SUBDIR)/config-$(KERNEL_PATCHVER) $(PLATFORM_SUBDIR)/config-default)) -ifeq ($(LINUX_CONFIG),$(LINUX_SUBCONFIG)) - LINUX_SUBCONFIG:= +__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default +__config_list = $(firstword $(wildcard $(call __config_name_list,$(1)))) +find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list))) + +GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR)) +LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR)) +ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR)) + LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR)) +endif + +# config file list used for compiling +LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(TOPDIR)/env/kernel-config) + +# default config list for reconfiguring +# defaults to subtarget if subtarget exists and target does not +# defaults to target otherwise +USE_SUBTARGET_CONFIG = $(if $(wildcard $(LINUX_TARGET_CONFIG)),,$(if $(LINUX_SUBTARGET_CONFIG),1)) + +LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG))) +LINUX_RECONFIG_TARGET = $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG),$(LINUX_TARGET_CONFIG)) + +# select the config file to be cahnged by kernel_menuconfig/kernel_oldconfig +ifeq ($(CONFIG_TARGET),platform) + LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG)) + LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG) +endif +ifeq ($(CONFIG_TARGET),subtarget) + LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG)) + LINUX_RECONFIG_TARGET = $(LINUX_SUBTARGET_CONFIG) +endif +ifeq ($(CONFIG_TARGET),env) + LINUX_RECONFIG_LIST = $(LINUX_KCONFIG_LIST) + LINUX_RECONFIG_TARGET = $(TOPDIR)/env/kernel-config endif -LINUX_CONFCMD=$(if $(LINUX_CONFIG),$(SCRIPT_DIR)/kconfig.pl + $(GENERIC_LINUX_CONFIG) $(if $(LINUX_SUBCONFIG),+ $(LINUX_CONFIG) $(LINUX_SUBCONFIG),$(LINUX_CONFIG)),true) + +__linux_confcmd = $(SCRIPT_DIR)/kconfig.pl $(2) $(patsubst %,+,$(wordlist 2,9999,$(1))) $(1) + +LINUX_CONF_CMD = $(call __linux_confcmd,$(LINUX_KCONFIG_LIST),) +LINUX_RECONF_CMD = $(call __linux_confcmd,$(LINUX_RECONFIG_LIST),) +LINUX_RECONF_DIFF = $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET),$(LINUX_RECONFIG_LIST)),'>') ifeq ($(DUMP),1) BuildTarget=$(BuildTargets/DumpCurrent) ifneq ($(BOARD),) TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID)) - $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) $(LINUX_SUBCONFIG) - $(LINUX_CONFCMD) > $@ || rm -f $@ + $(TMP_CONFIG): $(LINUX_KCONFIG_LIST) + $(LINUX_CONF_CMD) > $@ || rm -f $@ -include $(TMP_CONFIG) .SILENT: $(TMP_CONFIG) .PRECIOUS: $(TMP_CONFIG) @@ -138,8 +166,13 @@ ifeq ($(DUMP),1) ifneq ($(CONFIG_PCI),) FEATURES += pci endif + ifneq ($(CONFIG_PCIEPORTBUS),) + FEATURES += pcie + endif ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),) - FEATURES += usb + ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),) + FEATURES += usb + endif endif ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),) FEATURES += pcmcia @@ -151,13 +184,17 @@ ifeq ($(DUMP),1) # remove duplicates FEATURES:=$(sort $(FEATURES)) endif - DEFAULT_CFLAGS_i386=-O2 -pipe -march=i486 -funit-at-a-time - DEFAULT_CFLAGS_x86_64=-O2 -pipe -march=athlon64 -funit-at-a-time - DEFAULT_CFLAGS_mips=-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time + DEFAULT_CFLAGS_i386=-O2 -pipe -march=i486 -fno-caller-saves + DEFAULT_CFLAGS_x86_64=-O2 -pipe -march=athlon64 -fno-caller-saves + DEFAULT_CFLAGS_m68k=-Os -pipe -mcfv4e -fno-caller-saves + DEFAULT_CFLAGS_mips=-Os -pipe -mips32 -mtune=mips32 -fno-caller-saves DEFAULT_CFLAGS_mipsel=$(DEFAULT_CFLAGS_mips) - DEFAULT_CFLAGS_arm=-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time + DEFAULT_CFLAGS_mips64=-Os -pipe -mips64 -mtune=mips64 -mabi=64 -fno-caller-saves + DEFAULT_CFLAGS_mips64el=$(DEFAULT_CFLAGS_mips64) + DEFAULT_CFLAGS_sparc=-Os -pipe -mcpu=ultrasparc -fno-caller-saves + DEFAULT_CFLAGS_arm=-Os -pipe -march=armv5te -mtune=xscale -fno-caller-saves DEFAULT_CFLAGS_armeb=$(DEFAULT_CFLAGS_arm) - DEFAULT_CFLAGS=$(if $(DEFAULT_CFLAGS_$(ARCH)),$(DEFAULT_CFLAGS_$(ARCH)),-Os -pipe -funit-at-a-time) + DEFAULT_CFLAGS=$(if $(DEFAULT_CFLAGS_$(ARCH)),$(DEFAULT_CFLAGS_$(ARCH)),-Os -pipe -fno-caller-saves) endif define BuildTargets/DumpCurrent @@ -165,10 +202,10 @@ define BuildTargets/DumpCurrent dumpinfo: @echo 'Target: $(TARGETID)'; \ echo 'Target-Board: $(BOARD)'; \ - echo 'Target-Kernel: $(KERNEL)'; \ - echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),, [$(KERNEL)])$(if $(SUBTARGETS),$(if $(SUBTARGET), [$(KERNEL)]))'; \ + 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-Features: $(FEATURES)'; \ echo 'Target-Depends: $(DEPENDS)'; \ echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \ @@ -176,7 +213,7 @@ define BuildTargets/DumpCurrent echo 'Linux-Release: $(LINUX_RELEASE)'; \ echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \ echo 'Target-Description:'; \ - getvar $(call shvar,Target/Description); \ + $(SH_FUNC) getvar $(call shvar,Target/Description); \ echo '@@'; \ echo 'Default-Packages: $(DEFAULT_PACKAGES)'; \ $(DUMPINFO)