removes the %if IS_ISOLINUX stuff in the layout.inc

removes the %if IS_ISOLINUX stuff in the layout.inc to make the fs.c can find
the core_cache_buf symbol from ISOLINUX.

diff --git a/core/fs.c b/core/fs.c
index 375beec..9dac9e9 100644 (file)
--- a/core/fs.c
+++ b/core/fs.c
@@ -120,8 +120,8 @@ void device_init(struct device *dev, uint8_t device_num,
  
            static __lowmem char cache_buf[65536];
         */
-        //dev->cache_data = core_cache_buf;
-        //dev->cache_size = sizeof core_cache_buf;
+        dev->cache_data = core_cache_buf;
+        dev->cache_size = sizeof core_cache_buf;
     } else 
         dev->cache_data = NULL;
 }

diff --git a/core/layout.inc b/core/layout.inc
index 3f5a745..3df0772 100644 (file)
--- a/core/layout.inc
+++ b/core/layout.inc
@@ -125,16 +125,11 @@ auxseg            resb aux_size
 ; is somewhat excessive.  Sector alignment is obligatory, however.
 ;
 
-%if IS_ISOLINUX
-; ISOLINUX doesn't have a block cache yet
-real_mode_seg  equ 4000h
-%else
                global cache_seg, core_cache_buf
 cache_seg      equ 4000h               ; 64K area for metadata cache
 core_cache_buf equ cache_seg << 4
 real_mode_seg  equ 5000h
 
 pktbuf_seg     equ cache_seg           ; PXELINUX packet buffers
-%endif
 
 comboot_seg    equ real_mode_seg       ; COMBOOT image loading zone