From 01e0761fc16f3f3de993ec7ab4fd952c7fa2f6f3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2015 00:20:20 +0100 Subject: various microblaze related fixes add back some missing patches --- target/microblaze/Makefile | 2 +- target/microblaze/kernel/qemu-microblaze-ml605 | 6 +----- target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'target/microblaze') diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 8bbaadedc..8555a1b01 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -57,7 +57,7 @@ targethelp: @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" - @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)' endif endif diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index d674fb390..932843c13 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -11,9 +11,5 @@ CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" CONFIG_PCI_XILINX=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 +CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index 7f21cc019..cf8c3a91c 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -11,6 +11,5 @@ CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" CONFIG_PCI_XILINX=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_CMDLINE_FORCE=y +CONFIG_CMDLINE_BOOL=y -- cgit v1.2.3