[sw] Fix build after moving abs_mmio. Signed-off-by: Jade Philipoom <jadep@google.com>
diff --git a/sw/device/lib/base/BUILD b/sw/device/lib/base/BUILD index a02b561..a9c1ab8 100644 --- a/sw/device/lib/base/BUILD +++ b/sw/device/lib/base/BUILD
@@ -29,6 +29,19 @@ ) cc_library( + name = "abs_mmio", + srcs = [ + "abs_mmio.c", + ], + hdrs = [ + "abs_mmio.h", + ], + deps = [ + ":base", + ], +) + +cc_library( name = "mmio", srcs = [ "mmio.c",
diff --git a/sw/device/lib/base/abs_mmio.c b/sw/device/lib/base/abs_mmio.c index b092f86..6498e51 100644 --- a/sw/device/lib/base/abs_mmio.c +++ b/sw/device/lib/base/abs_mmio.c
@@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" +#include "sw/device/lib/base/abs_mmio.h" // `extern` declarations to give the inline functions in the corresponding // header a link location.
diff --git a/sw/device/lib/base/abs_mmio.h b/sw/device/lib/base/abs_mmio.h index b87490c..03a412d 100644 --- a/sw/device/lib/base/abs_mmio.h +++ b/sw/device/lib/base/abs_mmio.h
@@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 -#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_LIB_BASE_ABS_MMIO_H_ -#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_LIB_BASE_ABS_MMIO_H_ +#ifndef OPENTITAN_SW_DEVICE_LIB_BASE_ABS_MMIO_H_ +#define OPENTITAN_SW_DEVICE_LIB_BASE_ABS_MMIO_H_ #include <stddef.h> #include <stdint.h> @@ -118,4 +118,4 @@ } #endif -#endif // OPENTITAN_SW_DEVICE_SILICON_CREATOR_LIB_BASE_ABS_MMIO_H_ +#endif // OPENTITAN_SW_DEVICE_LIB_BASE_ABS_MMIO_H_
diff --git a/sw/device/lib/base/meson.build b/sw/device/lib/base/meson.build index d44cd58..6123acd 100644 --- a/sw/device/lib/base/meson.build +++ b/sw/device/lib/base/meson.build
@@ -13,6 +13,17 @@ ) ) +sw_lib_abs_mmio = declare_dependency( + link_with: static_library( + 'sw_lib_abs_mmio', + sources: [ + 'abs_mmio.c', + ], + dependencies: [], + ), +) + + # Memory Operations library (sw_lib_mem) sw_lib_mem = declare_dependency( link_with: static_library(
diff --git a/sw/device/silicon_creator/lib/BUILD b/sw/device/silicon_creator/lib/BUILD index 1e2b68c..cc02bab 100644 --- a/sw/device/silicon_creator/lib/BUILD +++ b/sw/device/silicon_creator/lib/BUILD
@@ -149,7 +149,7 @@ ":irq_asm", ":test_main", "//hw/top_earlgrey/sw/autogen:top_earlgrey", - "//sw/device/silicon_creator/lib/base:abs_mmio", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/drivers:retention_sram", "//sw/device/silicon_creator/lib/drivers:rstmgr", "//sw/device/silicon_creator/lib/drivers:watchdog", @@ -247,7 +247,6 @@ deps = [ "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", - "//sw/device/silicon_creator/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/drivers:otbn", ], ) @@ -288,7 +287,7 @@ "//hw/top_earlgrey/ip/flash_ctrl/data/autogen:flash_ctrl_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", - "//sw/device/silicon_creator/lib/base:abs_mmio", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/drivers:alert", "//sw/device/silicon_creator/lib/drivers:lifecycle", "//sw/device/silicon_creator/lib/drivers:otp",
diff --git a/sw/device/silicon_creator/lib/base/BUILD b/sw/device/silicon_creator/lib/base/BUILD index 4034fa2..e975181 100644 --- a/sw/device/silicon_creator/lib/base/BUILD +++ b/sw/device/silicon_creator/lib/base/BUILD
@@ -30,15 +30,6 @@ ) cc_library( - name = "abs_mmio", - srcs = ["abs_mmio.c"], - hdrs = ["abs_mmio.h"], - deps = [ - "//sw/device/lib/base", - ], -) - -cc_library( name = "mock_abs_mmio", testonly = True, hdrs = [ @@ -59,8 +50,8 @@ hdrs = ["sec_mmio.h"], target_compatible_with = [OPENTITAN_CPU], deps = [ - ":abs_mmio", "//sw/device/lib/base", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:error", ], )
diff --git a/sw/device/silicon_creator/lib/base/meson.build b/sw/device/silicon_creator/lib/base/meson.build index 143edc7..78dd292 100644 --- a/sw/device/silicon_creator/lib/base/meson.build +++ b/sw/device/silicon_creator/lib/base/meson.build
@@ -30,16 +30,6 @@ cpp_args: ['-DMOCK_CSR'], )) -sw_silicon_creator_lib_base_abs_mmio = declare_dependency( - link_with: static_library( - 'sw_silicon_creator_lib_base_abs_mmio', - sources: [ - 'abs_mmio.c', - ], - dependencies: [], - ), -) - sw_silicon_creator_lib_base_mock_abs_mmio = declare_dependency( link_with: static_library( 'mock_abs_mmio', @@ -64,7 +54,7 @@ 'sec_mmio.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), )
diff --git a/sw/device/silicon_creator/lib/base/mock_abs_mmio.h b/sw/device/silicon_creator/lib/base/mock_abs_mmio.h index e0bf635..c4806b4 100644 --- a/sw/device/silicon_creator/lib/base/mock_abs_mmio.h +++ b/sw/device/silicon_creator/lib/base/mock_abs_mmio.h
@@ -5,8 +5,8 @@ #ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_LIB_BASE_MOCK_ABS_MMIO_H_ #define OPENTITAN_SW_DEVICE_SILICON_CREATOR_LIB_BASE_MOCK_ABS_MMIO_H_ +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/testing/mock_mmio_test_utils.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/testing/mask_rom_test.h" namespace mask_rom_test {
diff --git a/sw/device/silicon_creator/lib/base/sec_mmio.c b/sw/device/silicon_creator/lib/base/sec_mmio.c index 5f793b0..3dabac6 100644 --- a/sw/device/silicon_creator/lib/base/sec_mmio.c +++ b/sw/device/silicon_creator/lib/base/sec_mmio.c
@@ -6,9 +6,9 @@ #include <assert.h> +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/hardened.h" #include "sw/device/lib/base/macros.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" // The context is declared as weak so that the mask ROM and ROM_EXT may // override its location.
diff --git a/sw/device/silicon_creator/lib/drivers/BUILD b/sw/device/silicon_creator/lib/drivers/BUILD index 5bbee15..f20cff5 100644 --- a/sw/device/silicon_creator/lib/drivers/BUILD +++ b/sw/device/silicon_creator/lib/drivers/BUILD
@@ -53,8 +53,8 @@ "//hw/top_earlgrey:alert_handler_regs", "//hw/top_earlgrey/ip/rstmgr/data/autogen:rstmgr_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:test_main", - "//sw/device/silicon_creator/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/base:sec_mmio", ], ) @@ -70,7 +70,6 @@ "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/base:sec_mmio", "//sw/device/silicon_creator/lib/drivers:otp", ], @@ -93,7 +92,6 @@ "//sw/device/lib/base", "//sw/device/lib/base/testing", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:mock_abs_mmio", "//sw/device/silicon_creator/lib/base:mock_sec_mmio", "//sw/device/silicon_creator/lib/drivers:mock_otp", "@googletest//:gtest_main", @@ -108,8 +106,8 @@ "//hw/ip/hmac/data:hmac_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:abs_mmio", ], ) @@ -159,7 +157,6 @@ "//sw/device/lib/base/freestanding", "//sw/device/silicon_creator/lib:error", "//sw/device/silicon_creator/lib:keymgr_binding", - "//sw/device/silicon_creator/lib/base:abs_mmio", "//sw/device/silicon_creator/lib/base:sec_mmio", ], ) @@ -253,8 +250,8 @@ "//hw/ip/otbn/data:otbn_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:abs_mmio", ], ) @@ -318,7 +315,6 @@ "//hw/top_earlgrey/ip/pinmux/data/autogen:pinmux_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", - "//sw/device/silicon_creator/lib/base:abs_mmio", ], ) @@ -342,8 +338,8 @@ "//hw/ip/sram_ctrl/data:sram_ctrl_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:abs_mmio", ], ) @@ -381,7 +377,6 @@ "//hw/ip/rv_core_ibex/data:rv_core_ibex_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/base", - "//sw/device/silicon_creator/lib/base:abs_mmio", ] ) @@ -439,8 +434,8 @@ "//hw/top_earlgrey/sw/autogen:top_earlgrey", "//sw/device/lib/arch:device", "//sw/device/lib/base", + "//sw/device/lib/base:abs_mmio", "//sw/device/silicon_creator/lib:error", - "//sw/device/silicon_creator/lib/base:abs_mmio", ], ) @@ -475,7 +470,7 @@ "//hw/ip/aon_timer/data:aon_timer_regs", "//hw/top_earlgrey/ip/pwrmgr/data/autogen:pwrmgr_regs", "//hw/top_earlgrey/sw/autogen:top_earlgrey", - "//sw/device/silicon_creator/lib/base:abs_mmio", + "//sw/device/lib/base:abs_mmio", ], )
diff --git a/sw/device/silicon_creator/lib/drivers/alert_functest.c b/sw/device/silicon_creator/lib/drivers/alert_functest.c index 50e7531..61a5fa6 100644 --- a/sw/device/silicon_creator/lib/drivers/alert_functest.c +++ b/sw/device/silicon_creator/lib/drivers/alert_functest.c
@@ -6,13 +6,13 @@ #include <stdint.h> #include "sw/device/lib/arch/device.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/memory.h" #include "sw/device/lib/base/mmio.h" #include "sw/device/lib/runtime/hart.h" #include "sw/device/lib/runtime/log.h" #include "sw/device/lib/runtime/print.h" #include "sw/device/lib/testing/check.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/base/sec_mmio.h" #include "sw/device/silicon_creator/lib/drivers/alert.h" #include "sw/device/silicon_creator/lib/drivers/rstmgr.h"
diff --git a/sw/device/silicon_creator/lib/drivers/flash_ctrl.c b/sw/device/silicon_creator/lib/drivers/flash_ctrl.c index aa92b46..1dd3167 100644 --- a/sw/device/silicon_creator/lib/drivers/flash_ctrl.c +++ b/sw/device/silicon_creator/lib/drivers/flash_ctrl.c
@@ -6,10 +6,10 @@ #include <assert.h> +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" #include "sw/device/lib/base/hardened.h" #include "sw/device/lib/base/multibits.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/base/sec_mmio.h" #include "sw/device/silicon_creator/lib/drivers/otp.h" #include "sw/device/silicon_creator/lib/error.h"
diff --git a/sw/device/silicon_creator/lib/drivers/hmac.c b/sw/device/silicon_creator/lib/drivers/hmac.c index 5e484dc..2864cb4 100644 --- a/sw/device/silicon_creator/lib/drivers/hmac.c +++ b/sw/device/silicon_creator/lib/drivers/hmac.c
@@ -4,10 +4,10 @@ #include "sw/device/silicon_creator/lib/drivers/hmac.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" #include "sw/device/lib/base/macros.h" #include "sw/device/lib/base/memory.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/error.h" #include "hmac_regs.h" // Generated.
diff --git a/sw/device/silicon_creator/lib/drivers/keymgr.c b/sw/device/silicon_creator/lib/drivers/keymgr.c index fc40f35..8948af3 100644 --- a/sw/device/silicon_creator/lib/drivers/keymgr.c +++ b/sw/device/silicon_creator/lib/drivers/keymgr.c
@@ -4,9 +4,9 @@ #include "sw/device/silicon_creator/lib/drivers/keymgr.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/freestanding/assert.h" #include "sw/device/lib/base/macros.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/base/sec_mmio.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/drivers/meson.build b/sw/device/silicon_creator/lib/drivers/meson.build index 64a2c8b..db3e084 100644 --- a/sw/device/silicon_creator/lib/drivers/meson.build +++ b/sw/device/silicon_creator/lib/drivers/meson.build
@@ -45,7 +45,7 @@ 'hmac.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -92,7 +92,7 @@ 'keymgr.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_base_sec_mmio, ], ), @@ -152,7 +152,7 @@ ], dependencies: [ sw_lib_mmio, - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -230,7 +230,7 @@ 'retention_sram.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -278,7 +278,7 @@ 'rnd.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_driver_otp, ], ), @@ -308,7 +308,7 @@ 'rstmgr.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -340,7 +340,7 @@ 'rstmgr_functest.c' ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_driver_rstmgr, sw_silicon_creator_lib_driver_retention_sram, ], @@ -395,7 +395,7 @@ 'alert_functest.c' ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_base_sec_mmio, sw_silicon_creator_lib_driver_alert, sw_silicon_creator_lib_driver_rstmgr, @@ -417,7 +417,7 @@ 'pinmux.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -451,7 +451,7 @@ ], dependencies: [ sw_lib_mmio, - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -484,7 +484,7 @@ 'otbn.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, ], ), ) @@ -537,7 +537,7 @@ 'flash_ctrl.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_base_sec_mmio, sw_silicon_creator_lib_driver_otp, sw_lib_hardened,
diff --git a/sw/device/silicon_creator/lib/drivers/otbn.c b/sw/device/silicon_creator/lib/drivers/otbn.c index 908894c..c8e1ff5 100644 --- a/sw/device/silicon_creator/lib/drivers/otbn.c +++ b/sw/device/silicon_creator/lib/drivers/otbn.c
@@ -8,8 +8,8 @@ #include <stddef.h> #include <stdint.h> +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/error.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/drivers/pinmux.c b/sw/device/silicon_creator/lib/drivers/pinmux.c index 9b952f4..c7482aa 100644 --- a/sw/device/silicon_creator/lib/drivers/pinmux.c +++ b/sw/device/silicon_creator/lib/drivers/pinmux.c
@@ -4,8 +4,8 @@ #include "sw/device/silicon_creator/lib/drivers/pinmux.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/macros.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h" #include "pinmux_regs.h" // Generated.
diff --git a/sw/device/silicon_creator/lib/drivers/retention_sram.c b/sw/device/silicon_creator/lib/drivers/retention_sram.c index 98849cc..b5a7555 100644 --- a/sw/device/silicon_creator/lib/drivers/retention_sram.c +++ b/sw/device/silicon_creator/lib/drivers/retention_sram.c
@@ -6,7 +6,7 @@ #include <assert.h> -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" +#include "sw/device/lib/base/abs_mmio.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h" #include "sram_ctrl_regs.h" // Generated.
diff --git a/sw/device/silicon_creator/lib/drivers/rnd.c b/sw/device/silicon_creator/lib/drivers/rnd.c index 4ac43b9..def8733 100644 --- a/sw/device/silicon_creator/lib/drivers/rnd.c +++ b/sw/device/silicon_creator/lib/drivers/rnd.c
@@ -4,9 +4,9 @@ #include "sw/device/silicon_creator/lib/drivers/rnd.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/csr.h" #include "sw/device/lib/base/hardened.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/drivers/otp.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/drivers/rstmgr.c b/sw/device/silicon_creator/lib/drivers/rstmgr.c index 1936741..6e7531b 100644 --- a/sw/device/silicon_creator/lib/drivers/rstmgr.c +++ b/sw/device/silicon_creator/lib/drivers/rstmgr.c
@@ -14,7 +14,7 @@ #include "sw/device/lib/runtime/hart.h" #endif -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" +#include "sw/device/lib/base/abs_mmio.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h" #include "rstmgr_regs.h"
diff --git a/sw/device/silicon_creator/lib/drivers/uart.c b/sw/device/silicon_creator/lib/drivers/uart.c index 4d591eb..05ec9f7 100644 --- a/sw/device/silicon_creator/lib/drivers/uart.c +++ b/sw/device/silicon_creator/lib/drivers/uart.c
@@ -8,8 +8,8 @@ #include <stdint.h> #include "sw/device/lib/arch/device.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/error.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/drivers/watchdog.c b/sw/device/silicon_creator/lib/drivers/watchdog.c index d7f0438..e29a331 100644 --- a/sw/device/silicon_creator/lib/drivers/watchdog.c +++ b/sw/device/silicon_creator/lib/drivers/watchdog.c
@@ -4,7 +4,7 @@ #include "sw/device/silicon_creator/lib/drivers/watchdog.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" +#include "sw/device/lib/base/abs_mmio.h" #include "aon_timer_regs.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/drivers/watchdog_functest.c b/sw/device/silicon_creator/lib/drivers/watchdog_functest.c index 972d3d7..d556122 100644 --- a/sw/device/silicon_creator/lib/drivers/watchdog_functest.c +++ b/sw/device/silicon_creator/lib/drivers/watchdog_functest.c
@@ -6,13 +6,13 @@ #include <stdint.h> #include "sw/device/lib/arch/device.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/memory.h" #include "sw/device/lib/base/mmio.h" #include "sw/device/lib/runtime/hart.h" #include "sw/device/lib/runtime/log.h" #include "sw/device/lib/runtime/print.h" #include "sw/device/lib/testing/check.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/drivers/retention_sram.h" #include "sw/device/silicon_creator/lib/drivers/rstmgr.h" #include "sw/device/silicon_creator/lib/drivers/watchdog.h"
diff --git a/sw/device/silicon_creator/lib/irq_asm_functest.c b/sw/device/silicon_creator/lib/irq_asm_functest.c index 3996bff..0a1feef 100644 --- a/sw/device/silicon_creator/lib/irq_asm_functest.c +++ b/sw/device/silicon_creator/lib/irq_asm_functest.c
@@ -6,13 +6,13 @@ #include <stdint.h> #include "sw/device/lib/arch/device.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/memory.h" #include "sw/device/lib/base/mmio.h" #include "sw/device/lib/runtime/hart.h" #include "sw/device/lib/runtime/log.h" #include "sw/device/lib/runtime/print.h" #include "sw/device/lib/testing/check.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/drivers/retention_sram.h" #include "sw/device/silicon_creator/lib/drivers/rstmgr.h" #include "sw/device/silicon_creator/lib/error.h"
diff --git a/sw/device/silicon_creator/lib/meson.build b/sw/device/silicon_creator/lib/meson.build index a097108..40ea2bd 100644 --- a/sw/device/silicon_creator/lib/meson.build +++ b/sw/device/silicon_creator/lib/meson.build
@@ -107,7 +107,7 @@ 'shutdown.c', ], dependencies: [ - sw_silicon_creator_lib_base_abs_mmio, + sw_lib_abs_mmio, sw_silicon_creator_lib_driver_alert, ], ),
diff --git a/sw/device/silicon_creator/lib/otbn_util.c b/sw/device/silicon_creator/lib/otbn_util.c index 2751ee9..14f4183 100644 --- a/sw/device/silicon_creator/lib/otbn_util.c +++ b/sw/device/silicon_creator/lib/otbn_util.c
@@ -8,8 +8,8 @@ #include <stddef.h> #include <stdint.h> +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/drivers/otbn.h" #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
diff --git a/sw/device/silicon_creator/lib/shutdown.c b/sw/device/silicon_creator/lib/shutdown.c index fa41ff3..5facbd0 100644 --- a/sw/device/silicon_creator/lib/shutdown.c +++ b/sw/device/silicon_creator/lib/shutdown.c
@@ -6,11 +6,11 @@ #include <assert.h> +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/bitfield.h" #include "sw/device/lib/base/macros.h" #include "sw/device/lib/base/memory.h" #include "sw/device/lib/base/stdasm.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/drivers/alert.h" #include "sw/device/silicon_creator/lib/drivers/lifecycle.h" #include "sw/device/silicon_creator/lib/drivers/otp.h"
diff --git a/sw/device/silicon_creator/mask_rom/mask_rom_epmp_test.c b/sw/device/silicon_creator/mask_rom/mask_rom_epmp_test.c index 93af907..1fcdcde 100644 --- a/sw/device/silicon_creator/mask_rom/mask_rom_epmp_test.c +++ b/sw/device/silicon_creator/mask_rom/mask_rom_epmp_test.c
@@ -8,6 +8,7 @@ #include <stdint.h> #include "sw/device/lib/arch/device.h" +#include "sw/device/lib/base/abs_mmio.h" #include "sw/device/lib/base/csr.h" #include "sw/device/lib/base/memory.h" #include "sw/device/lib/base/stdasm.h" @@ -16,7 +17,6 @@ #include "sw/device/lib/runtime/log.h" #include "sw/device/lib/runtime/print.h" #include "sw/device/lib/testing/test_framework/test_status.h" -#include "sw/device/silicon_creator/lib/base/abs_mmio.h" #include "sw/device/silicon_creator/lib/base/sec_mmio.h" #include "sw/device/silicon_creator/lib/drivers/flash_ctrl.h" #include "sw/device/silicon_creator/lib/drivers/uart.h"