Skip to content

Commit 9b6b9f1

Browse files
degjorvarlubos
authored andcommitted
nrf_security: CRACEN: Clean up includes and naming
Switch to <baremetal_ba414e_with_ik/internal.h> and move the include dir up to target/ to provide the namespace. Fix an incorrect relative path for regs_commands.h in ec_curves.c. Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
1 parent 3a6d3ca commit 9b6b9f1

7 files changed

Lines changed: 7 additions & 8 deletions

File tree

subsys/nrf_security/src/drivers/cracen/silexpk/silexpk.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ list(APPEND cracen_driver_sources
2525
${CMAKE_CURRENT_LIST_DIR}/target/hw/ba414/cmddefs_ecjpake.c
2626
)
2727

28-
# We need internal.h to be on path
2928
list(APPEND cracen_driver_include_dirs
30-
${CMAKE_CURRENT_LIST_DIR}/target/baremetal_ba414e_with_ik
29+
${CMAKE_CURRENT_LIST_DIR}/target
3130
${CMAKE_CURRENT_LIST_DIR}/include
3231
)
3332

subsys/nrf_security/src/drivers/cracen/silexpk/src/blind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <silexpk/blinding.h>
99
#include <cracen/statuscodes.h>
1010
#include <cracen/prng_pool.h>
11-
#include "internal.h"
11+
#include <baremetal_ba414e_with_ik/internal.h>
1212

1313
int sx_pk_get_blinding_factor(sx_pk_blind_factor *bld_factor)
1414
{

subsys/nrf_security/src/drivers/cracen/silexpk/target/baremetal_ba414e_with_ik/pk_baremetal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <silexpk/blinding.h>
2020
#include <cracen/interrupts.h>
2121
#include <cracen/statuscodes.h>
22-
#include "internal.h"
22+
#include <baremetal_ba414e_with_ik/internal.h>
2323

2424
#include <hal/nrf_cracen.h>
2525
#include <cracen/hardware.h>

subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ba414/ec_curves.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <zephyr/kernel.h>
88
#include <silexpk/ec_curves.h>
99
#include "../../../src/regs_curves.h"
10-
#include "../../target/hw/ba414/regs_commands.h"
10+
#include "regs_commands.h"
1111
#include <silexpk/core.h>
1212
#include <string.h>
1313
#include <zephyr/sys/util.h>

subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ba414/pkhardware_ba414e.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <silexpk/core.h>
1515
#include "regs_addr.h"
16-
#include <internal.h>
16+
#include <baremetal_ba414e_with_ik/internal.h>
1717
#include "op_slots.h"
1818
#include "regs_commands.h"
1919
#include "pkhardware_ba414e.h"

subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ik/ikhardware.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <cracen/membarriers.h>
88

99
#include "ikhardware.h"
10-
#include <internal.h>
10+
#include <baremetal_ba414e_with_ik/internal.h>
1111
#include "../ba414/op_slots.h"
1212
#include "../ik/regs_commands.h"
1313
#include "../ba414/regs_addr.h"

subsys/nrf_security/src/drivers/cracen/silexpk/target/hw/ik/ikhardware.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <stdint.h>
88
#include <silexpk/core.h>
9-
#include <internal.h>
9+
#include <baremetal_ba414e_with_ik/internal.h>
1010
#include <silexpk/ik.h>
1111

1212
/** Get status for IK operation */

0 commit comments

Comments
 (0)