1 files changed, 6 insertions, 3 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9541171f1220..591ca0cd4c24 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -41,7 +41,7 @@ config AR7
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_ZBOOT_UART16550
-        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
         select GCD
         select VLYNQ
         help
@@ -180,7 +180,7 @@ config LASAT
 
 config MACH_LOONGSON
         bool "Loongson family of machines"
-        select SYS_SUPPORTS_ZBOOT_UART16550
+        select SYS_SUPPORTS_ZBOOT
         help
           This enables the support of Loongson family of machines.
 
@@ -1295,7 +1295,6 @@ config CPU_CAVIUM_OCTEON
         select SYS_SUPPORTS_SMP
         select NR_CPUS_DEFAULT_16
         select WEAK_ORDERING
-        select WEAK_REORDERING_BEYOND_LLSC
         select CPU_SUPPORTS_HIGHMEM
         select CPU_SUPPORTS_HUGEPAGES
         help
@@ -1311,6 +1310,7 @@ config SYS_SUPPORTS_ZBOOT
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_LZMA
+        select HAVE_KERNEL_LZO
 
 config SYS_SUPPORTS_ZBOOT_UART16550
         bool
@@ -1725,6 +1725,9 @@ config SB1_PASS_2_1_WORKAROUNDS
 config 64BIT_PHYS_ADDR
         bool
 
+config ARCH_PHYS_ADDR_T_64BIT
+       def_bool 64BIT_PHYS_ADDR
+
 config CPU_HAS_SMARTMIPS
         depends on SYS_SUPPORTS_SMARTMIPS
         bool "Support for the SmartMIPS ASE"