From 2d305bdc2338b3295d6338a0215ce4cf7bb027f8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 11 Mar 2010 18:48:50 +0000 Subject: [PATCH] the mips -ffreestanding patch has been unnecessary for a long time now, remove it SVN-Revision: 20149 --- .../ar71xx/patches-2.6.32/001-ar71xx_core.patch | 10 +++++----- .../ar71xx/patches-2.6.32/300-mips_fw_myloader.patch | 2 +- .../ar71xx/patches-2.6.33/001-ar71xx_core.patch | 10 +++++----- .../ar71xx/patches-2.6.33/300-mips_fw_myloader.patch | 2 +- .../ar71xx/patches-2.6.34/001-ar71xx_core.patch | 10 +++++----- .../ar71xx/patches-2.6.34/300-mips_fw_myloader.patch | 2 +- .../patches-2.6.25/202-mips-freestanding.patch | 12 ------------ .../patches-2.6.30/202-mips-freestanding.patch | 12 ------------ .../patches-2.6.31/202-mips-freestanding.patch | 12 ------------ .../patches-2.6.32/202-mips-freestanding.patch | 12 ------------ .../patches-2.6.33/202-mips-freestanding.patch | 12 ------------ .../patches-2.6.34/202-mips-freestanding.patch | 12 ------------ .../ramips/patches-2.6.32/100-mips-ralink-core.patch | 10 +++++----- 13 files changed, 23 insertions(+), 95 deletions(-) delete mode 100644 target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.31/202-mips-freestanding.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.32/202-mips-freestanding.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.33/202-mips-freestanding.patch delete mode 100644 target/linux/generic-2.6/patches-2.6.34/202-mips-freestanding.patch diff --git a/target/linux/ar71xx/patches-2.6.32/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.32/001-ar71xx_core.patch index c33e902e9e..e1a1e3efe3 100644 --- a/target/linux/ar71xx/patches-2.6.32/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.32/001-ar71xx_core.patch @@ -1,7 +1,7 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -624,6 +624,13 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 +@@ -156,6 +156,13 @@ ifeq (,$(findstring march=octeon, $(cfla + cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon endif +# @@ -11,9 +11,9 @@ +cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx +load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000 + - # temporary until string.h is fixed - cflags-y += -ffreestanding - + cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) + cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,) + cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -43,6 +43,23 @@ config AR7 diff --git a/target/linux/ar71xx/patches-2.6.32/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.32/300-mips_fw_myloader.patch index 8a834607d2..7eb150e40c 100644 --- a/target/linux/ar71xx/patches-2.6.32/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.32/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -169,6 +169,7 @@ endif +@@ -178,6 +178,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ diff --git a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch index 5b322d68f7..5073652dd5 100644 --- a/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.33/001-ar71xx_core.patch @@ -1,7 +1,7 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -637,6 +637,13 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 +@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla + cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon endif +# @@ -11,9 +11,9 @@ +cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx +load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000 + - # temporary until string.h is fixed - cflags-y += -ffreestanding - + cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) + cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,) + cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -48,6 +48,23 @@ config AR7 diff --git a/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch index dd4905a079..0d8f132dd0 100644 --- a/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.33/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -181,6 +181,7 @@ endif +@@ -188,6 +188,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ diff --git a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch index 5b322d68f7..5073652dd5 100644 --- a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch @@ -1,7 +1,7 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -637,6 +637,13 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 +@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla + cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon endif +# @@ -11,9 +11,9 @@ +cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx +load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000 + - # temporary until string.h is fixed - cflags-y += -ffreestanding - + cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) + cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,) + cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -48,6 +48,23 @@ config AR7 diff --git a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch index dd4905a079..0d8f132dd0 100644 --- a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -181,6 +181,7 @@ endif +@@ -188,6 +188,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ diff --git a/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch deleted file mode 100644 index e4cdfdd7b2..0000000000 --- a/target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/ - cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx - load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000 - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -Iinclude/asm-mips/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch deleted file mode 100644 index 5e114a9f59..0000000000 --- a/target/linux/generic-2.6/patches-2.6.30/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -607,6 +607,9 @@ ifdef CONFIG_PHYSICAL_START - load-y = $(CONFIG_PHYSICAL_START) - endif - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/generic-2.6/patches-2.6.31/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.31/202-mips-freestanding.patch deleted file mode 100644 index 021d072823..0000000000 --- a/target/linux/generic-2.6/patches-2.6.31/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -612,6 +612,9 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 - endif - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/generic-2.6/patches-2.6.32/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.32/202-mips-freestanding.patch deleted file mode 100644 index 0c6d58508b..0000000000 --- a/target/linux/generic-2.6/patches-2.6.32/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -624,6 +624,9 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 - endif - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/generic-2.6/patches-2.6.33/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.33/202-mips-freestanding.patch deleted file mode 100644 index f8511fdc08..0000000000 --- a/target/linux/generic-2.6/patches-2.6.33/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -637,6 +637,9 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 - endif - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/generic-2.6/patches-2.6.34/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.34/202-mips-freestanding.patch deleted file mode 100644 index f8511fdc08..0000000000 --- a/target/linux/generic-2.6/patches-2.6.34/202-mips-freestanding.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -637,6 +637,9 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 - endif - -+# temporary until string.h is fixed -+cflags-y += -ffreestanding -+ - cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic - drivers-$(CONFIG_PCI) += arch/mips/pci/ - diff --git a/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch b/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch index 5bf5f34a04..10d329ca05 100644 --- a/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch +++ b/target/linux/ramips/patches-2.6.32/100-mips-ralink-core.patch @@ -1,7 +1,7 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -624,6 +624,26 @@ else - load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000 +@@ -156,6 +156,26 @@ ifeq (,$(findstring march=octeon, $(cfla + cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon endif +# @@ -24,9 +24,9 @@ +cflags-$(CONFIG_RALINK_RT305X) += -I$(srctree)/arch/mips/include/asm/mach-ralink/rt305x +load-$(CONFIG_RALINK_RT305X) += 0xffffffff80000000 + - # temporary until string.h is fixed - cflags-y += -ffreestanding - + cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) + cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,) + cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -43,6 +43,9 @@ config AR7 -- 2.30.2