Skip to content

Commit b07f079

Browse files
committed
[tests] Port edn_auto_mode to multitop
Signed-off-by: Robert Schilling <[email protected]>
1 parent 2cc3236 commit b07f079

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

sw/device/tests/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,7 @@ opentitan_test(
12661266
{
12671267
"//hw/top_earlgrey:silicon_creator": None,
12681268
},
1269+
DARJEELING_TEST_ENVS,
12691270
),
12701271
verilator = verilator_params(
12711272
timeout = "eternal",
@@ -1275,8 +1276,8 @@ opentitan_test(
12751276
),
12761277
deps = [
12771278
"//hw/ip/aes:model",
1279+
"//hw/top:dt",
12781280
"//hw/top:edn_c_regs",
1279-
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
12801281
"//sw/device/lib/base:mmio",
12811282
"//sw/device/lib/crypto/drivers:otbn",
12821283
"//sw/device/lib/dif:aes",

sw/device/tests/edn_auto_mode.c

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
#include "hw/ip/aes/model/aes_modes.h"
6+
#include "hw/top/dt/dt_aes.h"
7+
#include "hw/top/dt/dt_csrng.h"
8+
#include "hw/top/dt/dt_edn.h"
9+
#include "hw/top/dt/dt_otbn.h"
10+
#include "hw/top/dt/dt_rv_core_ibex.h"
611
#include "sw/device/lib/base/mmio.h"
712
#include "sw/device/lib/dif/dif_aes.h"
813
#include "sw/device/lib/dif/dif_csrng.h"
@@ -21,7 +26,6 @@
2126
#include "sw/device/tests/otbn_randomness_impl.h"
2227

2328
#include "hw/top/edn_regs.h" // Generated
24-
#include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
2529

2630
enum {
2731
kTimeout = (10 * 1000 * 1000),
@@ -53,19 +57,12 @@ OTTF_DEFINE_TEST_CONFIG();
5357

5458
// Initializes the peripherals used in this test.
5559
static void init_peripherals(void) {
56-
CHECK_DIF_OK(dif_csrng_init(
57-
mmio_region_from_addr(TOP_EARLGREY_CSRNG_BASE_ADDR), &csrng));
58-
CHECK_DIF_OK(
59-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN0_BASE_ADDR), &edn0));
60-
CHECK_DIF_OK(
61-
dif_edn_init(mmio_region_from_addr(TOP_EARLGREY_EDN1_BASE_ADDR), &edn1));
62-
CHECK_DIF_OK(
63-
dif_aes_init(mmio_region_from_addr(TOP_EARLGREY_AES_BASE_ADDR), &aes));
64-
CHECK_DIF_OK(
65-
dif_otbn_init(mmio_region_from_addr(TOP_EARLGREY_OTBN_BASE_ADDR), &otbn));
66-
CHECK_DIF_OK(dif_rv_core_ibex_init(
67-
mmio_region_from_addr(TOP_EARLGREY_RV_CORE_IBEX_CFG_BASE_ADDR),
68-
&rv_core_ibex));
60+
CHECK_DIF_OK(dif_csrng_init_from_dt(kDtCsrng, &csrng));
61+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn0, &edn0));
62+
CHECK_DIF_OK(dif_edn_init_from_dt(kDtEdn1, &edn1));
63+
CHECK_DIF_OK(dif_aes_init_from_dt(kDtAes, &aes));
64+
CHECK_DIF_OK(dif_otbn_init_from_dt(kDtOtbn, &otbn));
65+
CHECK_DIF_OK(dif_rv_core_ibex_init_from_dt(kDtRvCoreIbex, &rv_core_ibex));
6966
}
7067

7168
static void configure_otbn(void) {

0 commit comments

Comments
 (0)