ramdisk: Allow ramdisk support (CONFIG_FLASH_FLOPPY) under QEMU

Don't require coreboot to use CONFIG_FLASH_FLOPPY - with the latest
QEMU, it's possible to place a floppy image into fw_cfg using the qemu
command line (eg, "-fw_cfg name=floppyimg/MyFloppy,file=file.img").

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

diff --git a/src/Kconfig b/src/Kconfig
index b14e5543c2c3c9f1d4f5bf37af9772a4f147b07e..d70624e441cbc231c377ac038565e651670f0d3f 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -96,12 +96,6 @@ endchoice
             the CBFS filesystem is at a non-standard location (eg,
             0xffe00000 if CBFS ends 2Meg below the end of flash).
 
-    config FLASH_FLOPPY
-        depends on COREBOOT_FLASH
-        bool "Floppy images in CBFS"
-        default y
-        help
-            Support floppy images in coreboot flash.
     config MULTIBOOT
         depends on COREBOOT
         bool "multiboot support"
@@ -220,6 +214,13 @@ menu "Hardware support"
         default y
         help
             Support floppy drive access.
+    config FLASH_FLOPPY
+        depends on DRIVES
+        bool "Floppy images from CBFS or fw_cfg"
+        default y
+        help
+            Support floppy images stored in coreboot flash or from
+            QEMU fw_cfg.
 
     config PS2PORT
         depends on KEYBOARD || MOUSE

diff --git a/src/hw/ramdisk.c b/src/hw/ramdisk.c
index e847824c78281709359b96d0112df16711ae842c..4cdf95f9e541a7ce4cb2c3f50d2408e8dc72feb3 100644 (file)
--- a/src/hw/ramdisk.c
+++ b/src/hw/ramdisk.c
@@ -53,7 +53,7 @@ ramdisk_setup(void)
     if (!drive)
         return;
     drive->type = DTYPE_RAMDISK;
-    dprintf(1, "Mapping CBFS floppy %s to addr %p\n", filename, pos);
+    dprintf(1, "Mapping floppy %s to addr %p\n", filename, pos);
     char *desc = znprintf(MAXDESCSIZE, "Ramdisk [%s]", &filename[10]);
     boot_add_floppy(drive, desc, bootprio_find_named_rom(filename, 0));
 }