Browse Source

Removed vestigal FILO code

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
e8cc1c4333
3 changed files with 0 additions and 35 deletions
  1. 0
    7
      src/Config
  2. 0
    24
      src/core/btext.c
  3. 0
    4
      src/core/main.c

+ 0
- 7
src/Config View File

@@ -283,13 +283,6 @@ CFLAGS+=	-DASK_BOOT=3 -DBOOT_FIRST=BOOT_NIC
283 283
 # CFLAGS+=	-DDHCP_USER_CLASS="5,'A','L','P','H','A',4,'B','E','T','A'" \
284 284
 #		-DDHCP_USER_CLASS_LEN=11
285 285
 
286
-# Set to enable FILO support
287
-# for FILO support it will make main call pci_init
288
-# INCLUDE_FILO=y
289
-ifdef	INCLUDE_FILO
290
-CFLAGS+=	-DCONFIG_FILO
291
-endif
292
-
293 286
 # Enabling this causes Etherboot to ignore Etherboot-specific options
294 287
 # that are not within an Etherboot encapsulated options field.
295 288
 # This option should be enabled unless you have a legacy DHCP server

+ 0
- 24
src/core/btext.c View File

@@ -12,10 +12,6 @@
12 12
 #include <gpxe/init.h>
13 13
 #include <gpxe/pci.h>
14 14
 
15
-#ifdef CONFIG_FILO
16
-#include <lib.h>
17
-#endif
18
-
19 15
 #undef __BIG_ENDIAN
20 16
 #if 0
21 17
 #define __LITTLE_ENDIAN 
@@ -388,13 +384,6 @@ draw_byte_8(const unsigned char *font, u32 *base, u32 rb)
388 384
 	}
389 385
 }
390 386
 
391
-#ifdef CONFIG_FILO
392
-#define USE_FILO_PCI_FIND 1
393
-#else
394
-#define USE_FILO_PCI_FIND 0
395
-#endif
396
-
397
-
398 387
 static void btext_init(void)
399 388
 {
400 389
 #if 0
@@ -403,7 +392,6 @@ static void btext_init(void)
403 392
 #else
404 393
     uint32_t frame_buffer;//  0xfc000000
405 394
 
406
-#if USE_FILO_PCI_FIND==0
407 395
     struct pci_device dev;
408 396
 
409 397
     #warning "pci_find_device_x no longer exists; use find_pci_device instead"
@@ -411,18 +399,6 @@ static void btext_init(void)
411 399
     if(dev.vendor==0) return; // no fb
412 400
 
413 401
     frame_buffer = (uint32_t)dev.membase;
414
-#else
415
-    struct pci_device *dev = 0;
416
-
417
-    pci_init();
418
-    dev = pci_find_device(0x1002, 0x4752, -1, -1, 0);
419
-    if(!dev) {
420
-	 return; // no fb
421
-    }
422
-        
423
-    pci_read_config_dword(dev, 0x10, &frame_buffer);
424
-#endif
425
-    
426 402
 #endif
427 403
 
428 404
 	btext_setup_display(640, 480, 8, 640,frame_buffer);

+ 0
- 4
src/core/main.c View File

@@ -31,10 +31,6 @@ Literature dealing with the network protocols:
31 31
 #include <gpxe/heap.h>
32 32
 #include <gpxe/netdevice.h>
33 33
 
34
-#ifdef CONFIG_FILO
35
-#include <lib.h>
36
-#endif
37
-
38 34
 /* Linker symbols */
39 35
 extern char _bss[], _ebss[];
40 36
 

Loading…
Cancel
Save