Skip to content

Commit ed94f79

Browse files
committed
Using WOLFBOOT_ROOT instead of relative paths in configs
1 parent be0a8b4 commit ed94f79

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
include tools/config.mk
99

1010
## Initializers
11+
WOLFBOOT_ROOT=$(PWD)
1112
CFLAGS:=-D__WOLFBOOT -DWOLFBOOT_VERSION=$(WOLFBOOT_VERSION)UL -ffunction-sections -fdata-sections
1213
LSCRIPT:=config/target.ld
1314
LDFLAGS:=-T $(LSCRIPT) -Wl,-gc-sections -Wl,-Map=wolfboot.map -ffreestanding -nostartfiles
@@ -21,6 +22,7 @@ WOLFCRYPT_OBJS:=
2122
PUBLIC_KEY_OBJS:=
2223
UPDATE_OBJS:=
2324

25+
2426
ifeq ($(SIGN),RSA4096)
2527
SPMATH=0
2628
endif
@@ -207,7 +209,7 @@ wolfboot-align.bin: .bootloader-partition-size wolfboot.bin
207209
@echo
208210

209211
test-app/image.bin: wolfboot-align.bin
210-
@make -C test-app
212+
@make -C test-app WOLFBOOT_ROOT=$(WOLFBOOT_ROOT)
211213
@rm -f src/*.o hal/*.o
212214
@$(SIZE) test-app/image.elf
213215

config/examples/cypsoc6.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ ARCH?=ARM
22
TARGET?=psoc6
33
SIGN?=ED25519
44
HASH?=SHA256
5-
CYPRESS_PDL?=./lib/psoc6pdl
6-
CYPRESS_TARGET_LIB?=./lib/TARGET_CY8CKIT-062S2-43012
7-
CYPRESS_CORE_LIB?=./lib/core-lib
5+
CYPRESS_PDL?=$(WOLFBOOT_ROOT)/lib/psoc6pdl
6+
CYPRESS_TARGET_LIB?=$(WOLFBOOT_ROOT)/lib/TARGET_CY8CKIT-062S2-43012
7+
CYPRESS_CORE_LIB?=$(WOLFBOOT_ROOT)/lib/core-lib
88
DEBUG?=1
99
VTOR?=1
1010
CORTEX_M0?=1

0 commit comments

Comments
 (0)