diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 08:24:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 08:24:06 +0100 |
| commit | 4ac8527c290ad1dd0fa622097e90b3858e42e847 (patch) | |
| tree | ea8c7a980a5fcd92a9104fd2d99a8ccc0f1e5c80 /target/mips | |
| parent | 186c1bd82b6a6a1b0fcd64456088ca50e37784d5 (diff) | |
| parent | a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/kernel/qemu-mips | 16 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 16 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64el | 14 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mipsel | 16 |
4 files changed, 12 insertions, 50 deletions
diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 2ea58176a..b94efcfaf 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -1,3 +1,4 @@ +CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y @@ -6,15 +7,6 @@ CONFIG_CPU_MIPS32_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y @@ -23,7 +15,5 @@ CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index 5ccc48cca..54c501549 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -1,3 +1,4 @@ +CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_MIPS64_R1=y @@ -9,15 +10,6 @@ CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y CONFIG_BINFMT_ELF32=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y @@ -25,7 +17,5 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mips64el b/target/mips/kernel/qemu-mips64el index 11240010d..8b9c6270f 100644 --- a/target/mips/kernel/qemu-mips64el +++ b/target/mips/kernel/qemu-mips64el @@ -1,3 +1,4 @@ +CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS64_R1=y @@ -9,15 +10,6 @@ CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y CONFIG_MIPS32_N32=y CONFIG_BINFMT_ELF32=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y @@ -25,5 +17,5 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel index b1b7c8c5b..b63ebeea1 100644 --- a/target/mips/kernel/qemu-mipsel +++ b/target/mips/kernel/qemu-mipsel @@ -1,3 +1,4 @@ +CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y @@ -6,15 +7,6 @@ CONFIG_CPU_MIPS32_R1=y CONFIG_PAGE_SIZE_4KB=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y @@ -23,7 +15,5 @@ CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 |