aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-11-15 12:18:05 +0100
committerGerd Hoffmann <kraxel@redhat.com>2019-11-18 14:58:37 +0100
commit48f7843e3021162a66fed91ddc0809446a679be0 (patch)
tree9aaca780b81bee8c4737bf70b64195c707cc802d /src
parentb6f84715341c80665fa23d1fef4c95cb107b8a72 (diff)
downloadseabios-hppa-48f7843e3021162a66fed91ddc0809446a679be0.zip
seabios-hppa-48f7843e3021162a66fed91ddc0809446a679be0.tar.gz
seabios-hppa-48f7843e3021162a66fed91ddc0809446a679be0.tar.bz2
Revert "config: Add toggle for bootdevice information"
This reverts commit cb56f61c109985ad71078b1fb2e65bd4d6ed1a59.
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig7
-rw-r--r--src/boot.c9
2 files changed, 0 insertions, 16 deletions
diff --git a/src/Kconfig b/src/Kconfig
index b3645b3..55a87cb 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -72,13 +72,6 @@ endchoice
help
Support controlling of the boot order via the fw_cfg/CBFS
"bootorder" file.
- config BOOTDEVICES
- depends on BOOT
- bool "Boot device information"
- default y
- help
- Support boot device information via the fw_cfg/CBFS
- "bootdevices" file.
config COREBOOT_FLASH
depends on COREBOOT
diff --git a/src/boot.c b/src/boot.c
index e89b923..9248fab 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -95,9 +95,6 @@ static int BootDeviceCount;
static void
loadBootDevices(void)
{
- if (!CONFIG_BOOTDEVICES)
- return;
-
BootDeviceCount = 0;
int fsize;
char *f = romfile_loadfile("bootdevices", &fsize);
@@ -175,8 +172,6 @@ bootdevice_find(const char *glob)
static BootDevice *
bootdevice_find_pci_device(struct pci_device *pci)
{
- if (!CONFIG_BOOTDEVICES)
- return NULL;
// Find pci device - for example: /pci@i0cf8/ethernet@5
char desc[256];
build_pci_path(desc, sizeof(desc), "*", pci);
@@ -186,8 +181,6 @@ bootdevice_find_pci_device(struct pci_device *pci)
static BootDevice *
bootdevice_find_scsi_device(struct pci_device *pci, int target, int lun)
{
- if (!CONFIG_BOOTDEVICES)
- return NULL;
if (!pci)
// support only pci machine for now
return NULL;
@@ -201,8 +194,6 @@ bootdevice_find_scsi_device(struct pci_device *pci, int target, int lun)
static BootDevice *
bootdevice_find_ata_device(struct pci_device *pci, int chanid, int slave)
{
- if (!CONFIG_BOOTDEVICES)
- return NULL;
if (!pci)
// support only pci machine for now
return NULL;