From 210b0b25ee2a8bc62f921a695835d04810516357 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Aug 2017 20:28:10 +0200 Subject: fix ppc64 cpu selection Signed-off-by: Waldemar Brodkorb --- target/config/Config.in.adk | 2 +- target/config/Config.in.binutils | 10 +++------- target/config/Config.in.cpu | 3 +++ target/ppc64/systems/qemu-ppc64 | 3 ++- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 1e98eb890..32b669c48 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -90,7 +90,7 @@ config ADK_MAKE_PARALLEL config ADK_MAKE_JOBS int "How many jobs to use" - default 4 + default 16 depends on ADK_MAKE_PARALLEL help The number specified here will be passed to make as N in '-jN' diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index c456925f3..aa0cc4a1b 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -7,9 +7,7 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_ARCH_ARC default ADK_TOOLCHAIN_BINUTILS_CSKY if ADK_TARGET_ARCH_CSKY default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32 default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32 -default ADK_TOOLCHAIN_BINUTILS_GIT if ADK_TARGET_ARCH_MIPS -default ADK_TOOLCHAIN_BINUTILS_GIT if ADK_TARGET_ARCH_MIPS64 -default ADK_TOOLCHAIN_BINUTILS_2_28 +default ADK_TOOLCHAIN_BINUTILS_2_29 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" @@ -17,13 +15,11 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_NDS32 -config ADK_TOOLCHAIN_BINUTILS_2_28 - bool "2.28" +config ADK_TOOLCHAIN_BINUTILS_2_29 + bool "2.29" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_NDS32 - depends on !ADK_TARGET_ARCH_RISCV32 - depends on !ADK_TARGET_ARCH_RISCV64 config ADK_TOOLCHAIN_BINUTILS_NDS32 bool "2.24-nds32" diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 61ce10ca9..b55c3db3e 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1023,6 +1023,7 @@ config ADK_TARGET_CPU_PPC64_POWERPC64 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_PPC64 + depends on ADK_TARGET_BIG_ENDIAN config ADK_TARGET_CPU_PPC64_POWER6 bool "power6" @@ -1031,6 +1032,7 @@ config ADK_TARGET_CPU_PPC64_POWER6 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_PPC64 + depends on ADK_TARGET_BIG_ENDIAN config ADK_TARGET_CPU_PPC64_POWER7 bool "power7" @@ -1039,6 +1041,7 @@ config ADK_TARGET_CPU_PPC64_POWER7 select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_PPC64 + depends on ADK_TARGET_BIG_ENDIAN config ADK_TARGET_CPU_PPC64_POWER8 bool "power8" diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64 index eb27113ca..89a5685db 100644 --- a/target/ppc64/systems/qemu-ppc64 +++ b/target/ppc64/systems/qemu-ppc64 @@ -1,6 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_PPC64 bool "Qemu Emulator" - select ADK_TARGET_CPU_PPC64_POWERPC64 + select ADK_TARGET_CPU_PPC64_POWERPC64 if ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_CPU_PPC64_POWER8 if ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_WITH_COMPRESSION help -- cgit v1.2.3