Revert "config: Add toggle for bootdevice information"

This reverts commit cb56f61c109985ad71078b1fb2e65bd4d6ed1a59.

diff --git a/src/Kconfig b/src/Kconfig
index b3645b33e18dfe939b822920ef211af73b89ef52..55a87cb7f0ac96190f405f7bff414e7458b8627a 100644 (file)
--- 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 e89b9238c17636824b6d073d8b0d4012a7232602..9248fab95a465a4dc37e02d3dd5f9bbf1702148f 100644 (file)
--- 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;