Skip to content

Commit 62fcc55

Browse files
committed
Simplified code structure, got rid of some configuration defines
1 parent 7f02df5 commit 62fcc55

17 files changed

Lines changed: 304 additions & 584 deletions

File tree

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ OBJS:= \
2020
./lib/bootutil/src/loader.o \
2121
./lib/bootutil/src/image_validate.o \
2222
./lib/bootutil/src/bootutil_misc.o \
23-
./src/run.o \
2423
./src/mem.o \
2524
./src/keys.o \
2625
./src/crypto.o \
27-
./src/startup_bl.o \
26+
./src/wolfboot.o \
2827
./src/main.o \
2928
./lib/wolfssl/wolfcrypt/src/sha256.o \
3029
./lib/wolfssl/wolfcrypt/src/hash.o \
3130
./lib/wolfssl/wolfcrypt/src/wolfmath.o \
3231
./lib/wolfssl/wolfcrypt/src/fe_low_mem.o
3332

34-
CFLAGS:=-mcpu=cortex-m3 -mthumb -Wall -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
33+
CFLAGS:=-mcpu=cortex-m3 -mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \
3534
-Ilib/bootutil/include -Iinclude/ -Ilib/wolfssl -nostartfiles \
36-
-DBOOT_MAX_IMG_SECTORS=256 -DWOLFBOOT_VALIDATE_SLOT0 -DWOLFBOOT_USE_FLASHAREA_GET_SECTORS \
3735
-nostdlib \
3836
-DWOLFSSL_USER_SETTINGS \
3937
-DPLATFORM_$(TARGET)
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#define H_UTIL_FLASH_MAP_
2525

2626
/**
27-
*
28-
* Provides abstraction of flash regions for type of use.
29-
* I.e. dude where's my image?
3027
*
3128
* System will contain a map which contains flash areas. Every
3229
* region will contain flash identifier, offset within flash and length.
@@ -130,13 +127,6 @@ uint8_t flash_area_align(const struct flash_area *);
130127
int flash_area_get_sectors(int fa_id, uint32_t *count,
131128
struct flash_sector *sectors);
132129

133-
/*
134-
* Similar to flash_area_get_sectors(), but return the values in an
135-
* array of struct flash_area instead.
136-
*/
137-
__attribute__((deprecated))
138-
int flash_area_to_sectors(int idx, int *cnt, struct flash_area *ret);
139-
140130
int flash_area_id_from_image_slot(int slot);
141131
int flash_area_id_to_image_slot(int area_id);
142132

File renamed without changes.

include/sysflash/sysflash.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/bootutil/include/bootutil/sha256.h

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)