X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ftarget.mk;h=a554386cd8dce5bec4d7c142edf6a7b28cd015e3;hb=5034ae5d5d8d3641b807406e1cc142b3a281b33e;hp=baca4b5e792e66ee4971ae8fac4e6aef88c1b1fa;hpb=dd07e34d78725d05b466af5f9118adf1d0721fdb;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/target.mk b/include/target.mk index baca4b5e79..a554386cd8 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall -DEFAULT_PACKAGES.bootloader:=kexec-tools +DEFAULT_PACKAGES.bootloader:= # Additional packages for Linux 2.6 ifneq ($(KERNEL),2.4) @@ -119,7 +119,13 @@ LINUX_SUBCONFIG?=$(firstword $(wildcard $(PLATFORM_SUBDIR)/config-$(KERNEL_PATCH ifeq ($(LINUX_CONFIG),$(LINUX_SUBCONFIG)) LINUX_SUBCONFIG:= 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=$(if $(LINUX_CONFIG), \ + $(if $(GENERIC_LINUX_CONFIG),,$(error The generic kernel config for your kernel version is mising)) \ + $(if $(LINUX_CONFIG),,$(error The target kernel config for your kernel version is mising)) \ + $(SCRIPT_DIR)/kconfig.pl \ + + $(GENERIC_LINUX_CONFIG) \ + $(if $(LINUX_SUBCONFIG),+ $(LINUX_CONFIG) $(LINUX_SUBCONFIG),$(LINUX_CONFIG)), \ + true) ifeq ($(DUMP),1) BuildTarget=$(BuildTargets/DumpCurrent) @@ -155,6 +161,8 @@ ifeq ($(DUMP),1) 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_mipsel=$(DEFAULT_CFLAGS_mips) + DEFAULT_CFLAGS_mips64=-Os -pipe -mips64 -mtune=mips64 -mabi=64 -funit-at-a-time + DEFAULT_CFLAGS_mips64el=$(DEFAULT_CFLAGS_mips64) DEFAULT_CFLAGS_arm=-Os -pipe -march=armv5te -mtune=xscale -funit-at-a-time DEFAULT_CFLAGS_armeb=$(DEFAULT_CFLAGS_arm) DEFAULT_CFLAGS=$(if $(DEFAULT_CFLAGS_$(ARCH)),$(DEFAULT_CFLAGS_$(ARCH)),-Os -pipe -funit-at-a-time)