diff options
| author | Paul Selkirk <paul@psgd.org> | 2017-05-02 17:10:02 -0400 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2017-05-02 17:10:02 -0400 |
| commit | 1175ff63f2a8c4762692551403862f9f0789aef8 (patch) | |
| tree | d7d004e639ffa35296b6c91a64711bcc34f63a9b /projects/bootloader | |
| parent | 716694ae77259e31526a6d64db867ced5c231ced (diff) | |
Merge branch 'init_cleanup' into no-rtos
Clean up Makefiles and initialization code.
Diffstat (limited to 'projects/bootloader')
| -rw-r--r-- | projects/bootloader/Makefile | 1 | ||||
| -rw-r--r-- | projects/bootloader/bootloader.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/projects/bootloader/Makefile b/projects/bootloader/Makefile index fe96982..6c1012f 100644 --- a/projects/bootloader/Makefile +++ b/projects/bootloader/Makefile @@ -7,7 +7,6 @@ BOARD_OBJS = \ $(TOPLEVEL)/stm-fmc.o \ $(TOPLEVEL)/stm-uart.o \ $(TOPLEVEL)/spiflash_n25q128.o \ - $(TOPLEVEL)/stm-fpgacfg.o \ $(TOPLEVEL)/stm-keystore.o \ $(TOPLEVEL)/stm-flash.o \ $(TOPLEVEL)/syscalls.o \ diff --git a/projects/bootloader/bootloader.c b/projects/bootloader/bootloader.c index 683a498..c0f981f 100644 --- a/projects/bootloader/bootloader.c +++ b/projects/bootloader/bootloader.c @@ -38,7 +38,9 @@ #include "stm-fmc.h" #include "dfu.h" -#undef HAL_Delay +/* stub these out to avoid linker error */ +void fpgacfg_init(void) { } +void sdram_init(void) { } /* Linker symbols are strange in C. Make regular pointers for sanity. */ __IO uint32_t *dfu_control = &CRYPTECH_DFU_CONTROL; @@ -91,13 +93,11 @@ int should_dfu() /* Sleep for specified number of seconds -- used after bad PIN. */ void hal_sleep(const unsigned seconds) { HAL_Delay(seconds * 1000); } -int -main() +int main(void) { int status; stm_init(); - fmc_init(); uart_send_string2(STM_UART_MGMT, (char *) "\r\n\r\nThis is the bootloader speaking..."); |