[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/18] hw/arm: Use full "target/arm/cpu.h" path to include target
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/18] hw/arm: Use full "target/arm/cpu.h" path to include target's "cpu.h" |
Date: |
Tue, 10 Jan 2023 17:43:52 +0100 |
First we want to introduce a new "cpu.h" header in the "hw/arm/"
namespace; second we would like to get rid of '-I target/$ARCH/'
in the CPPFLAGS.
Use the full path to "cpu.h": "target/arm/cpu.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/arm/digic.h | 2 +-
include/hw/arm/fsl-imx6.h | 2 +-
include/hw/arm/fsl-imx6ul.h | 2 +-
include/hw/arm/fsl-imx7.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h
index 8f2735c284..646802806e 100644
--- a/include/hw/arm/digic.h
+++ b/include/hw/arm/digic.h
@@ -18,7 +18,7 @@
#ifndef HW_ARM_DIGIC_H
#define HW_ARM_DIGIC_H
-#include "cpu.h"
+#include "target/arm/cpu.h"
#include "hw/timer/digic-timer.h"
#include "hw/char/digic-uart.h"
#include "qom/object.h"
diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index 83291457cf..9d24d98189 100644
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -33,7 +33,7 @@
#include "hw/usb/chipidea.h"
#include "hw/usb/imx-usb-phy.h"
#include "exec/memory.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
#include "qom/object.h"
#define TYPE_FSL_IMX6 "fsl-imx6"
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 7812e516a5..4f42fe4192 100644
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -37,7 +37,7 @@
#include "hw/usb/chipidea.h"
#include "hw/usb/imx-usb-phy.h"
#include "exec/memory.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
#include "qom/object.h"
#define TYPE_FSL_IMX6UL "fsl-imx6ul"
diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index 4e5e071864..ed8c1ec813 100644
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -38,7 +38,7 @@
#include "hw/net/imx_fec.h"
#include "hw/pci-host/designware.h"
#include "hw/usb/chipidea.h"
-#include "cpu.h"
+#include "target/arm/cpu.h"
#include "qom/object.h"
#define TYPE_FSL_IMX7 "fsl-imx7"
--
2.38.1
- [PATCH 00/18] hw/arm: Move various objects to softmmu_ss to build them once (part 1), Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 01/18] hw/arm: Move various units to softmmu_ss[], Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 02/18] hw/arm/boot: Include missing 'exec/cpu-all.h' header, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 03/18] target/arm/cpregs: Include missing 'target/arm/cpu.h' header, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 04/18] hw/arm: Use full "target/arm/cpu.h" path to include target's "cpu.h",
Philippe Mathieu-Daudé <=
- [PATCH 05/18] target/arm: Move CPU QOM type definitions to "hw/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 06/18] target/arm: Move CPU definitions consumed by HW model to "hw/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 07/18] hw/arm: Move more units to softmmu_ss[], Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 09/18] hw/arm/armv7m: Remove 'target/arm/cpu.h' from NVIC header, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 10/18] hw/arm: Move various armv7m-related units to softmmu_ss[], Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 08/18] hw/arm: Move units to softmmu[] by replacing "{target -> hw}/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 11/18] hw/arm/digic: Remove unnecessary target_long use, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 12/18] hw/arm/digic: Replace object_initialize(ARMCPU) by object_new(ARMCPU), Philippe Mathieu-Daudé, 2023/01/10