diff options
| author | Marty Connor | 2006-06-29 20:07:02 +0200 |
|---|---|---|
| committer | Marty Connor | 2006-06-29 20:07:02 +0200 |
| commit | e8cc1c433323d20b4a187a4fc91ade99d1ccd09f (patch) | |
| tree | 5e57f689892a677c462e2172164ede080bad8eb8 /src | |
| parent | Added bin/.blib.list to VERYCLEANUP so .bin directory is made empty (diff) | |
| download | ipxe-e8cc1c433323d20b4a187a4fc91ade99d1ccd09f.tar.gz ipxe-e8cc1c433323d20b4a187a4fc91ade99d1ccd09f.tar.xz ipxe-e8cc1c433323d20b4a187a4fc91ade99d1ccd09f.zip | |
Removed vestigal FILO code
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config | 7 | ||||
| -rw-r--r-- | src/core/btext.c | 24 | ||||
| -rw-r--r-- | src/core/main.c | 4 |
3 files changed, 0 insertions, 35 deletions
diff --git a/src/Config b/src/Config index 2f3dea846..aa11dd3c4 100644 --- a/src/Config +++ b/src/Config @@ -283,13 +283,6 @@ CFLAGS+= -DASK_BOOT=3 -DBOOT_FIRST=BOOT_NIC # CFLAGS+= -DDHCP_USER_CLASS="5,'A','L','P','H','A',4,'B','E','T','A'" \ # -DDHCP_USER_CLASS_LEN=11 -# Set to enable FILO support -# for FILO support it will make main call pci_init -# INCLUDE_FILO=y -ifdef INCLUDE_FILO -CFLAGS+= -DCONFIG_FILO -endif - # Enabling this causes Etherboot to ignore Etherboot-specific options # that are not within an Etherboot encapsulated options field. # This option should be enabled unless you have a legacy DHCP server diff --git a/src/core/btext.c b/src/core/btext.c index 1ab5405de..409c429e7 100644 --- a/src/core/btext.c +++ b/src/core/btext.c @@ -12,10 +12,6 @@ #include <gpxe/init.h> #include <gpxe/pci.h> -#ifdef CONFIG_FILO -#include <lib.h> -#endif - #undef __BIG_ENDIAN #if 0 #define __LITTLE_ENDIAN @@ -388,13 +384,6 @@ draw_byte_8(const unsigned char *font, u32 *base, u32 rb) } } -#ifdef CONFIG_FILO -#define USE_FILO_PCI_FIND 1 -#else -#define USE_FILO_PCI_FIND 0 -#endif - - static void btext_init(void) { #if 0 @@ -403,7 +392,6 @@ static void btext_init(void) #else uint32_t frame_buffer;// 0xfc000000 -#if USE_FILO_PCI_FIND==0 struct pci_device dev; #warning "pci_find_device_x no longer exists; use find_pci_device instead" @@ -411,18 +399,6 @@ static void btext_init(void) if(dev.vendor==0) return; // no fb frame_buffer = (uint32_t)dev.membase; -#else - struct pci_device *dev = 0; - - pci_init(); - dev = pci_find_device(0x1002, 0x4752, -1, -1, 0); - if(!dev) { - return; // no fb - } - - pci_read_config_dword(dev, 0x10, &frame_buffer); -#endif - #endif btext_setup_display(640, 480, 8, 640,frame_buffer); diff --git a/src/core/main.c b/src/core/main.c index e2b6ae82a..2f76cc27d 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -31,10 +31,6 @@ Literature dealing with the network protocols: #include <gpxe/heap.h> #include <gpxe/netdevice.h> -#ifdef CONFIG_FILO -#include <lib.h> -#endif - /* Linker symbols */ extern char _bss[], _ebss[]; |