projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: add image makefile helper function for pading with an offset
[openwrt.git]
/
include
/
target.mk
diff --git
a/include/target.mk
b/include/target.mk
index
79d52f0
..
db501e0
100644
(file)
--- a/
include/target.mk
+++ b/
include/target.mk
@@
-12,9
+12,11
@@
__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 nas targets
+DEFAULT_PACKAGES.nas:=block-mount fdisk lvm2 lsblk mdadm
# For router targets
# 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-
nf
-nathelper firewall odhcpd odhcp6c
DEFAULT_PACKAGES.bootloader:=
ifneq ($(DUMP),)
DEFAULT_PACKAGES.bootloader:=
ifneq ($(DUMP),)
@@
-51,6
+53,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:=
@@
-60,20
+65,20
@@
ifndef Profile
define Profile
$(eval $(call Profile/Default))
$(eval $(call Profile/$(1)))
define Profile
$(eval $(call Profile/Default))
$(eval $(call Profile/$(1)))
-
$(eval $(call shexport,Profile/$(1)/Config)
)
-
$(eval $(call shexport,Profile/$(1)/Description)
)
+
dumpinfo : $(call shexport,Profile/$(1)/Config
)
+
dumpinfo : $(call shexport,Profile/$(1)/Description
)
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; \
echo "Target-Profile-Config: "; \
if [ -f ./config/profile-$(1) ]; then \
echo "Target-Profile-Kconfig: yes"; \
fi; \
echo "Target-Profile-Config: "; \
-
$(SH_FUNC) getvar "
$(call shvar,Profile/$(1)/Config)"; \
+
echo "$$$$$$$$
$(call shvar,Profile/$(1)/Config)"; \
echo "@@"; \
echo "Target-Profile-Description:"; \
echo "@@"; \
echo "Target-Profile-Description:"; \
-
$(SH_FUNC) getvar "
$(call shvar,Profile/$(1)/Description)"; \
+
echo "$$$$$$$$
$(call shvar,Profile/$(1)/Description)"; \
echo "@@"; \
echo;
ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
echo "@@"; \
echo;
ifeq ($(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(if $(SUBTARGET),$(SUBTARGET)_))$(1)),y)
@@
-101,8
+106,6
@@
else
endif
endif
endif
endif
-$(eval $(call shexport,Target/Description))
-
ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
include $(INCLUDE_DIR)/kernel-version.mk
endif
ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
include $(INCLUDE_DIR)/kernel-version.mk
endif
@@
-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,9
+230,11
@@
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
@@
-247,11
+254,16
@@
ifeq ($(DUMP),1)
CPU_TYPE = sparc
CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
endif
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
define BuildTargets/DumpCurrent
.PHONY: dumpinfo
DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
endif
define BuildTargets/DumpCurrent
.PHONY: dumpinfo
+ dumpinfo : export DESCRIPTION=$$(Target/Description)
dumpinfo:
@echo 'Target: $(TARGETID)'; \
echo 'Target-Board: $(BOARD)'; \
dumpinfo:
@echo 'Target: $(TARGETID)'; \
echo 'Target-Board: $(BOARD)'; \
@@
-266,11
+278,11
@@
define BuildTargets/DumpCurrent
echo 'Linux-Version: $(LINUX_VERSION)'; \
echo 'Linux-Release: $(LINUX_RELEASE)'; \
echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
echo 'Linux-Version: $(LINUX_VERSION)'; \
echo 'Linux-Release: $(LINUX_RELEASE)'; \
echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
- $(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; ))
+ $(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; ))
\
echo 'Target-Description:'; \
echo 'Target-Description:'; \
-
$(SH_FUNC) getvar $(call shvar,Target/Description)
; \
+
echo "$$$$DESCRIPTION"
; \
echo '@@'; \
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