sdcard: Allow the sdcard driver to run on real hardware

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/Kconfig b/src/Kconfig
index d70624e441cbc231c377ac038565e651670f0d3f..62562420202e1dfe5e79fc9ab32645adc891179d 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -161,7 +161,7 @@ menu "Hardware support"
         help
             Support for AHCI disk code.
     config SDCARD
-        depends on DRIVES && QEMU_HARDWARE
+        depends on DRIVES
         bool "SD controllers"
         default y
         help

diff --git a/src/hw/sdcard.c b/src/hw/sdcard.c
index 68888bfa59ebefc140e5a42a350acbb49551a9ee..540e97c106f297d7659e20f4004521d1b0d99b3c 100644 (file)
--- a/src/hw/sdcard.c
+++ b/src/hw/sdcard.c
@@ -5,7 +5,6 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "block.h" // struct drive_s
-#include "fw/paravirt.h" // runningOnQEMU
 #include "malloc.h" // malloc_fseg
 #include "output.h" // znprintf
 #include "pci.h" // pci_config_readl
@@ -297,8 +296,6 @@ sdcard_process_op(struct disk_op_s *op)
 static int
 sdcard_card_setup(struct sdhci_s *regs, int volt)
 {
-    // XXX - works on QEMU; probably wont on real hardware!
-
     // Reset card
     u32 param[4] = { };
     int ret = sdcard_pio(regs, SC_GO_IDLE_STATE, param);
@@ -429,9 +426,6 @@ sdcard_controller_setup(void *data)
                      PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
 
     // Initialize controller
-    if (!runningOnQEMU())
-        // XXX - this init logic will probably only work on qemu!
-        return;
     u32 present_state = readl(&regs->present_state);
     if (!(present_state & SP_CARD_INSERTED))
         // No card present