# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1526658176 -7200
# Node ID 814f74f7f7cb1f52ab4446834fea1feeff342bf4
# Parent  eb63a4d93293eda22cb996cb85e0e2c6539984e1
Introduced common .io files for most examples.

diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-common.io
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/landfall-examples/mips-letux400-common.io	Fri May 18 17:42:56 2018 +0200
@@ -0,0 +1,26 @@
+-- vim: ft=lua ts=2 et sw=2
+
+-- Configuration file for Io.
+
+local hw = Io.system_bus()
+
+Io.add_vbus("cpm", Io.Vi.System_bus
+{
+  CPM = wrap(hw:match("jz4730-cpm"));
+})
+
+Io.add_vbus("gpio", Io.Vi.System_bus
+{
+  GPIO = wrap(hw:match("jz4730-gpio"));
+})
+
+Io.add_vbus("lcd", Io.Vi.System_bus
+{
+  LCD = wrap(hw:match("jz4740-lcd"));
+})
+
+Io.add_vbus("pwm", Io.Vi.System_bus
+{
+  GPIO = wrap(hw:match("jz4730-gpio"));
+  PWM = wrap(hw:match("jz4730-pwm"));
+})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-fbdrv.cfg
--- a/conf/landfall-examples/mips-letux400-fbdrv.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-fbdrv.cfg	Fri May 18 17:42:56 2018 +0200
@@ -27,7 +27,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-fbdrv.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-fbdrv.io
--- a/conf/landfall-examples/mips-letux400-fbdrv.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-fbdrv.list
--- a/conf/landfall-examples/mips-letux400-fbdrv.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-fbdrv.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-fbdrv.cfg
 module mips-letux400-fbdrv.cfg
-module mips-letux400-fbdrv.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-input-event-client.cfg
--- a/conf/landfall-examples/mips-letux400-input-event-client.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-input-event-client.cfg	Fri May 18 17:42:56 2018 +0200
@@ -28,7 +28,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-input-event-client.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-input-event-client.io
--- a/conf/landfall-examples/mips-letux400-input-event-client.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-input-event-client.list
--- a/conf/landfall-examples/mips-letux400-input-event-client.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-input-event-client.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-input-event-client.cfg
 module mips-letux400-input-event-client.cfg
-module mips-letux400-input-event-client.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-demo.cfg
--- a/conf/landfall-examples/mips-letux400-keypad-demo.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad-demo.cfg	Fri May 18 17:42:56 2018 +0200
@@ -28,7 +28,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-keypad-demo.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-demo.io
--- a/conf/landfall-examples/mips-letux400-keypad-demo.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-demo.list
--- a/conf/landfall-examples/mips-letux400-keypad-demo.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad-demo.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-keypad-demo.cfg
 module mips-letux400-keypad-demo.cfg
-module mips-letux400-keypad-demo.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-ds.cfg
--- a/conf/landfall-examples/mips-letux400-keypad-ds.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad-ds.cfg	Fri May 18 17:42:56 2018 +0200
@@ -29,7 +29,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-keypad-ds.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-ds.io
--- a/conf/landfall-examples/mips-letux400-keypad-ds.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad-ds.list
--- a/conf/landfall-examples/mips-letux400-keypad-ds.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad-ds.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-keypad-ds.cfg
 module mips-letux400-keypad-ds.cfg
-module mips-letux400-keypad-ds.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad.cfg
--- a/conf/landfall-examples/mips-letux400-keypad.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad.cfg	Fri May 18 17:42:56 2018 +0200
@@ -28,7 +28,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-keypad.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad.io
--- a/conf/landfall-examples/mips-letux400-keypad.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-keypad.list
--- a/conf/landfall-examples/mips-letux400-keypad.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-keypad.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-keypad.cfg
 module mips-letux400-keypad.cfg
