Fix support for small pseudo-kernels.

diff --git a/isolinux.asm b/isolinux.asm
index 1c165bc..0400ca8 100644 (file)
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -1789,7 +1789,6 @@ kernel_sane:      push ax
                xor bx,bx
                 pop si                          ; Cluster pointer on stack
                call getfssec
-               jc near kernel_corrupt          ; Failure in first 32K
                 cmp word [es:bs_bootsign],0AA55h
                jne near kernel_corrupt         ; Boot sec signature missing
 ;

diff --git a/ldlinux.asm b/ldlinux.asm
index eabc312..20584cf 100644 (file)
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -1837,7 +1837,6 @@ kernel_sane:      push ax
                xor bx,bx
                 pop si                          ; Cluster pointer on stack
                call getfssec
-               jc near kernel_corrupt          ; Failure in first 32K
                 cmp word [es:bs_bootsign],0AA55h
                jne near kernel_corrupt         ; Boot sec signature missing
 ;

diff --git a/memdisk/Makefile b/memdisk/Makefile
index f535866..2516478 100644 (file)
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -22,7 +22,7 @@ OBJCOPY = objcopy
 PERL    = perl
 
 # Important: init.o16 must be first!!
-OBJS    = init.o16 setup.o16 msetup.o16 e820func.o16 memdisk.o
+OBJS    = init.o16 setup.o16 msetup.o16 e820func.o16 conio.o16 memdisk.o
 
 all: memdisk e820test
 

diff --git a/memdisk/setup.c b/memdisk/setup.c
index d40f21b..cbd3699 100644 (file)
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -13,6 +13,7 @@
 
 #include <stdint.h>
 #include "e820.h"
+#include "conio.h"
 
 extern const char _binary_memdisk_bin_start[], _binary_memdisk_bin_end[];
 extern const char _binary_memdisk_bin_size[]; /* Weird, I know */
@@ -188,6 +189,11 @@ uint32_t setup(void)
   uint16_t exitcode;
   const struct geometry *geometry;
 
+  /* Show signs of life */
+  puts("Memdisk: hello, world!\n");
+
+  for(;;);
+
   /* Point %fs to the zero page */
   asm volatile("movw %0,%%fs" :: "r" (0));
 

diff --git a/pxelinux.asm b/pxelinux.asm
index 3dfdfa4..e979b1c 100644 (file)
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -1586,7 +1586,6 @@ kernel_sane:      push ax
                xor bx,bx
                 pop si                          ; Cluster pointer on stack
                call getfssec
-               jc near kernel_corrupt          ; Failure in first 32K
                 cmp word [es:bs_bootsign],0AA55h
                jne near kernel_corrupt         ; Boot sec signature missing
 ;