From 4c63cfd97402b98ece2bbe9de8cadca3c78fb455 Mon Sep 17 00:00:00 2001
From: Elms <jeff@wolfssl.com>
Date: Tue, 4 May 2021 11:49:21 -0700
Subject: [PATCH] cleanup makefiles

---
 Makefile                           | 6 +++---
 test-app/Makefile                  | 2 +-
 tools/test-expect-version/Makefile | 4 ++--
 tools/test-update-server/Makefile  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index bdfa33ad..e28f948d 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ all: $(MAIN_TARGET)
 
 wolfboot.bin: wolfboot.elf
 	@echo "\t[BIN] $@"
-	$(Q)$(OBJCOPY) -O binary --gap-fill=255 $^ $@
+	$(Q)$(OBJCOPY) -O binary $^ $@
 
 align: wolfboot-align.bin
 
@@ -55,7 +55,7 @@ BOOTLOADER_PARTITION_SIZE=$$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH
 BOOT_PAD_TO_ADDR=$$(($(WOLFBOOT_START) + $(BOOTLOADER_PARTITION_SIZE)))
 
 wolfboot-align.bin: wolfboot.elf
-	$(Q)$(OBJCOPY) -O binary --gap-fill=255 --pad-to=$(BOOT_PAD_TO_ADDR) wolfboot.elf $@
+	$(Q)$(OBJCOPY) -O binary wolfboot.elf $@
 	@echo
 	@echo "\t[SIZE]"
 	$(Q)$(SIZE) wolfboot.elf
@@ -127,7 +127,7 @@ keys: $(PRIVATE_KEY)
 
 clean:
 	@find . -type f -name "*.o" | xargs rm -f
-	@rm -f *.bin *.elf wolfboot.map *.bin  *.hex config/target.ld
+	@rm -f *.bin *.elf wolfboot.map test-update.rom *.hex config/target.ld
 	@make -C test-app clean
 	@make -C tools/check_config clean
 
diff --git a/test-app/Makefile b/test-app/Makefile
index bfed02fc..378a016f 100644
--- a/test-app/Makefile
+++ b/test-app/Makefile
@@ -180,7 +180,7 @@ standalone:LDFLAGS:=$(CFLAGS) -T standalone.ld -Wl,-gc-sections -Wl,-Map=image.m
 
 image.bin: image.elf
 	@echo "\t[BIN] $@"
-	$(Q)$(OBJCOPY) --gap-fill=255 --pad-to $$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) + $(WOLFBOOT_PARTITION_SIZE) )) -O binary $^ $@
+	$(Q)$(OBJCOPY) -O binary $^ $@
 
 image.elf: $(APP_OBJS) $(LSCRIPT)
 	@echo "\t[LD] $@"
diff --git a/tools/test-expect-version/Makefile b/tools/test-expect-version/Makefile
index 5d4d1094..ec1ba07d 100644
--- a/tools/test-expect-version/Makefile
+++ b/tools/test-expect-version/Makefile
@@ -1,8 +1,8 @@
 CC=gcc
-CFLAGS=-Wall -DWOLFSSL_DTLS -DWOLFSSL_DEBUG -DTFM_TIMING_RESISTANT -g -ggdb
+CFLAGS=-Wall -g -ggdb
 EXE=test-expect-version
 
-LIBS=-lwolfssl -lpthread
+LIBS=
 
 $(EXE): $(EXE).o
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
diff --git a/tools/test-update-server/Makefile b/tools/test-update-server/Makefile
index 2a242a8d..38de5a60 100644
--- a/tools/test-update-server/Makefile
+++ b/tools/test-update-server/Makefile
@@ -1,8 +1,8 @@
 CC=gcc
-CFLAGS=-Wall -DWOLFSSL_DEBUG -DTFM_TIMING_RESISTANT -g -ggdb
+CFLAGS=-Wall -g -ggdb
 EXE=server
 
-LIBS=-lwolfssl -lpthread
+LIBS=-lpthread
 
 $(EXE): $(EXE).o
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)