build: remove obsolete references to cris and avr32

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44965

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index a0d9472dcbb9a981497afa39de3e5aa9037936f0..6bf65f5bc0da7c15707aa2bfc5d70dfdcd586ac2 100644 (file)
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -518,7 +518,7 @@ endif
 
 config KERNEL_SECCOMP
        bool "Enable seccomp support"
-               depends on !(TARGET_uml || TARGET_avr32)
+               depends on !(TARGET_uml)
                default n
                help
                  Build kernel with support for seccomp.

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 9f4e2cd9ade86f702772ad5ccfe0b9741d85d4c9..3a32209b56b74d4e6179719a1ddc865cfd672d17 100644 (file)
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -127,11 +127,6 @@ endef
 
 OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
-# AVR32 uses a non-standard location
-ifeq ($(LINUX_KARCH),avr32)
-IMAGES_DIR:=images
-endif
-
 # AMD64 shares the location with x86
 ifeq ($(LINUX_KARCH),x86_64)
 IMAGES_DIR:=../../x86/boot

diff --git a/include/site/avr32-linux b/include/site/avr32-linux
deleted file mode 100644 (file)
index c421c51..0000000
--- a/include/site/avr32-linux
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
-
-ac_cv_sizeof___int64=0
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_int16_t=2
-ac_cv_sizeof_int32_t=4
-ac_cv_sizeof_int64_t=8
-ac_cv_sizeof_long_int=4
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_long=4
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_short_int=2
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=4
-ac_cv_sizeof_ssize_t=4
-ac_cv_sizeof_u_int16_t=2
-ac_cv_sizeof_u_int32_t=4
-ac_cv_sizeof_u_int64_t=8
-ac_cv_sizeof_uint16_t=2
-ac_cv_sizeof_uint32_t=4
-ac_cv_sizeof_uint64_t=8
-ac_cv_sizeof_unsigned_int=4
-ac_cv_sizeof_unsigned_long=4
-ac_cv_sizeof_unsigned_long_long=8
-ac_cv_sizeof_unsigned_short=2
-ac_cv_sizeof_void_p=4

diff --git a/include/site/avr32-openwrt-linux-gnu b/include/site/avr32-openwrt-linux-gnu
deleted file mode 100644 (file)
index 87cfe7d..0000000
--- a/include/site/avr32-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/avr32-linux
-. $TOPDIR/include/site/linux-gnu
-

diff --git a/include/site/avr32-openwrt-linux-uclibc b/include/site/avr32-openwrt-linux-uclibc
deleted file mode 100644 (file)
index 9fe045f..0000000
--- a/include/site/avr32-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/avr32-linux
-. $TOPDIR/include/site/linux-uclibc
-

diff --git a/include/site/cris-linux b/include/site/cris-linux
deleted file mode 100644 (file)
index 80cc8db..0000000
--- a/include/site/cris-linux
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
-
-ac_cv_sizeof___int64=0
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_int16_t=2
-ac_cv_sizeof_int32_t=4
-ac_cv_sizeof_int64_t=8
-ac_cv_sizeof_long_int=4
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_long=4
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_short_int=2
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=4
-ac_cv_sizeof_ssize_t=4
-ac_cv_sizeof_u_int16_t=2
-ac_cv_sizeof_u_int32_t=4
-ac_cv_sizeof_u_int64_t=8
-ac_cv_sizeof_uint16_t=2
-ac_cv_sizeof_uint32_t=4
-ac_cv_sizeof_uint64_t=8
-ac_cv_sizeof_unsigned_int=4
-ac_cv_sizeof_unsigned_long=4
-ac_cv_sizeof_unsigned_long_long=8
-ac_cv_sizeof_unsigned_short=2
-ac_cv_sizeof_void_p=4

diff --git a/include/site/cris-openwrt-linux-gnu b/include/site/cris-openwrt-linux-gnu
deleted file mode 100644 (file)
index c35ddcd..0000000
--- a/include/site/cris-openwrt-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/cris-linux
-. $TOPDIR/include/site/linux-gnu
-

