diff options
| -rw-r--r-- | .defconfig | 1 | ||||
| -rw-r--r-- | package/Makefile.in | 3 | ||||
| -rw-r--r-- | package/liboil/liboil.mk | 3 | ||||
| -rw-r--r-- | package/multimedia/gstreamer/gstreamer.mk | 3 | ||||
| -rw-r--r-- | target/Config.in.arch | 33 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 2 |
6 files changed, 1 insertions, 44 deletions
diff --git a/.defconfig b/.defconfig index 7da0e4418..77ab11aed 100644 --- a/.defconfig +++ b/.defconfig @@ -15,7 +15,6 @@ BR2_i386=y # BR2_mipsel is not set # BR2_nios2 is not set # BR2_powerpc is not set -# BR2_s390 is not set # BR2_sh is not set # BR2_sh64 is not set # BR2_sparc is not set diff --git a/package/Makefile.in b/package/Makefile.in index 186329cf1..f11b396a1 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -298,9 +298,6 @@ endif ifeq ($(BR2_m68k),y) BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no endif -ifeq ($(BR2_s390),y) -BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no -endif ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG) BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no endif diff --git a/package/liboil/liboil.mk b/package/liboil/liboil.mk index 6e80ed60e..0d1ec8291 100644 --- a/package/liboil/liboil.mk +++ b/package/liboil/liboil.mk @@ -22,9 +22,6 @@ endif ifeq ($(BR2_nios2),y) LIBOIL_CONF_ENV = as_cv_unaligned_access=no endif -ifeq ($(BR2_s390),y) -LIBOIL_CONF_ENV = as_cv_unaligned_access=yes -endif ifeq ($(BR2_x86_64),y) LIBOIL_CONF_ENV = as_cv_unaligned_access=yes endif diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk index ba66b83ba..3d4033e19 100644 --- a/package/multimedia/gstreamer/gstreamer.mk +++ b/package/multimedia/gstreamer/gstreamer.mk @@ -17,9 +17,6 @@ endif ifeq ($(BR2_nios2),y) GSTREAMER_CONF_ENV = as_cv_unaligned_access=no endif -ifeq ($(BR2_s390),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes -endif GSTREAMER_CONF_OPT = \ $(DISABLE_NLS) \ diff --git a/target/Config.in.arch b/target/Config.in.arch index 4c09d4211..ccadca820 100644 --- a/target/Config.in.arch +++ b/target/Config.in.arch @@ -30,8 +30,6 @@ config BR2_nios2 bool "nios2" config BR2_powerpc bool "powerpc" -config BR2_s390 - bool "s390" config BR2_sh bool "superh" config BR2_sh64 @@ -310,25 +308,6 @@ endchoice choice prompt "Target Architecture Variant" - depends on BR2_s390 - default BR2_s390_g5 - help - Specific CPU variant to use - -config BR2_s390_g5 - bool "g5" -config BR2_s390_g6 - bool "g6" -config BR2_s390_z900 - bool "z900" -config BR2_s390_z990 - bool "z990" -config BR2_s390_z9_109 - bool "z9_109" -endchoice - -choice - prompt "Target Architecture Variant" depends on BR2_sparc default BR2_sparc_v7 help @@ -497,8 +476,6 @@ config BR2_ARCH default "mipsel" if BR2_mipsel default "nios2" if BR2_nios2 default "powerpc" if BR2_powerpc - default "s390" if BR2_s390 - default "s390" if BR2_s390x default "sh2a_nofpueb" if BR2_sh2a_nofpueb default "sh2eb" if BR2_sh2eb default "sh3" if BR2_sh3 @@ -646,11 +623,6 @@ config BR2_GCC_TARGET_TUNE default ultrasparc if BR2_sparc_ultrasparc || BR2_sparc64_ultrasparc default ultrasparc3 if BR2_sparc_ultrasparc3 || BR2_sparc64_ultrasparc3 default niagara if BR2_sparc_niagara || BR2_sparc64_niagara - default g5 if BR2_s390_g5 - default g6 if BR2_s390_g6 - default z900 if BR2_s390_z900 - default z990 if BR2_s390_z990 - default z9-109 if BR2_s390_z9_109 config BR2_GCC_TARGET_ARCH string @@ -690,11 +662,6 @@ config BR2_GCC_TARGET_ARCH default 68030 if BR2_m68k_68030 default 68040 if BR2_m68k_68040 default 68060 if BR2_m68k_68060 - default g5 if BR2_s390_g5 - default g6 if BR2_s390_g6 - default z900 if BR2_s390_z900 - default z990 if BR2_s390_z990 - default z9-109 if BR2_s390_z9_109 config BR2_GCC_TARGET_ABI string diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index fc8acda05..6aedc323c 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -17,7 +17,7 @@ LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-null KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \ -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/parisc64/parisc/ \ -e s/powerpc64/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh2.*/sh/ -e s/sh3.*/sh/ -e s/sh4.*/sh/ \ |