A trivial header change is required too. Signed-off-by: Daniel Henrique Barboza <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> --- target/riscv/cpu.h | 2 +- target/riscv/meson.build | 1 - target/riscv/tcg/meson.build | 1 + target/riscv/{ => tcg}/pmp.c | 0 target/riscv/{ => tcg}/pmp.h | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename target/riscv/{ => tcg}/pmp.c (100%) rename target/riscv/{ => tcg}/pmp.h (100%)
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index bdd28d329b..f0c78c1474 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -183,7 +183,7 @@ extern RISCVCPUImpliedExtsRule *riscv_multi_ext_implied_rules[]; #define MMU_USER_IDX 3 #if !defined(CONFIG_USER_ONLY) -#include "pmp.h" +#include "tcg/pmp.h" #endif #define RV_VLEN_MAX 1024 diff --git a/target/riscv/meson.build b/target/riscv/meson.build index 61874ed0af..42d0f6d538 100644 --- a/target/riscv/meson.build +++ b/target/riscv/meson.build @@ -22,7 +22,6 @@ riscv_ss.add(files( riscv_system_ss = ss.source_set() riscv_system_ss.add(files( 'arch_dump.c', - 'pmp.c', 'monitor.c', 'machine.c', 'time_helper.c', diff --git a/target/riscv/tcg/meson.build b/target/riscv/tcg/meson.build index 5684fcf985..a05ab642f4 100644 --- a/target/riscv/tcg/meson.build +++ b/target/riscv/tcg/meson.build @@ -21,6 +21,7 @@ riscv_ss.add(files( riscv_system_ss.add(files( 'debug.c', 'mips_csr.c', + 'pmp.c', 'pmu.c', 'th_csr.c', )) diff --git a/target/riscv/pmp.c b/target/riscv/tcg/pmp.c similarity index 100% rename from target/riscv/pmp.c rename to target/riscv/tcg/pmp.c diff --git a/target/riscv/pmp.h b/target/riscv/tcg/pmp.h similarity index 100% rename from target/riscv/pmp.h rename to target/riscv/tcg/pmp.h -- 2.43.0