-module mips-letux400-keypad.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-lcd-driver.cfg
--- a/conf/landfall-examples/mips-letux400-lcd-driver.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-lcd-driver.cfg	Fri May 18 17:42:56 2018 +0200
@@ -26,7 +26,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-lcd-driver.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-lcd-driver.io
--- a/conf/landfall-examples/mips-letux400-lcd-driver.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-lcd-driver.list
--- a/conf/landfall-examples/mips-letux400-lcd-driver.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-lcd-driver.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-lcd-driver.cfg
 module mips-letux400-lcd-driver.cfg
-module mips-letux400-lcd-driver.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-spectrum.cfg
--- a/conf/landfall-examples/mips-letux400-spectrum.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-spectrum.cfg	Fri May 18 17:42:56 2018 +0200
@@ -28,7 +28,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-letux400-spectrum.io");
+  "rom/io rom/hw_devices.io rom/mips-letux400-common.io");
 
 -- Expose a PWM peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-spectrum.io
--- a/conf/landfall-examples/mips-letux400-spectrum.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4730-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
-
-Io.add_vbus("pwm", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4730-gpio"));
-  PWM = wrap(hw:match("jz4730-pwm"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-letux400-spectrum.list
--- a/conf/landfall-examples/mips-letux400-spectrum.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-letux400-spectrum.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-letux400-spectrum.cfg
 module mips-letux400-spectrum.cfg
-module mips-letux400-spectrum.io
+module mips-letux400-common.io
 module plat-letux400/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-common.io
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/landfall-examples/mips-qi_lb60-common.io	Fri May 18 17:42:56 2018 +0200
@@ -0,0 +1,20 @@
+-- vim: ft=lua ts=2 et sw=2
+  
+-- Configuration file for Io.
+
+local hw = Io.system_bus()
+
+Io.add_vbus("cpm", Io.Vi.System_bus
+{
+  CPM = wrap(hw:match("jz4740-cpm"));
+})
+
+Io.add_vbus("gpio", Io.Vi.System_bus
+{
+  GPIO = wrap(hw:match("jz4740-gpio"));
+})
+
+Io.add_vbus("lcd", Io.Vi.System_bus
+{
+  LCD = wrap(hw:match("jz4740-lcd"));
+})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-fbdrv.cfg
--- a/conf/landfall-examples/mips-qi_lb60-fbdrv.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-fbdrv.cfg	Fri May 18 17:42:56 2018 +0200
@@ -25,7 +25,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-fbdrv.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-fbdrv.io
--- a/conf/landfall-examples/mips-qi_lb60-fbdrv.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-fbdrv.list
--- a/conf/landfall-examples/mips-qi_lb60-fbdrv.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-fbdrv.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-fbdrv.cfg
 module mips-qi_lb60-fbdrv.cfg
-module mips-qi_lb60-fbdrv.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-input-event-client.cfg
--- a/conf/landfall-examples/mips-qi_lb60-input-event-client.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-input-event-client.cfg	Fri May 18 17:42:56 2018 +0200
@@ -26,7 +26,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-input-event-client.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-input-event-client.io
--- a/conf/landfall-examples/mips-qi_lb60-input-event-client.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-input-event-client.list
--- a/conf/landfall-examples/mips-qi_lb60-input-event-client.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-input-event-client.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-input-event-client.cfg
 module mips-qi_lb60-input-event-client.cfg
-module mips-qi_lb60-input-event-client.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-demo.cfg
--- a/conf/landfall-examples/mips-qi_lb60-keypad-demo.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad-demo.cfg	Fri May 18 17:42:56 2018 +0200
@@ -26,7 +26,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-keypad-demo.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-demo.io
--- a/conf/landfall-examples/mips-qi_lb60-keypad-demo.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-demo.list
--- a/conf/landfall-examples/mips-qi_lb60-keypad-demo.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad-demo.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-keypad-demo.cfg
 module mips-qi_lb60-keypad-demo.cfg
-module mips-qi_lb60-keypad-demo.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-ds.cfg
--- a/conf/landfall-examples/mips-qi_lb60-keypad-ds.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad-ds.cfg	Fri May 18 17:42:56 2018 +0200
@@ -27,7 +27,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-keypad-ds.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-ds.io
--- a/conf/landfall-examples/mips-qi_lb60-keypad-ds.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad-ds.list
--- a/conf/landfall-examples/mips-qi_lb60-keypad-ds.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad-ds.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-keypad-ds.cfg
 module mips-qi_lb60-keypad-ds.cfg
-module mips-qi_lb60-keypad-ds.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad.cfg
--- a/conf/landfall-examples/mips-qi_lb60-keypad.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad.cfg	Fri May 18 17:42:56 2018 +0200
@@ -26,7 +26,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-keypad.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad.io
--- a/conf/landfall-examples/mips-qi_lb60-keypad.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-keypad.list
--- a/conf/landfall-examples/mips-qi_lb60-keypad.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-keypad.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-keypad.cfg
 module mips-qi_lb60-keypad.cfg
-module mips-qi_lb60-keypad.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-lcd-driver.cfg
--- a/conf/landfall-examples/mips-qi_lb60-lcd-driver.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-lcd-driver.cfg	Fri May 18 17:42:56 2018 +0200
@@ -24,7 +24,7 @@
       sigma0  = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-lcd-driver.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-lcd-driver.io
--- a/conf/landfall-examples/mips-qi_lb60-lcd-driver.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-lcd-driver.list
--- a/conf/landfall-examples/mips-qi_lb60-lcd-driver.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-lcd-driver.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-lcd-driver.cfg
 module mips-qi_lb60-lcd-driver.cfg
-module mips-qi_lb60-lcd-driver.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-spectrum.cfg
--- a/conf/landfall-examples/mips-qi_lb60-spectrum.cfg	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-spectrum.cfg	Fri May 18 17:42:56 2018 +0200
@@ -26,7 +26,7 @@
       sigma0 = L4.cast(L4.Proto.Factory, L4.Env.sigma0):create(L4.Proto.Sigma0),
     },
   },
-  "rom/io rom/hw_devices.io rom/mips-qi_lb60-spectrum.io");
+  "rom/io rom/hw_devices.io rom/mips-qi_lb60-common.io");
 
 -- Expose a SPI peripheral as a device.
 
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-spectrum.io
--- a/conf/landfall-examples/mips-qi_lb60-spectrum.io	Fri May 18 17:21:47 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
--- vim: ft=lua ts=2 et sw=2
-  
--- Configuration file for Io.
-
-local hw = Io.system_bus()
-
-Io.add_vbus("cpm", Io.Vi.System_bus
-{
-  CPM = wrap(hw:match("jz4740-cpm"));
-})
-
-Io.add_vbus("gpio", Io.Vi.System_bus
-{
-  GPIO = wrap(hw:match("jz4740-gpio"));
-})
-
-Io.add_vbus("lcd", Io.Vi.System_bus
-{
-  LCD = wrap(hw:match("jz4740-lcd"));
-})
diff -r eb63a4d93293 -r 814f74f7f7cb conf/landfall-examples/mips-qi_lb60-spectrum.list
--- a/conf/landfall-examples/mips-qi_lb60-spectrum.list	Fri May 18 17:21:47 2018 +0200
+++ b/conf/landfall-examples/mips-qi_lb60-spectrum.list	Fri May 18 17:42:56 2018 +0200
@@ -6,7 +6,7 @@
 kernel fiasco -serial_esc
 roottask moe rom/mips-qi_lb60-spectrum.cfg
 module mips-qi_lb60-spectrum.cfg
-module mips-qi_lb60-spectrum.io
+module mips-qi_lb60-common.io
 module plat-qi_lb60/hw_devices.io
 module l4re
 module io