From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 12 May 2019 15:12:55 +0000 (+0200)
Subject: octeon: Deactivate MIPS O32 and N32 support
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=529c3477b913fe9d21526452ae149c63c662c8a5;p=openwrt%2Fstaging%2Faparcar.git

octeon: Deactivate MIPS O32 and N32 support

OpenWrt is completely compiled from sources using a 64 bit compiler, we
do not need support for the old 32 bit MIPS interface on 64 Bit CPUs,
deactivate it.

Fixes: 46af22de16b2 ("kernel: Remove CONFIG_COMPAT")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/octeon/config-4.14 b/target/linux/octeon/config-4.14
index ea52e7fd21..e2b926f8fc 100644
--- a/target/linux/octeon/config-4.14
+++ b/target/linux/octeon/config-4.14
@@ -25,10 +25,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_BINFMT_ELF32=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
@@ -182,9 +179,8 @@ CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_OCTEON=y
 CONFIG_MIGRATION=y
 CONFIG_MIPS=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_N32=y
-CONFIG_MIPS32_O32=y
+# CONFIG_MIPS32_N32 is not set
+# CONFIG_MIPS32_O32 is not set
 CONFIG_MIPS_ASID_BITS=8
 CONFIG_MIPS_ASID_SHIFT=0
 # CONFIG_MIPS_CLOCK_VSYSCALL is not set
diff --git a/target/linux/octeon/config-4.19 b/target/linux/octeon/config-4.19
index f1dc3ef801..5b8a21318e 100644
--- a/target/linux/octeon/config-4.19
+++ b/target/linux/octeon/config-4.19
@@ -17,10 +17,7 @@ CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_BINFMT_ELF32=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
@@ -165,9 +162,8 @@ CONFIG_MDIO_OCTEON=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MIGRATION=y
 CONFIG_MIPS=y
-CONFIG_MIPS32_COMPAT=y
-CONFIG_MIPS32_N32=y
-CONFIG_MIPS32_O32=y
+# CONFIG_MIPS32_N32 is not set
+# CONFIG_MIPS32_O32 is not set
 CONFIG_MIPS_ASID_BITS=8
 CONFIG_MIPS_ASID_SHIFT=0
 # CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set