Skip to content

Fix mbed-os build failures #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
motgon01 wants to merge 4 commits into from
Closed

Fix mbed-os build failures #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2d013c
Fix anonymous union compilation error
Jun 3, 2019
0ee87d1
Merge pull request #1 from ARMmbed/compile_with_armgcc
Jun 3, 2019
45b9839
file not exist and fails mbed-os build
motgon01 Aug 11, 2019
7811661
change to forward slash as it fails mbed-os build
motgon01 Aug 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/secure_boot/secure_boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "hal/atca_hal.h"
#include "test/atca_test.h"
#include "io_protection_key.h"
#include "crypto_device_app.h"

/*Initialization routines */
static ATCA_STATUS secure_boot_init(secure_boot_parameters* secure_boot_params);
Expand Down Expand Up @@ -276,4 +275,4 @@ ATCA_STATUS bind_host_and_secure_element_with_io_protection(uint16_t slot)
while (0);

return status;
}
}
2 changes: 1 addition & 1 deletion app/secure_boot/secure_boot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern "C" {
#include "atca_status.h"
#include "secure_boot_memory.h"
#include "atca_command.h"
#include "crypto\atca_crypto_sw_sha2.h"
#include "crypto/atca_crypto_sw_sha2.h"
#include "host/atca_host.h"


Expand Down
10 changes: 5 additions & 5 deletions lib/atca_iface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ typedef struct

union // each instance of an iface cfg defines a single type of interface
{
struct ATCAI2C
struct
{
uint8_t slave_address; // 8-bit slave address
uint8_t bus; // logical i2c bus number, 0-based - HAL will map this to a pin pair for SDA SCL
uint32_t baud; // typically 400000
} atcai2c;

struct ATCASWI
struct
{
uint8_t bus; // logical SWI bus - HAL will map this to a pin or uart port
} atcaswi;

struct ATCAUART
struct
{
int port; // logic port number
uint32_t baud; // typically 115200
Expand All @@ -92,7 +92,7 @@ typedef struct
uint8_t stopbits; // 0,1,2
} atcauart;

struct ATCAHID
struct
{
int idx; // HID enumeration index
uint32_t vid; // Vendor ID of kit (0x03EB for CK101)
Expand All @@ -101,7 +101,7 @@ typedef struct
uint8_t guid[16]; // The GUID for this HID device
} atcahid;

struct ATCACUSTOM
struct
{
ATCA_STATUS (*halinit)(void *hal, void *cfg);
ATCA_STATUS (*halpostinit)(void *iface);
Expand Down