mirror of https://github.com/wolfSSL/wolfBoot.git
make: clean up and check_config update
Also add emacs backup files to ignorepull/189/head
parent
63e36692db
commit
c1e000faa0
|
|
@ -68,6 +68,9 @@ tools/keytools/Release
|
|||
# Vim swap files
|
||||
.*.swp
|
||||
|
||||
# emacs backups
|
||||
**~
|
||||
|
||||
# tags etc.
|
||||
cscope.out
|
||||
tags
|
||||
|
|
|
|||
3
Makefile
3
Makefile
|
|
@ -153,8 +153,7 @@ config: FORCE
|
|||
make -C config
|
||||
|
||||
check_config:
|
||||
make -C tools/check_config
|
||||
|
||||
make -C tools/check_config run
|
||||
|
||||
%.o:%.c
|
||||
@echo "\t[CC-$(ARCH)] $@"
|
||||
|
|
|
|||
|
|
@ -179,44 +179,44 @@ standalone:CFLAGS+=-DTEST_APP_STANDALONE
|
|||
standalone:LDFLAGS:=$(CFLAGS) -T standalone.ld -Wl,-gc-sections -Wl,-Map=image.map
|
||||
|
||||
image.bin: image.elf
|
||||
@echo "\t[BIN] $@"
|
||||
$(Q)echo "\t[BIN] $@"
|
||||
$(Q)$(OBJCOPY) -O binary $^ $@
|
||||
|
||||
image.elf: $(APP_OBJS) $(LSCRIPT)
|
||||
@echo "\t[LD] $@"
|
||||
$(Q)echo "\t[LD] $@"
|
||||
$(Q)$(LD) $(LDFLAGS) $(APP_OBJS) -o $@
|
||||
|
||||
|
||||
standalone: image.bin
|
||||
|
||||
../src/libwolfboot.o: ../src/libwolfboot.c FORCE
|
||||
@echo "\t[CC-$(ARCH)] $@"
|
||||
$(Q)echo "\t[CC-$(ARCH)] $@"
|
||||
$(Q)$(CC) $(CFLAGS) -c -o $@ ../src/libwolfboot.c
|
||||
|
||||
%.o:%.c
|
||||
@echo "\t[CC-$(ARCH)] $@"
|
||||
$(Q)echo "\t[CC-$(ARCH)] $@"
|
||||
$(Q)$(CC) $(CFLAGS) -c -o $@ $^
|
||||
|
||||
%.o:%.S
|
||||
@echo "\t[AS-$(ARCH)] $@"
|
||||
$(Q)echo "\t[AS-$(ARCH)] $@"
|
||||
$(Q)$(CC) $(CFLAGS) -c -o $@ $^
|
||||
|
||||
clean:
|
||||
@rm -f *.bin *.elf tags *.o $(LSCRIPT)
|
||||
$(Q)rm -f *.bin *.elf tags *.o $(LSCRIPT)
|
||||
|
||||
$(LSCRIPT): $(LSCRIPT_TEMPLATE) FORCE
|
||||
@printf "%d" $(WOLFBOOT_PARTITION_BOOT_ADDRESS) > .wolfboot-offset
|
||||
@printf "%d" $(WOLFBOOT_PARTITION_SIZE) > .partition-size
|
||||
@printf "%d" $(IMAGE_HEADER_SIZE) > .header-size
|
||||
@expr `cat .wolfboot-offset` + `cat .header-size` > .entry-point
|
||||
@printf "0x%X" `cat .entry-point` > .entry-point
|
||||
@expr `cat .partition-size` - `cat .header-size` > .app-size
|
||||
@printf "0x%X" `cat .app-size` > .app-size
|
||||
@ cat $(LSCRIPT_TEMPLATE) | \
|
||||
$(Q)printf "%d" $(WOLFBOOT_PARTITION_BOOT_ADDRESS) > .wolfboot-offset
|
||||
$(Q)printf "%d" $(WOLFBOOT_PARTITION_SIZE) > .partition-size
|
||||
$(Q)printf "%d" $(IMAGE_HEADER_SIZE) > .header-size
|
||||
$(Q)expr `cat .wolfboot-offset` + `cat .header-size` > .entry-point
|
||||
$(Q)printf "0x%X" `cat .entry-point` > .entry-point
|
||||
$(Q)expr `cat .partition-size` - `cat .header-size` > .app-size
|
||||
$(Q)printf "0x%X" `cat .app-size` > .app-size
|
||||
$(Q)cat $(LSCRIPT_TEMPLATE) | \
|
||||
sed -e "s/##WOLFBOOT_TEST_APP_SIZE##/`cat .app-size`/g" | \
|
||||
sed -e "s/##WOLFBOOT_TEST_APP_ADDRESS##/`cat .entry-point`/g" \
|
||||
> $(@)
|
||||
@rm -f .app-size .entry-point .wolfboot-offset .partition-size .header-size
|
||||
$(Q)rm -f .app-size .entry-point .wolfboot-offset .partition-size .header-size
|
||||
|
||||
FORCE:
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,21 @@
|
|||
-include ../../.config
|
||||
include ../config.mk
|
||||
include ../../options.mk
|
||||
CFLAGS+=-I. -I../../ -I../../include -m32
|
||||
|
||||
CFLAGS+=-I. -I../../ -I../../include
|
||||
|
||||
.PHONY: run clean
|
||||
|
||||
run:
|
||||
$(Q)$(RM) check_config.o
|
||||
$(Q)$(MAKE) check_config
|
||||
|
||||
check_config: check_config.o
|
||||
@gcc -o $@ $^ $(CFLAGS)
|
||||
@./check_config
|
||||
$(Q)gcc -o $@ $^ $(CFLAGS)
|
||||
$(Q)./$@
|
||||
|
||||
%.o:%.c
|
||||
@gcc -c -o $@ $^ $(CFLAGS)
|
||||
$(Q)gcc -c -o $@ $^ $(CFLAGS)
|
||||
|
||||
clean:
|
||||
@rm -f check_config *.o
|
||||
$(Q)rm -f check_config *.o
|
||||
|
|
|
|||
|
|
@ -75,20 +75,31 @@ int spi_flash_write(uint32_t address, const void *data, int len)
|
|||
|
||||
int main(void)
|
||||
{
|
||||
printf("WOLFBOOT_PARTITION_SIZE : %lu\n", WOLFBOOT_PARTITION_SIZE);
|
||||
printf("WOLFBOOT_SECTOR_SIZE : %lu\n", WOLFBOOT_SECTOR_SIZE);
|
||||
printf("Sectors per partition : %lu\n", (WOLFBOOT_PARTITION_SIZE / WOLFBOOT_SECTOR_SIZE));
|
||||
printf("ENCRYPT_TMP_SECRET_OFFSET : %lu\n", ENCRYPT_TMP_SECRET_OFFSET);
|
||||
printf("TRAILER_SKIP : %lu\n", TRAILER_SKIP);
|
||||
printf("TRAILER_OVERHEAD : %lu\n", TRAILER_OVERHEAD);
|
||||
printf("WOLFBOOT_PARTITION_SIZE : %u\n", WOLFBOOT_PARTITION_SIZE);
|
||||
printf("WOLFBOOT_SECTOR_SIZE : %u\n", WOLFBOOT_SECTOR_SIZE);
|
||||
printf("Sectors per partition : %u\n", (WOLFBOOT_PARTITION_SIZE / WOLFBOOT_SECTOR_SIZE));
|
||||
printf("ENCRYPT_TMP_SECRET_OFFSET : %u\n", ENCRYPT_TMP_SECRET_OFFSET);
|
||||
printf("TRAILER_SKIP : %u\n", TRAILER_SKIP);
|
||||
#if defined(EXT_ENCRYPTED)
|
||||
printf("TRAILER_OVERHEAD : %u\n", TRAILER_OVERHEAD);
|
||||
#endif
|
||||
printf("WOLFBOOT_PARTITION_BOOT_ADDRESS : %08X\n", WOLFBOOT_PARTITION_BOOT_ADDRESS);
|
||||
printf("WOLFBOOT_PARTITION_UPDATE_ADDRESS : %08X\n", WOLFBOOT_PARTITION_UPDATE_ADDRESS);
|
||||
printf("PART_BOOT_ENDFLAGS : %08X\n", PART_BOOT_ENDFLAGS);
|
||||
printf("PART_UPDATE_ENDFLAGS : %08X\n", PART_UPDATE_ENDFLAGS);
|
||||
#if !defined(EXT_FLASH) || defined(FLAGS_HOME)
|
||||
printf("Max firmware size : %lu\n", (Min(PART_BOOT_ENDFLAGS, PART_UPDATE_ENDFLAGS) - WOLFBOOT_PARTITION_BOOT_ADDRESS) - TRAILER_OVERHEAD);
|
||||
printf("Max firmware size : %u\n", (Min(PART_BOOT_ENDFLAGS, PART_UPDATE_ENDFLAGS) - WOLFBOOT_PARTITION_BOOT_ADDRESS)
|
||||
#if defined(EXT_ENCRYPTED)
|
||||
- TRAILER_OVERHEAD
|
||||
#endif
|
||||
);
|
||||
#else
|
||||
printf("Max firmware size : %lu\n", (PART_BOOT_ENDFLAGS - WOLFBOOT_PARTITION_BOOT_ADDRESS) - TRAILER_OVERHEAD);
|
||||
printf("Max firmware size : %u\n",
|
||||
(PART_BOOT_ENDFLAGS - WOLFBOOT_PARTITION_BOOT_ADDRESS)
|
||||
#if defined(EXT_ENCRYPTED)
|
||||
- TRAILER_OVERHEAD
|
||||
#endif
|
||||
);
|
||||
#endif
|
||||
return 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue