Fix boot crash with zRAM size too large ( 300KB -> 292KB )

ExistOS-Team · Jan 3, 2023 · 7836e10 · 7836e10
1 parent c677552
commit 7836e10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/OSLoader/Config/SystemConfig.h b/OSLoader/Config/SystemConfig.h
@@ -39,7 +39,7 @@
     #define MEM_COMPRESSION_ALGORITHM     (MINILZO) //algorithm
 #endif
 
-#define TOTAL_MEM_PAGE  (300)
+#define TOTAL_MEM_PAGE  (292)
 
 #if VMRAM_USE_FTL
     #if USE_TINY_PAGE
@@ -49,7 +49,7 @@
                     #define NUM_CACHEPAGE_VROM             ( 160 )  
                     #define NUM_CACHEPAGE_VRAM             ( 40 ) 
                     #define ZRAM_SIZE                      ( (TOTAL_MEM_PAGE - NUM_CACHEPAGE_VROM - NUM_CACHEPAGE_VRAM) * 1024 ) 
-                    #define ZRAM_COMPRESSED_SIZE           ( ZRAM_SIZE * 3 ) // (Assume that the compression ratio is 0.33)
+                    #define ZRAM_COMPRESSED_SIZE           (int)( ZRAM_SIZE * 3 ) // (Assume that the compression ratio is 0.33)
                 #else 
                     #define NUM_CACHEPAGE_VROM             ( 64 )  
                     #define NUM_CACHEPAGE_VRAM             ( 64 ) 

diff --git a/System/main.c b/System/main.c
@@ -153,8 +153,6 @@ uint32_t __attribute__((naked)) getCurStackAdr() {
 }
 extern uint32_t SYSTEM_STACK; // in ld script
 void main() {
-    enableMemSwap(true);
-
     void IRQ_ISR();
     void SWI_ISR();
     ll_set_irq_stack((uint32_t)&SYSTEM_STACK);