renamed floppy image to floppy??.img to make 86box happy

played with some real Cirrus, seems we are not able to make it work

4 files changed, 24 insertions, 9 deletions

diff --git a/README b/README
index a57ce7a..cf6d120 100644
--- a/README
+++ b/README
@@ -310,6 +310,21 @@ TODO: looks optional for a simple running system
 - CONFIG_FB_GEODE_LX=y
   => for the Alix 1.E
 
+TODO: needed? and for which cards?
+- CONFIG_FB_SIMPLE=y
+
+- CONFIG_FB_DEVICE=y
+  => to get a /dev/fb*
+  => TODO: check if XF86fbdev need that
+
+TODO: which one of the hardware acceleration options are needed for
+which cards and have performace benefits (Cirrus for instance should
+have BtBlt functions)
+- CONFIG_FB_TILEBLITTING=y
+
+TODO: what happens when we have multiple framebuffer drivers, which one
+takes precedence (for instance SVGA over VGA16 over CIRRUS?).
+  
 - CONFIG_MOUSE_PS2=m
 - CONFIG_INPUT_MOUSEDEV=m
   CONFIG_INPUT_MOUSEDEV_PSAUX=y
@@ -540,6 +555,8 @@ Call Trace:
  <SOFTIRQ>                                                                                               
 - also real hardware (Unisys): no graphic VESA, only text-VESA modes, missing
   => cirrus framebuffer drivers at boot time (cannot be a module)?
+  => same behaviour with cirrus in qemu and 86box, enabling a PCI bus suddently
+     gives us cirrusfb messages and a working /dev/fb* (not more modes though)
 - ${BASE} and @@BASE@@ with sed are both used to pass the build pathes to
   builds in patches. ${BASE} sounds like it is working more by accident..
 - 'cd DIR' used everywhere without 'cd DIR || exit 1'
diff --git a/configs/linux-config b/configs/linux-config
index 1b9d215..eb30906 100644
--- a/configs/linux-config
+++ b/configs/linux-config
@@ -286,7 +286,6 @@ CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_CPU_SUP_VORTEX_32=y
 # CONFIG_HPET_TIMER is not set
 # CONFIG_DMI is not set
-CONFIG_BOOT_VESA_SUPPORT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=1
 CONFIG_NR_CPUS_RANGE_END=1
 CONFIG_NR_CPUS_DEFAULT=1
@@ -895,7 +894,6 @@ CONFIG_GENERIC_CPU_VULNERABILITIES=y
 # CONFIG_EDD is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_FW_CFG_SYSFS is not set
-CONFIG_SYSFB=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
@@ -1577,8 +1575,8 @@ CONFIG_FB_CIRRUS=y
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=y
-CONFIG_FB_VESA=y
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VESA is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -1608,7 +1606,7 @@ CONFIG_FB_VESA=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
-CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
 CONFIG_FB_CORE=y
 CONFIG_FB_NOTIFY=y
@@ -1618,7 +1616,6 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_IOMEM_HELPERS=y
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # end of Frame buffer Devices
@@ -1630,8 +1627,6 @@ CONFIG_FB_IOMEM_HELPERS=y
 # CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 # end of Backlight & LCD device support
 
-CONFIG_VGASTATE=y
-
 #
 # Console display driver support
 #
diff --git a/scripts/build.sh b/scripts/build.sh
index a026bd7..058b0ba 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -773,6 +773,9 @@ if [ ! -f "${BASE}/floppy.img" ]; then
 		cat "${LASTFILE}" PAD > "${LASTFILE}-padded"
 		mv "${LASTFILE}-padded" "${LASTFILE}"
 	fi
+	for floppy in `ls floppy??`; do
+		mv "${floppy}" "${floppy}.img"
+	done
 fi
 
 trap - 0
diff --git a/scripts/run_qemu.sh b/scripts/run_qemu.sh
index ad5fe1b..0747c46 100755
--- a/scripts/run_qemu.sh
+++ b/scripts/run_qemu.sh
@@ -3,7 +3,7 @@
 qemu-nbd -f raw root.img -x ROOT &
 sleep 2 && \
 qemu-system-i386 -cpu 486 -m 24M -machine isapc \
-	-drive "file=floppy00,if=floppy,format=raw" \
+	-drive "file=floppy00.img,if=floppy,format=raw" \
 	-netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16,hostfwd=tcp::2222-:22,hostfwd=tcp::6001-:6000 \
 	-vga std \
 	-device ne2k_isa,iobase=0x300,irq=10,netdev=net0