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/microblaze | |
| parent | 186c1bd82b6a6a1b0fcd64456088ca50e37784d5 (diff) | |
| parent | a4d9f84daa3c1d5195daf4e85cdc5d2fc1a98d5e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/microblaze')
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 10 | ||||
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 3c331795d..a36267570 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -15,13 +15,13 @@ CONFIG_PCI_XILINX=y CONFIG_DTC=y CONFIG_OF=y CONFIG_PROC_DEVICETREE=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_OF_PLATFORM=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_AXI_EMAC=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +CONFIG_SERIAL_OF_PLATFORM=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index c49b961b3..b95e35766 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -15,10 +15,10 @@ CONFIG_PCI_XILINX=y CONFIG_DTC=y CONFIG_OF=y CONFIG_PROC_DEVICETREE=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=y +CONFIG_SERIAL_UARTLITE=y +CONFIG_SERIAL_UARTLITE_CONSOLE=y |