From 7b0365c40848ddde2806c04c3be5d1278ab89d6b Mon Sep 17 00:00:00 2001 From: Krystian Hebel Date: Thu, 18 Feb 2021 12:55:30 +0100 Subject: [PATCH] cpu/power9: fix directory structure and timer build fault Signed-off-by: Krystian Hebel --- src/cpu/Makefile.inc | 2 +- src/cpu/{power => }/power9/Kconfig | 1 - src/cpu/{power => }/power9/Makefile.inc | 0 src/cpu/{power => }/power9/power9.c | 0 src/cpu/{power => }/power9/scom.c | 0 src/mainboard/raptor-cs/talos-2/devicetree.cb | 2 +- 6 files changed, 2 insertions(+), 3 deletions(-) rename src/cpu/{power => }/power9/Kconfig (86%) rename src/cpu/{power => }/power9/Makefile.inc (100%) rename src/cpu/{power => }/power9/power9.c (100%) rename src/cpu/{power => }/power9/scom.c (100%) diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 3a61b3eeb9d..93d2d27e01e 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -7,7 +7,7 @@ subdirs-y += intel subdirs-y += ti subdirs-$(CONFIG_ARCH_X86) += x86 subdirs-$(CONFIG_CPU_QEMU_X86) += qemu-x86 -subdirs-$(CONFIG_CPU_POWER9) += power/power9 +subdirs-$(CONFIG_CPU_POWER9) += power9 $(eval $(call create_class_compiler,cpu_microcode,x86_32)) ################################################################################ diff --git a/src/cpu/power/power9/Kconfig b/src/cpu/power9/Kconfig similarity index 86% rename from src/cpu/power/power9/Kconfig rename to src/cpu/power9/Kconfig index 6eaa5027c9f..c3a628cc343 100644 --- a/src/cpu/power/power9/Kconfig +++ b/src/cpu/power9/Kconfig @@ -6,4 +6,3 @@ config CPU_POWER9 select ARCH_VERSTAGE_PPC64 select ARCH_ROMSTAGE_PPC64 select ARCH_RAMSTAGE_PPC64 - select NO_MONOTONIC_TIMER diff --git a/src/cpu/power/power9/Makefile.inc b/src/cpu/power9/Makefile.inc similarity index 100% rename from src/cpu/power/power9/Makefile.inc rename to src/cpu/power9/Makefile.inc diff --git a/src/cpu/power/power9/power9.c b/src/cpu/power9/power9.c similarity index 100% rename from src/cpu/power/power9/power9.c rename to src/cpu/power9/power9.c diff --git a/src/cpu/power/power9/scom.c b/src/cpu/power9/scom.c similarity index 100% rename from src/cpu/power/power9/scom.c rename to src/cpu/power9/scom.c diff --git a/src/mainboard/raptor-cs/talos-2/devicetree.cb b/src/mainboard/raptor-cs/talos-2/devicetree.cb index 1a090890d58..7ea6247070e 100644 --- a/src/mainboard/raptor-cs/talos-2/devicetree.cb +++ b/src/mainboard/raptor-cs/talos-2/devicetree.cb @@ -1,5 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-only -chip cpu/power/power9 +chip cpu/power9 device cpu_cluster 0 on end end