diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-02-21 16:26:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-02-21 16:26:27 +0000 |
| commit | 08b408a4c555c5174e12f81e4685507ede9b78e5 (patch) | |
| tree | 73b5e068130340da0db4566d4ec475f8924081b4 | |
| parent | cc7c06781ad34a28631564515a11ad9dd7101a84 (diff) | |
| download | upstream-08b408a4c555c5174e12f81e4685507ede9b78e5.tar.gz upstream-08b408a4c555c5174e12f81e4685507ede9b78e5.tar.bz2 upstream-08b408a4c555c5174e12f81e4685507ede9b78e5.zip | |
move the EABI config override to the generic kernel config overrides, as it's arch specific, not target specific - fixes spurious kernel rebuild issues with EABI
SVN-Revision: 14594
| -rw-r--r-- | include/kernel-defaults.mk | 2 | ||||
| -rw-r--r-- | target/linux/ixp4xx/Makefile | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index f0639e39fe..de07b91189 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -91,6 +91,8 @@ define Kernel/Configure/Default echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target + $(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(LINUX_DIR)/.config.target + $(if $(CONFIG_EABI_SUPPORT),echo '# CONFIG_OABI_COMPAT is not set' >> $(LINUX_DIR)/.config.target) $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config $(call Kernel/SetInitramfs) diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index cfe76d8bce..1499075f1d 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -16,12 +16,6 @@ LINUX_VERSION:=2.6.28.6 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 fconfig $(eval $(call BuildTarget)) |