sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25

[openwrt.git] / target / linux / ixp4xx / Makefile

diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index 5ef4c8c..e079774 100644 (file)
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@@ -8,14 +8,20 @@ include $(TOPDIR)/rules.mk
 
 ARCH:=armeb
 BOARD:=ixp4xx
-BOARDNAME:=Intel XScale IXP4xx
+BOARDNAME:=Intel IXP4xx
 FEATURES:=squashfs
 SUBTARGETS=generic harddisk
 
-LINUX_VERSION:=2.6.23.14
+LINUX_VERSION:=2.6.25
 
 include $(INCLUDE_DIR)/target.mk
 
+define Kernel/Configure
+       $(call Kernel/Configure/Default)
+       $(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(LINUX_DIR)/.config
+       $(if $(CONFIG_EABI_SUPPORT),echo '# CONFIG_OABI_COMPAT is not set' >> $(LINUX_DIR)/.config)
+endef
+
 DEFAULT_PACKAGES += ixp4xx-microcode
 
 $(eval $(call BuildTarget))