diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-28 19:51:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-28 19:51:01 +0100 |
| commit | bc4e048309459d085c8854d5dd5e4c54e9ac955b (patch) | |
| tree | 7115f41b534526fdf086fea4f0ee03c97c480574 /target/microblaze/kernel/qemu-microblaze-ml605 | |
| parent | 859c669daa90a29f18984acc6aede01136b40468 (diff) | |
| parent | f7dde97ca3551483cd745c9d9b4e9fec30d4f101 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/microblaze/kernel/qemu-microblaze-ml605')
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 7ae56f8c5..3c331795d 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -1,3 +1,4 @@ +CONFIG_MICROBLAZE=y CONFIG_PLATFORM_GENERIC=y CONFIG_OPT_LIB_FUNCTION=y CONFIG_KERNEL_BASE_ADDR=0x50000000 @@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" -CONFIG_CMDLINE_FORCE=y CONFIG_PCI=y CONFIG_PCI_XILINX=y CONFIG_DTC=y @@ -20,18 +20,8 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_XILINX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_AXI_EMAC=y -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y |