[U-Boot] [PATCH 26/41] common: Move some SMP functions out of common.h
Simon Glass
sjg at chromium.org
Mon Sep 30 14:40:57 UTC 2019
These functions belong in cpu_legacy.h so move them over.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/arm/cpu/armv7/ls102xa/cpu.c | 1 +
arch/arm/cpu/armv7/virt-v7.c | 1 +
arch/arm/lib/bootm.c | 1 +
arch/arm/mach-uniphier/arm32/psci.c | 1 +
board/armltd/vexpress/vexpress_common.c | 1 +
board/broadcom/bcm_ep/board.c | 1 +
board/samsung/arndale/arndale.c | 1 +
board/synopsys/axs10x/axs10x.c | 1 +
board/xilinx/zynqmp/zynqmp.c | 1 +
cmd/elf.c | 1 +
include/common.h | 3 ---
include/cpu_legacy.h | 3 +++
12 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index ec9984db795..0c61f31516d 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <vsprintf.h>
#include <asm/arch/clock.h>
#include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index be14eb9376f..1f01a7fd197 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -9,6 +9,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <asm/armv7.h>
#include <asm/gic.h>
#include <asm/io.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 1638f1e81d7..af774a53c27 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -13,6 +13,7 @@
#include <common.h>
#include <command.h>
+#include <cpu_legacy.h>
#include <dm.h>
#include <dm/root.h>
#include <env.h>
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c
index ef35923f6ac..7f9c9d1fe59 100644
--- a/arch/arm/mach-uniphier/arm32/psci.c
+++ b/arch/arm/mach-uniphier/arm32/psci.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/io.h>
diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index 30b9dbbe8a7..25da4c39046 100644
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -16,6 +16,7 @@
* Philippe Robin, <philippe.robin at arm.com>
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <malloc.h>
#include <errno.h>
#include <netdev.h>
diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c
index b2469dcb52a..0c3aa3b05f5 100644
--- a/board/broadcom/bcm_ep/board.c
+++ b/board/broadcom/bcm_ep/board.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <asm/io.h>
#include <config.h>
#include <netdev.h>
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index d06ab8f3c0c..0d33f5c4491 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <usb.h>
#include <asm/gpio.h>
#include <asm/arch/pinmux.h>
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 7c4fcf281cb..bd39d0c7d81 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <dwmmc.h>
#include <malloc.h>
#include <asm/arcregs.h>
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index d649daba96d..babec5f34fd 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <cpu_legacy.h>
#include <env.h>
#include <sata.h>
#include <ahci.h>
diff --git a/cmd/elf.c b/cmd/elf.c
index 538562fda58..690c61791d4 100644
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -15,6 +15,7 @@
#include <common.h>
#include <command.h>
+#include <cpu_legacy.h>
#include <elf.h>
#include <env.h>
#include <net.h>
diff --git a/include/common.h b/include/common.h
index 96bb42ce71c..3f6a95d7e02 100644
--- a/include/common.h
+++ b/include/common.h
@@ -212,9 +212,6 @@ void reset_cpu (ulong addr);
void ft_cpu_setup(void *blob, bd_t *bd);
void ft_pci_setup(void *blob, bd_t *bd);
-void smp_set_core_boot_addr(unsigned long addr, int corenr);
-void smp_kick_all_cpus(void);
-
/* $(CPU)/speed.c */
int get_clocks (void);
ulong get_bus_freq (ulong);
diff --git a/include/cpu_legacy.h b/include/cpu_legacy.h
index 03feaa63e96..1741f7f7a63 100644
--- a/include/cpu_legacy.h
+++ b/include/cpu_legacy.h
@@ -49,4 +49,7 @@ int is_core_valid(unsigned int core);
*/
int checkcpu(void);
+void smp_set_core_boot_addr(unsigned long addr, int corenr);
+void smp_kick_all_cpus(void);
+
#endif
--
2.23.0.444.g18eeb5a265-goog
More information about the U-Boot
mailing list