diff --git a/include/site/cris-openwrt-linux-uclibc b/include/site/cris-openwrt-linux-uclibc
deleted file mode 100644 (file)
index 87346ee..0000000
--- a/include/site/cris-openwrt-linux-uclibc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. $TOPDIR/include/site/cris-linux
-. $TOPDIR/include/site/linux-uclibc
-

diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile
index c47735a8c0893ff006cb54f9fd87c9e9163a754e..1611efe5645df144250201369e833d592357f0cf 100644 (file)
--- a/package/devel/gdb/Makefile
+++ b/package/devel/gdb/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gdb/Default
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:=@!(avr32||cris) +!USE_MUSL:libthread-db +PACKAGE_zlib:zlib
+  DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib
   URL:=http://www.gnu.org/software/gdb/
 endef
 

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index dd44eb97f9b9c7c66da4af5005819bb34ca81502..64182e680d46c6fa813205d80e59d6a6faff3c5a 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -437,7 +437,7 @@ define KernelPackage/fs-xfs
   SUBMENU:=$(FS_MENU)
   TITLE:=XFS filesystem support
   KCONFIG:=CONFIG_XFS_FS
-  DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c @!avr32
+  DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
   AUTOLOAD:=$(call AutoLoad,30,xfs,1)
 endef

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 585c2258e7296007fa7962aefb8cb06e6e81658b..11c8bcfa1ae3be68cdeb740648749165ecd6033d 100644 (file)
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -60,7 +60,7 @@ define KernelPackage/mac80211/Default
   SUBMENU:=$(WMENU)
   URL:=https://wireless.wiki.kernel.org/
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-  DEPENDS:=@(!TARGET_avr32||BROKEN) @!TARGET_uml
+  DEPENDS:=@!TARGET_uml
 endef
 
 define KernelPackage/cfg80211

diff --git a/package/libs/uclibc++/Makefile b/package/libs/uclibc++/Makefile
index ade3c62e0fab98372d0af7fc8d2ddc8a504082d8..1196926e8ccc7b8227629d10ebb5ca2eabf4218e 100644 (file)
--- a/package/libs/uclibc++/Makefile
+++ b/package/libs/uclibc++/Makefile
@@ -42,7 +42,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
        -e 's/sh[234].*/sh/' \
        -e 's/mips.*/mips/' \
        -e 's/mipsel.*/mips/' \
-       -e 's/cris.*/cris/' \
 )
 
 TARGET_CFLAGS += $(FPIC)

diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index eeba02802a2f5858b8459eabe0dee6fec999a087..592c06c03da0c076163fcca43f4cd0f10e7161af 100644 (file)
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -94,7 +94,7 @@ ifdef CONFIG_USE_GLIBC
   TARGET_LDFLAGS_C += -lrt
 endif
 
-DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny @(!TARGET_avr32||BROKEN)
+DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
 
 define Package/hostapd/Default
   SECTION:=net

diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
index e6054950ca70943ef8c10629a76f5d1a1fa357db..05ecd8adadb9deb13b2078465303cf52864b447e 100644 (file)
--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -25,7 +25,7 @@ define Package/iw
   CATEGORY:=Network
   TITLE:=cfg80211 interface configuration utility
   URL:=http://wireless.kernel.org/en/users/Documentation/iw
-  DEPENDS:= +libnl-tiny @(!TARGET_avr32||BROKEN)
+  DEPENDS:= +libnl-tiny
 endef
 
 define Build/Configure

diff --git a/target/Config.in b/target/Config.in
index 7380773d88b44e1213e660506dd25356b124618e..baae8d6d3a60ee721c73825127fd9bc8ee223a61 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -119,13 +119,6 @@ config arm_v6
 config arm_v7
        bool
 
-config avr32
-       select BIG_ENDIAN
-       bool
-
-config cris
-       bool
-
 config i386
        bool
 
@@ -188,8 +181,6 @@ config ARCH
        default "aarch64_be" if aarch64_be
        default "arm"       if arm
        default "armeb"     if armeb
-       default "avr32"     if avr32
-       default "cris"      if cris
        default "i386"      if i386
        default "i686"      if i686
        default "m68k"      if m68k