summaryrefslogtreecommitdiff
path: root/include/bios_emul.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-08-02 03:54:33 +0300
committerTom Rini <trini@konsulko.com>2021-08-06 02:46:35 +0300
commit199056d1a1b8301b493adf469859fe38d9a77170 (patch)
tree87a505a06275b74d031d6d402a32b531c18f31ce /include/bios_emul.h
parenteb4b7fa0ae50187e63e2f712409ebb63e1b77119 (diff)
downloadu-boot-199056d1a1b8301b493adf469859fe38d9a77170.tar.xz
pci: Drop DM_PCI check from bios_emul
We don't need these checks anymore since when PCI is enabled, driver model is always used. Drop them. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/bios_emul.h')
-rw-r--r--include/bios_emul.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/bios_emul.h b/include/bios_emul.h
index 158e0f223d..72410dc794 100644
--- a/include/bios_emul.h
+++ b/include/bios_emul.h
@@ -30,11 +30,7 @@ typedef struct {
int bus;
u32 VendorID;
u32 DeviceID;
-#ifdef CONFIG_DM_PCI
struct udevice *pcidev;
-#else
- pci_dev_t pcidev;
-#endif
void *BIOSImage;
u32 BIOSImageLen;
u8 LowMem[1536];
@@ -42,12 +38,8 @@ typedef struct {
struct vbe_mode_info;
-#ifdef CONFIG_DM_PCI
int BootVideoCardBIOS(struct udevice *pcidev, BE_VGAInfo **pVGAInfo,
int clean_up);
-#else
-int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo **pVGAInfo, int clean_up);
-#endif
/* Run a BIOS ROM natively (only supported on x86 machines) */
void bios_run_on_x86(struct udevice *dev, unsigned long addr, int vesa_mode,
@@ -65,18 +57,10 @@ void bios_set_interrupt_handler(int intnum, int (*int_handler_func)(void));
void biosemu_set_interrupt_handler(int intnum, int (*int_func)(void));
-#ifdef CONFIG_DM_PCI
int biosemu_setup(struct udevice *pcidev, BE_VGAInfo **pVGAInfo);
int biosemu_run(struct udevice *dev, uchar *bios_rom, int bios_len,
BE_VGAInfo *vga_info, int clean_up, int vesa_mode,
struct vbe_mode_info *mode_info);
-#else
-int biosemu_setup(pci_dev_t pcidev, BE_VGAInfo **pVGAInfo);
-
-int biosemu_run(pci_dev_t pcidev, uchar *bios_rom, int bios_len,
- BE_VGAInfo *vga_info, int clean_up, int vesa_mode,
- struct vbe_mode_info *mode_info);
-#endif
#endif