Read about our upcoming Code of Conduct on this issue

Commit 093ce82c authored by alex@thinkpad's avatar alex@thinkpad
Browse files

Merged patchmgr into crop_rec_4k

(fixes "make zip" - https://www.magiclantern.fm/forum/index.php?topic=9741.msg203489#msg203489)

--HG--
branch : crop_rec_4k
......@@ -73,6 +73,7 @@ ML_OBJS-y = \
magiclantern.lds \
$(ML_ENTRY_OBJ) \
minimal.o \
cache.o \
font_direct.o \
$(PLATFORM_DIR)/stubs.o
......@@ -92,6 +93,7 @@ ML_INSTALLER_OBJS = \
bootflags.o \
mem.o \
util.o \
cache.o \
ML_OBJS-y += $(ML_INSTALLER_OBJS)
......@@ -210,6 +212,7 @@ ifndef ML_SRC_REBOOT_OBJ
ML_SRC_REBOOT_OBJ = reboot.o \
disp_direct.o font_direct.o \
strlen.o strcmp.o gcc-libgcc.a \
cache.o \
footer.o
endif
......
#include "compiler.h"
/* used only if patch manager is not included */
void __attribute__((weak)) sync_caches()
{
_sync_caches();
}
......@@ -238,7 +238,7 @@ cstart( void )
&blob_end
);
_sync_caches();
sync_caches();
#if defined(CONFIG_7D)
*(volatile int*)0xC0A00024 = 0x80000010; // send SSTAT for master processor, so it is in right state for rebooting
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment