diff options
| author | danicampora <danicampora@gmail.com> | 2015-02-25 11:08:51 +0100 |
|---|---|---|
| committer | danicampora <danicampora@gmail.com> | 2015-02-25 11:37:29 +0100 |
| commit | 11aa6ba456287d6c80598a7ebbebd2887ce8f5a2 (patch) | |
| tree | 82591ae3cdf59ebeca2d4b8df8f129a201198f79 /cc3200/bootmgr | |
| parent | fe2eb5f58a92c35e7c35da8853abb195fd30969a (diff) | |
| download | micropython-11aa6ba456287d6c80598a7ebbebd2887ce8f5a2.tar.gz micropython-11aa6ba456287d6c80598a7ebbebd2887ce8f5a2.zip | |
cc3200: Add WDT functionality as part of the pyb module.
Also improve pybsd, and make it save it's pin configuration.
This is a necessary step towards supporting the CC3200 low
power deep sleep (LPDS) mode.
Diffstat (limited to 'cc3200/bootmgr')
| -rw-r--r-- | cc3200/bootmgr/bootloader.mk | 12 | ||||
| -rw-r--r-- | cc3200/bootmgr/main.c | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cc3200/bootmgr/bootloader.mk b/cc3200/bootmgr/bootloader.mk index b224030039..64d7f671a9 100644 --- a/cc3200/bootmgr/bootloader.mk +++ b/cc3200/bootmgr/bootloader.mk @@ -5,6 +5,7 @@ BOOT_INC += -Ibootmgr/sl BOOT_INC += -Ihal BOOT_INC += -Ihal/inc BOOT_INC += -I../drivers/cc3100/inc +BOOT_INC += -Imods BOOT_INC += -Isimplelink BOOT_INC += -Isimplelink/oslib BOOT_INC += -Iutil @@ -38,6 +39,10 @@ BOOT_CC3100_SRC_C = $(addprefix drivers/cc3100/,\ src/wlan.c \ ) +BOOT_MODS_SRC_C = $(addprefix mods/,\ + pybwdt.c \ + ) + BOOT_SL_SRC_C = $(addprefix simplelink/,\ cc_pal.c \ ) @@ -62,8 +67,8 @@ BOOT_STM_SRC_C = $(addprefix stmhal/,\ string0.c \ ) -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_MAIN_SRC_C:.c=.o)) -OBJ += $(addprefix $(BUILD)/, $(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_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_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 @@ -72,9 +77,6 @@ LDFLAGS += -T $(LINKER_SCRIPT) # Add the bootloader specific CFLAGS CFLAGS += $(BOOT_CPPDEFINES) $(BOOT_INC) -# Optimize for size all sources except for main - - # Disable strict aliasing for the simplelink driver $(BUILD)/drivers/cc3100/src/driver.o: CFLAGS += -fno-strict-aliasing diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c index bb584737fb..839e23ecdd 100644 --- a/cc3200/bootmgr/main.c +++ b/cc3200/bootmgr/main.c @@ -49,6 +49,7 @@ #include "utils.h" #include "cc3200_hal.h" #include "debug.h" +#include "pybwdt.h" //***************************************************************************** @@ -153,6 +154,8 @@ static void bootmgr_board_init(void) { // Mandatory MCU Initialization PRCMCC3200MCUInit(); + pybwdt_check_reset_cause(); + // Enable the Data Hashing Engine HASH_Init(); |