Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 24 insertions, 10 deletions

diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 7e37f5ec1..b232a3674 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -38,6 +38,10 @@ config ADK_HOST_NEED_CCACHE
 	boolean
 	default n
 
+config ADK_HOST_NEED_MKIMAGE
+	boolean
+	default n
+
 config ADK_HOST_NEED_PCRE
 	boolean
 	default y if ADK_HOST_DARWIN
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 03976a6d7..dda8ad4c9 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -99,6 +99,8 @@ config ADK_KERNEL_MTD_M25P80
 	select ADK_KERNEL_MTD_PHYSMAP
 	select ADK_KERNEL_MTD_PHYSMAP_OF
 	select ADK_KERNEL_MTD_OF_PARTS
+	select ADK_KERNEL_SPI
+	select ADK_KERNEL_SPI_MASTER
 	boolean
 	default n
 
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 40024fe97..3cb0517ac 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -235,7 +235,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	  with the IRIX version of XFS.
 
 config ADK_KPACKAGE_KMOD_FUSE_FS
-	prompt   "kmod-fs-fuse...................... Filesystem in Userspace support"
+	prompt   "kmod-fuse-fs...................... Filesystem in Userspace support"
 	tristate
 	default n
 	help
diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi
index 73db5e86d..c130523ef 100644
--- a/target/linux/config/Config.in.spi
+++ b/target/linux/config/Config.in.spi
@@ -1,6 +1,12 @@
 config ADK_KERNEL_SPI
 	boolean
 
+config ADK_KERNEL_SPI_MASTER
+	boolean
+
+config ADK_KERNEL_SPI_XILINX
+	boolean
+
 config ADK_KERNEL_SPI_AR71XX
 	select ADK_KERNEL_SPI
 	boolean
diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile
index f05884442..58d02c5be 100644
--- a/target/microblaze/Makefile
+++ b/target/microblaze/Makefile
@@ -10,12 +10,10 @@ include $(TOPDIR)/mk/image.mk
 KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL)
 
 ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y)
-MODEL:=petalogix-ml605
-DTB:=-dtb target/microblaze/ml605.dtb
+QEMU_ARGS+=-M petalogix-ml605 -dtb target/microblaze/ml605.dtb
 endif
 ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
-MODEL:=petalogix-s3adsp1800
-DTB:=-dtb target/microblaze/s3adsp1800.dtb
+QEMU_ARGS+=-M petalogix-s3adsp1800
 endif
 
 ifeq ($(ADK_TARGET_FS),squashfs)
@@ -25,7 +23,7 @@ imageinstall: $(BUILD_DIR)/root.squashfs
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)'
+	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),jffs2)
@@ -33,7 +31,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSJFFS2)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following options:"
-	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)'
+	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs)
@@ -43,7 +41,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS)
 	@echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)'
+	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
@@ -52,7 +50,7 @@ imageinstall: createinitramfs
 	@echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}'
 ifneq ($(ADK_HARDWARE_QEMU),)
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)'
+	@echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)'
 endif
 endif
 ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605
index 8d13c5ddd..cb8da0cec 100644
--- a/target/microblaze/kernel/qemu-microblaze-ml605
+++ b/target/microblaze/kernel/qemu-microblaze-ml605
@@ -22,3 +22,4 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
index fc43ab5f1..3c3546b47 100644
--- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800
@@ -19,3 +19,4 @@ CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
+CONFIG_CMDLINE_FORCE=y
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze
index ee9cb6a52..a5bdb65e8 100644
--- a/target/microblaze/sys-available/qemu-microblaze
+++ b/target/microblaze/sys-available/qemu-microblaze
@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
+	select ADK_HOST_NEED_MKIMAGE
 	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 88c1c25db..4d752a942 100644
--- a/target/microblaze/sys-available/qemu-microblazeel
+++ b/target/microblaze/sys-available/qemu-microblazeel
@@ -1,11 +1,12 @@
 config ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
 	bool "Qemu Emulator (little endian)"
-	select ADK_microblazeel
+	select ADK_microblaze
 	select ADK_qemu_microblazeel
 	select ADK_little
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_KERNEL_LINUXBIN
+	select ADK_HOST_NEED_MKIMAGE
 	help
 	 Qemu support for microblaze little endian architecture.