narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed vestigal FILO code

pull/1/head
Marty Connor 2006-06-29 18:07:02 +00:00
parent 623f2e7b9d
commit e8cc1c4333
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Config
View File

@ -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'" \ # CFLAGS+= -DDHCP_USER_CLASS="5,'A','L','P','H','A',4,'B','E','T','A'" \
# -DDHCP_USER_CLASS_LEN=11 # -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 # Enabling this causes Etherboot to ignore Etherboot-specific options
# that are not within an Etherboot encapsulated options field. # that are not within an Etherboot encapsulated options field.
# This option should be enabled unless you have a legacy DHCP server # This option should be enabled unless you have a legacy DHCP server

24
src/core/btext.c
View File

@ -12,10 +12,6 @@
#include <gpxe/init.h> #include <gpxe/init.h>
#include <gpxe/pci.h> #include <gpxe/pci.h>
#ifdef CONFIG_FILO
#include <lib.h>
#endif
#undef __BIG_ENDIAN #undef __BIG_ENDIAN
#if 0 #if 0
#define __LITTLE_ENDIAN #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) static void btext_init(void)
{ {
#if 0 #if 0
@ -403,7 +392,6 @@ static void btext_init(void)
#else #else
uint32_t frame_buffer;// 0xfc000000 uint32_t frame_buffer;// 0xfc000000
#if USE_FILO_PCI_FIND==0
struct pci_device dev; struct pci_device dev;
#warning "pci_find_device_x no longer exists; use find_pci_device instead" #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 if(dev.vendor==0) return; // no fb
frame_buffer = (uint32_t)dev.membase; 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 #endif
btext_setup_display(640, 480, 8, 640,frame_buffer); btext_setup_display(640, 480, 8, 640,frame_buffer);

4
src/core/main.c
View File

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