diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 09:44:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-17 09:44:44 +0100 |
| commit | c0e617ea5633e5879f4b7dcf00f7942cf5da6a83 (patch) | |
| tree | 7f5414994b6cd15d7bdcce1f05bd2a75d4bfa06c /target/microblaze | |
| parent | f2b441c93ac0542edd34eaa30f5a55efa73439b9 (diff) | |
| parent | 521eddfc1e29218e26e3080c095a519ea3f8156d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/microblaze')
4 files changed, 6 insertions, 14 deletions
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 3c331795d..8d13c5ddd 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -15,13 +15,10 @@ CONFIG_PCI_XILINX=y CONFIG_DTC=y CONFIG_OF=y CONFIG_PROC_DEVICETREE=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=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 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 diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index c49b961b3..fc43ab5f1 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -15,10 +15,7 @@ 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 diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index a964cf924..63214e39b 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_qemu_microblaze select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_LINUXBIN - select ADK_TOOLCHAIN_GCC_SJLJ help Qemu support for microblaze big endian architecture. diff --git a/target/microblaze/sys-available/qemu-microblazeel b/target/microblaze/sys-available/qemu-microblazeel index 4ee4229d2..a58083770 100644 --- a/target/microblaze/sys-available/qemu-microblazeel +++ b/target/microblaze/sys-available/qemu-microblazeel @@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL select ADK_little select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_LINUXBIN - select ADK_TOOLCHAIN_GCC_SJLJ help Qemu support for microblaze little endian architecture. |