4 files changed, 21 insertions, 53 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index f70c8f162..59fad2d4a 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -117,11 +117,14 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
+	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
-	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	default y if ADK_TARGET_SYSTEM_QEMU_X86
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 
 config ADK_KERNEL_SATA_AHCI
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index c49d0f644..122827bde 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -1,3 +1,15 @@
+config ADK_KERNEL_VT
+	boolean
+	default y if ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_WITH_VGA
+	default n
+
+config ADK_KERNEL_VT_CONSOLE
+	boolean
+	default y if ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_WITH_VGA
+	default n
+
 config ADK_KERNEL_FB
  	boolean
  
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index 40fd80a8c..5ded9d0cf 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -1,3 +1,7 @@
+# mips systems
+config ADK_KERNEL_MIPS_MALTA
+	boolean
+
 config ADK_KERNEL_MIKROTIK_RB532
 	boolean
 
@@ -13,6 +17,7 @@ config ADK_KERNEL_ATHEROS_AR71XX
 config ADK_KERNEL_AR71XX_MACH_RB4XX
 	boolean
 
+# arm systems
 config ADK_KERNEL_ARCH_AT91
 	boolean
 
diff --git a/target/linux/patches/2.6.36/io_map_base.patch b/target/linux/patches/2.6.36/io_map_base.patch
deleted file mode 100644
index be39ffe09..000000000
--- a/target/linux/patches/2.6.36/io_map_base.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nur linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h
---- linux-2.6.28.orig/arch/mips/include/asm/mips-boards/generic.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/mips/include/asm/mips-boards/generic.h	2009-01-09 23:03:02.000000000 +0100
-@@ -92,7 +92,7 @@
- extern void mips_reboot_setup(void);
- 
- #ifdef CONFIG_PCI
--extern void mips_pcibios_init(void);
-+extern int mips_pcibios_init(void);
- #else
- #define mips_pcibios_init() do { } while (0)
- #endif
-diff -Nur linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c linux-2.6.28/arch/mips/mti-malta/malta-pci.c
---- linux-2.6.28.orig/arch/mips/mti-malta/malta-pci.c	2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.28/arch/mips/mti-malta/malta-pci.c	2009-01-09 23:02:02.000000000 +0100
-@@ -87,10 +87,11 @@
- 	.mem_resource	= &msc_mem_resource,
- };
- 
--void __init mips_pcibios_init(void)
-+int __init mips_pcibios_init(void)
- {
- 	struct pci_controller *controller;
- 	resource_size_t start, end, map, start1, end1, map1, map2, map3, mask;
-+	void __iomem *io_map_base;
- 
- 	switch (mips_revision_sconid) {
- 	case MIPS_REVISION_SCON_GT64120:
-@@ -230,7 +231,7 @@
- 		controller = &msc_controller;
- 		break;
- 	default:
--		return;
-+		return 0;
- 	}
- 
- 	if (controller->io_resource->start < 0x00001000UL)	/* FIXME */
-@@ -239,5 +240,14 @@
- 	iomem_resource.end &= 0xfffffffffULL;			/* 64 GB */
- 	ioport_resource.end = controller->io_resource->end;
- 
-+	io_map_base = ioremap(MIPS_MSC01_PCI_REG_BASE,
-+				controller->io_resource->end - controller->io_resource->start + 1);
-+	if (!io_map_base)
-+		return -EBUSY;
-+
-+	controller->io_map_base = (unsigned long)io_map_base;
-+
- 	register_pci_controller(controller);
-+	
-+	return 0;
- }