diff --git a/APP/main.c b/APP/main.c index a9db6a2..ca83fe4 100644 --- a/APP/main.c +++ b/APP/main.c @@ -5,6 +5,7 @@ #include "fc7xxx_driver_fmc.h" #include "InternalFlashPage.h" #include "memory.h" +#include "BootJump.h" #define _BootloaderSize (64 * 1024) #define _BootloaderBegin 0x01000000 @@ -122,11 +123,13 @@ int main(void) { */ if (NumberBank == 1) { - swap_bank(0); + swap_bank(1); } else { swap_bank(0); } - Boot2App(); + + BootFastJumpToAddress(_FirmwareMainBegin); +// Boot2App(); } diff --git a/CMakeLists.txt b/CMakeLists.txt index f56a7c1..38fba86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ SET(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/MODULES/CmakeConfig_GCC_CortexM7/gc ENABLE_LANGUAGE(ASM) CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0) -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2") -set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0") +set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0") IF (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) MESSAGE( diff --git a/modular.json b/modular.json index c7e6d79..cbc64bf 100644 --- a/modular.json +++ b/modular.json @@ -43,6 +43,11 @@ "repo": "InternalFlashPage_Flagchip_FC7240" }, + { + "type": "git", + "provider": "HVAC_M7", + "repo": "BootJump_Flagchip_FC7240" + }, {