From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/config/Config.in.arch.choice | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'target/config/Config.in.arch.choice') diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice index 54141eb3a..517d6a00f 100644 --- a/target/config/Config.in.arch.choice +++ b/target/config/Config.in.arch.choice @@ -34,29 +34,35 @@ config ADK_LINUX_MIPS help Support for MIPS systems. +config ADK_LINUX_MIPS64 + bool "mips64 system" + select ADK_mips64 + help + Support for MIPS64 systems. + config ADK_LINUX_PPC bool "ppc system" select ADK_ppc help - Support for powerpc systems. + Support for PPC systems. config ADK_LINUX_PPC64 bool "ppc64 system" select ADK_ppc64 help - Support for powerpc64 systems. + Support for PPC64 systems. config ADK_LINUX_SPARC bool "sparc system" select ADK_sparc help - Support for sparc systems. + Support for SPARC systems. config ADK_LINUX_SPARC64 bool "sparc64 system" select ADK_sparc64 help - Support for sparc64 systems. + Support for SPARC64 systems. config ADK_LINUX_SH bool "superh system" -- cgit v1.2.3