KernelLand - Fixing issues compiling ARMv7

diff --git a/KernelLand/Kernel/Makefile b/KernelLand/Kernel/Makefile
index e391f03..aecab40 100644 (file)
--- a/KernelLand/Kernel/Makefile
+++ b/KernelLand/Kernel/Makefile
@@ -106,7 +106,7 @@ $(BIN): $(OBJ) $(MODS) arch/$(ARCHDIR)/link.ld Makefile ../../BuildConf/$(ARCH)/
        @echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum.$(ARCH)
        $(POSTBUILD)
        @cp $(BIN) $(BIN)_
-       @$(STRIP) $(BIN)_
+       @-$(STRIP) $(BIN)_
        @gzip -c $(BIN)_ > $(GZBIN)
        @$(RM) $(BIN)_
 

diff --git a/KernelLand/Modules/Display/VIAVideo/main.c b/KernelLand/Modules/Display/VIAVideo/main.c
index 1291113..30844eb 100644 (file)
--- a/KernelLand/Modules/Display/VIAVideo/main.c
+++ b/KernelLand/Modules/Display/VIAVideo/main.c
@@ -24,8 +24,8 @@ const struct sVGA_Timings
         int    HFP, HSync, HDisplay, HBP;
         int    VFP, VSync, VDisplay, VBP;
 } csaTimings[] = {
-       {40, 128, 800, 88,    1, 4, 600, 23},   // SVGA @ 60Hz
-       {24, 136, 1024, 160,  3, 6, 768, 29},   // XGA @ 60Hz
+       {40, 128,  800,  88,  1, 4,  600, 23},  // SVGA @ 60Hz
+       {24, 136, 1024, 160,  3, 6,  768, 29},  // XGA @ 60Hz
        {38, 112, 1280, 248,  1, 3, 1024, 38}   // 1280x1024 @ 60Hz
 };
 const Uint16   caVIAVideo_CardIDs[][2] = {

diff --git a/KernelLand/Modules/Filesystems/RAMDisk/ramdisk.c b/KernelLand/Modules/Filesystems/RAMDisk/ramdisk.c
index adfc38a..defa50b 100644 (file)
--- a/KernelLand/Modules/Filesystems/RAMDisk/ramdisk.c
+++ b/KernelLand/Modules/Filesystems/RAMDisk/ramdisk.c
@@ -16,7 +16,7 @@
 
 // === PROTOTYPES ===
  int   RAMFS_Install(char **Arguments);
-void   RAMFS_Cleanup(void);
+ int   RAMFS_Cleanup(void);
 // --- Mount/Unmount ---
 tVFS_Node      *RAMFS_InitDevice(const char *Device, const char **Options);
 void   RAMFS_Unmount(tVFS_Node *Node);
@@ -65,9 +65,9 @@ int RAMFS_Install(char **Arguments)
        return 0;
 }
 
-void RAMFS_Cleanup(void)
+int RAMFS_Cleanup(void)
 {
-       
+       return 0;
 }
 
 

diff --git a/KernelLand/Modules/IPStack/adapters.c b/KernelLand/Modules/IPStack/adapters.c
index 90c0b24..58e503c 100644 (file)
--- a/KernelLand/Modules/IPStack/adapters.c
+++ b/KernelLand/Modules/IPStack/adapters.c
@@ -344,7 +344,7 @@ void IPStack_SendDebugText(const char *Text)
        if( CPU_HAS_LOCK(&lLock) )
                return ;        // Nested!
        SHORTLOCK(&lLock);
-       __asm__ __volatile__ ("sti");   // Start interrupts (x86 specific)
+//     __asm__ __volatile__ ("sti");   // Start interrupts (x86 specific)
 
        // Cache packets until a newline
        static char     cache[1500 - (sizeof(pkt_hdr) + 4)];