diff options
| -rw-r--r-- | target/config/Config.in.cpu | 32 | ||||
| -rw-r--r-- | target/ppc64/kernel/qemu-ppc64 | 18 |
2 files changed, 23 insertions, 27 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 0f5254a06..f7c2a3fe4 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1125,61 +1125,61 @@ config ADK_TARGET_CPU_PPC_970 depends on ADK_TARGET_ARCH_PPC # ppc64 -config ADK_TARGET_CPU_PPC64_POWERPC64 - bool "powerpc64" +config ADK_TARGET_CPU_PPC64_POWER8 + bool "power8" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 - depends on ADK_TARGET_BIG_ENDIAN -config ADK_TARGET_CPU_PPC64_POWER4 - bool "power4" +config ADK_TARGET_CPU_PPC64_POWER7 + bool "power7" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 depends on ADK_TARGET_BIG_ENDIAN -config ADK_TARGET_CPU_PPC64_POWER5 - bool "power5" +config ADK_TARGET_CPU_PPC64_POWER6 + bool "power6" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU + select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 depends on ADK_TARGET_BIG_ENDIAN -config ADK_TARGET_CPU_PPC64_POWER6 - bool "power6" +config ADK_TARGET_CPU_PPC64_POWER5 + bool "power5" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 depends on ADK_TARGET_BIG_ENDIAN -config ADK_TARGET_CPU_PPC64_POWER7 - bool "power7" +config ADK_TARGET_CPU_PPC64_POWER4 + bool "power4" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 depends on ADK_TARGET_BIG_ENDIAN -config ADK_TARGET_CPU_PPC64_POWER8 - bool "power8" +config ADK_TARGET_CPU_PPC64_POWERPC64 + bool "powerpc64" select ADK_LINUX_64 select ADK_TARGET_SUPPORTS_THREADS select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_ARCH_PPC_WITH_ALTIVEC depends on ADK_TARGET_ARCH_PPC64 + depends on ADK_TARGET_BIG_ENDIAN # riscv config ADK_TARGET_CPU_RISCV32_RV32IMAFDC diff --git a/target/ppc64/kernel/qemu-ppc64 b/target/ppc64/kernel/qemu-ppc64 index 1b601c9e3..f479613c9 100644 --- a/target/ppc64/kernel/qemu-ppc64 +++ b/target/ppc64/kernel/qemu-ppc64 @@ -1,21 +1,15 @@ CONFIG_PPC64=y -CONFIG_PPC_BOOK3S_64=y CONFIG_ALTIVEC=y CONFIG_POWER7_CPU=y -CONFIG_PPC_BOOK3S=y -CONFIG_PPC_FPU=y -CONFIG_PPC_STD_MMU=y -CONFIG_PPC_STD_MMU_64=y -CONFIG_PPC_DOORBELL=y -CONFIG_PPC_OF=y -CONFIG_PPC_UDBG_16550=y CONFIG_PPC_PSERIES=y CONFIG_PSERIES_MSI=y +CONFIG_PPC_I8259=y +CONFIG_PPC_RTAS=y +CONFIG_PPC_OF=y +CONFIG_PPC_UDBG_16550=y CONFIG_PPC_NATIVE=y CONFIG_PPC_OF_BOOT_TRAMPOLINE=y CONFIG_MPIC=y -CONFIG_PPC_I8259=y -CONFIG_PPC_RTAS=y CONFIG_IBMVIO=y CONFIG_EEH=y CONFIG_PPC_4K_PAGES=y @@ -24,5 +18,7 @@ CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_CONSOLE=y CONFIG_HVC_UDBG=y -CONFIG_PRINTK=y +CONFIG_NUMA=y +CONFIG_DISCONTIGMEM=y +CONFIG_NEED_MULTIPLE_NODES=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y |