diff options
| author | danicampora | 2015-02-26 15:29:47 +0100 |
|---|---|---|
| committer | danicampora | 2015-03-11 16:54:05 +0100 |
| commit | 0475de1350726871eca827d637fd423dfd836ca2 (patch) | |
| tree | fbe59a2290d49ac14fe8f197df13c395b84cc49b /cc3200/bootmgr | |
| parent | 55278dcc763e62513af02118e6bbd74707007e8d (diff) | |
cc3200: Make WDT and HeartBeat constant objects on their own right.
Diffstat (limited to 'cc3200/bootmgr')
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 8 | ||||
| -rw-r--r-- | cc3200/bootmgr/main.c | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index 143cafa98..68d80fd71 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -44,10 +44,6 @@ BOOT_MISC_SRC_C = $(addprefix misc/,\ mperror.c \ ) -BOOT_MODS_SRC_C = $(addprefix mods/,\ - pybwdt.c \ - ) - BOOT_SL_SRC_C = $(addprefix simplelink/,\ cc_pal.c \ ) @@ -72,8 +68,8 @@ BOOT_STM_SRC_C = $(addprefix stmhal/,\ string0.c \ ) -OBJ = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_MODS_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o)) -OBJ += $(addprefix $(BUILD)/, $(BOOT_MISC_SRC_C:.c=.o) $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o)) +OBJ = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o)) +OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o) $(BOOT_STM_SRC_C:.c=.o)) # Add the linker script LINKER_SCRIPT = bootmgr/bootmgr.lds diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c index 0e7ecd01b..e718fd9e2 100644 --- a/cc3200/bootmgr/main.c +++ b/cc3200/bootmgr/main.c @@ -51,7 +51,6 @@ #include "utils.h" #include "cc3200_hal.h" #include "debug.h" -#include "pybwdt.h" #include "mperror.h" @@ -149,7 +148,7 @@ static void bootmgr_board_init(void) { // Mandatory MCU Initialization PRCMCC3200MCUInit(); - pybwdt_check_reset_cause(); + mperror_check_reset_cause(); // Enable the Data Hashing Engine HASH_Init(); |