Workaround to make the bl work again (some memory problems, just incr…

…eased optimization level)
toniebox-reverse-engineering · Feb 27, 2021 · d389c77 · d389c77
1 parent 7decc25
commit d389c77
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/common/buildAndShip.bootloader.sh b/common/buildAndShip.bootloader.sh
@@ -12,7 +12,8 @@ source ${ROOT}/common/make/armGccPath
 export PATH="${ARMGCC_BIN}:$PATH"
 
 if [ "$1" == "debug" ]; then
-    DEBUG_APPENDIX=Debug
+    DEBUG_APPENDIX_RELOC=Debug
+    DEBUG_APPENDIX=Log
     DEBUG_APPENDIX_ZIP=_debug
     DEBUG_PATH_APPENDIX=debug/
 else
@@ -64,7 +65,7 @@ if [ -d "$RELOC_DIR" ] && [ -d "$BOOTMGR_DIR" ]; then
     echo 
     echo Build relocator
     cd ${RELOC_DIR}
-    make -f Makefile${DEBUG_APPENDIX} clean all
+    make -f Makefile${DEBUG_APPENDIX_RELOC} clean all
 
     echo 
     echo Build Preloader

diff --git a/sd-bootloader-ng/bootmanager/MakefileDebug b/sd-bootloader-ng/bootmanager/MakefileDebug
@@ -1,8 +1,2 @@
 OPT_LEVEL=g
-LINK_FILE=bootmgr.debug.ld
-
-RELOC_ADDR=0x20034000
-OBJSUB=debug/bootloader
-BINSUB=debug/bootloader
-
-include MakefileBase
+include MakefileLog
diff --git a/sd-bootloader-ng/bootmanager/MakefileDebugPreloader b/sd-bootloader-ng/bootmanager/MakefileDebugPreloader
@@ -1,9 +1,2 @@
 OPT_LEVEL=g
-ADDITIONAL_CFLAGS=-DFIXED_BOOT_IMAGE
-LINK_FILE=bootmgr.debug.ld
-
-RELOC_ADDR=0x20034000
-OBJSUB=debug/preloader
-BINSUB=debug/preloader
-
-include MakefileBase
+include MakefileLogPreloader
diff --git a/sd-bootloader-ng/bootmanager/MakefileLog b/sd-bootloader-ng/bootmanager/MakefileLog
@@ -0,0 +1,7 @@
+LINK_FILE=bootmgr.debug.ld
+
+RELOC_ADDR=0x20034000
+OBJSUB=debug/bootloader
+BINSUB=debug/bootloader
+
+include MakefileBase
diff --git a/sd-bootloader-ng/bootmanager/MakefileLogPreloader b/sd-bootloader-ng/bootmanager/MakefileLogPreloader
@@ -0,0 +1,8 @@
+ADDITIONAL_CFLAGS=-DFIXED_BOOT_IMAGE
+LINK_FILE=bootmgr.debug.ld
+
+RELOC_ADDR=0x20034000
+OBJSUB=debug/preloader
+BINSUB=debug/preloader
+
+include MakefileBase