diff --git a/ports/run/noux_bash.run b/ports/run/noux_bash.run
index 346e00733e..c1e2a1ef8d 100644
--- a/ports/run/noux_bash.run
+++ b/ports/run/noux_bash.run
@@ -6,7 +6,7 @@
 
 set build_components {
 	core init drivers/timer noux/minimal lib/libc_noux
-	drivers/framebuffer drivers/pci drivers/input
+	drivers/framebuffer drivers/pci drivers/input drivers/usb
 	server/terminal server/ram_fs
 	test/libports/ncurses
 }
@@ -89,12 +89,25 @@ append_if [have_spec pl11x] config {
 		<provides><service name="Framebuffer"/></provides>
 	</start>}
 
+append_if [have_spec omap4] config {
+	<start name="omap4_fb_drv">
+		<resource name="RAM" quantum="4M"/>
+		<provides><service name="Framebuffer"/></provides>
+	</start>}
+
 append_if [have_spec ps2] config {
 	<start name="ps2_drv">
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Input"/></provides>
 	</start> }
 
+append_if [expr ![have_spec ps2] && [have_spec usb]] config {
+	<start name="usb_drv">
+		<resource name="RAM" quantum="12M"/>
+		<provides><service name="Input"/></provides>
+		<config> <hid/> </config>
+	</start> }
+
 append config {
 	<start name="terminal">
 		<resource name="RAM" quantum="2M"/>
@@ -174,6 +187,8 @@ lappend_if [have_spec pci]   boot_modules pci_drv
 lappend_if [have_spec vesa]  boot_modules vesa_drv
 lappend_if [have_spec ps2]   boot_modules ps2_drv
 lappend_if [have_spec pl11x] boot_modules pl11x_drv
+lappend_if [have_spec omap4] boot_modules omap4_fb_drv
+lappend_if [have_spec usb]   boot_modules usb_drv
 
 build_boot_image $boot_modules
 
diff --git a/ports/run/noux_gdb.run b/ports/run/noux_gdb.run
index cb29e18c1d..dae672968e 100644
--- a/ports/run/noux_gdb.run
+++ b/ports/run/noux_gdb.run
@@ -1,6 +1,6 @@
 if {![have_spec foc] || ![have_spec 32bit]} {
-        puts "\nThe Noux GDB scenario is supported on 32-bit Fiasco.OC only\n"
-        exit 0
+	puts "\nThe Noux GDB scenario is supported on 32-bit Fiasco.OC only\n"
+	exit 0
 }
 
 if {[have_spec arm]} {
@@ -21,7 +21,7 @@ if {[have_spec x86]} {
 
 set build_components {
 	core init drivers/timer noux lib/libc_noux
-	drivers/framebuffer drivers/pci drivers/input
+	drivers/framebuffer drivers/pci drivers/input drivers/usb
 	server/terminal server/terminal_crosslink
 	server/ram_fs app/gdb_monitor
 	test/gdb_monitor
@@ -111,11 +111,24 @@ append_if [have_spec pl11x] config {
 			<provides><service name="Framebuffer"/></provides>
 		</start>}
 
+append_if [have_spec omap4] config {
+		<start name="omap4_fb_drv">
+			<resource name="RAM" quantum="4M"/>
+			<provides><service name="Framebuffer"/></provides>
+		</start>}
+
 append_if [have_spec ps2] config {
 		<start name="ps2_drv">
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Input"/></provides>
-		</start> }
+		</start>}
+
+append_if [expr ![have_spec ps2] && [have_spec usb]] config {
+		<start name="usb_drv">
+			<resource name="RAM" quantum="12M"/>
+			<provides><service name="Input"/></provides>
+			<config> <hid/> </config>
+		</start>}
 
 append config {
 
@@ -225,6 +238,8 @@ lappend_if [have_spec pci]   boot_modules pci_drv
 lappend_if [have_spec vesa]  boot_modules vesa_drv
 lappend_if [have_spec ps2]   boot_modules ps2_drv
 lappend_if [have_spec pl11x] boot_modules pl11x_drv
+lappend_if [have_spec omap4] boot_modules omap4_fb_drv
+lappend_if [have_spec usb]   boot_modules usb_drv
 
 build_boot_image $boot_modules