various microblaze related fixes add back some missing patches

9 files changed, 52 insertions, 8 deletions

diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 600869754..4218eb1cc 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -179,6 +179,10 @@ config ADK_HOST_BUILD_COREUTILS
 	bool
 	default n
 
+config ADK_HOST_BUILD_UTIL_LINUX
+	bool
+	default n
+
 # optional, must be used from OpenADK
 config ADK_HOST_NEED_MTD_UTILS
 	bool
@@ -186,6 +190,7 @@ config ADK_HOST_NEED_MTD_UTILS
 
 config ADK_HOST_BUILD_MTD_UTILS
 	bool
+	select ADK_HOST_BUILD_UTIL_LINUX
 	default y if ADK_HOST_NEED_MTD_UTILS
 	default n
 
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index ded3dfe6f..7f2886a3e 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -73,6 +73,7 @@ config ADK_KERNEL_MTD_OF_PARTS
 
 config ADK_KERNEL_MTD_M25P80
 	bool "MTD M25P80 driver"
+	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
 	select ADK_KERNEL_MTD_CHAR
@@ -93,6 +94,7 @@ config ADK_KERNEL_MTD_M25P80
 
 config ADK_KERNEL_MTD_NAND_PLATFORM
 	bool "NAND platform driver"
+	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
@@ -108,6 +110,7 @@ config ADK_KERNEL_MTD_NAND_PLATFORM
 
 config ADK_KERNEL_MTD_PLATRAM
 	bool "MTD RAM driver"
+	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_BLOCK
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 71816245b..7c5008b70 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -22,6 +22,9 @@ config ADK_KERNEL_SERIAL_OF_PLATFORM
 config ADK_KERNEL_SERIAL_OMAP_CONSOLE
 	bool
 
+config ADK_KERNEL_SERIAL_UARTLITE_CONSOLE
+	bool
+
 config ADK_KERNEL_SERIAL_ETRAXFS_CONSOLE
 	bool
 
@@ -67,6 +70,7 @@ config ADK_KERNEL_SERIAL_8250
 	bool "8250 serial driver"
 	select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
 						|| ADK_TARGET_SYSTEM_QEMU_XTENSA \
+						|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 						|| ADK_TARGET_SYSTEM_QEMU_OR1K \
 						|| ADK_TARGET_SYSTEM_OR1K_SIM
 	select ADK_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU
@@ -74,6 +78,7 @@ config ADK_KERNEL_SERIAL_8250
 	depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
 		|| ADK_TARGET_SYSTEM_PCENGINES_APU \
 		|| ADK_TARGET_SYSTEM_PCENGINES_ALIX \
+		|| ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
 		|| ADK_TARGET_SYSTEM_QEMU_MIPS \
 		|| ADK_TARGET_SYSTEM_QEMU_OR1K \
 		|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
@@ -89,6 +94,7 @@ config ADK_KERNEL_SERIAL_8250
 	default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	default y if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_OR1K
 	default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
@@ -192,4 +198,13 @@ config ADK_KERNEL_SERIAL_OMAP
 	help
 	  Serial driver for Beaglebone Black
 
+config ADK_KERNEL_SERIAL_UARTLITE
+	bool "uartlite serial driver"
+	select ADK_KERNEL_SERIAL_UARTLITE_CONSOLE
+	depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default n
+	help
+	  Serial driver for Microblaze S3ADSP1800
+
 endmenu
diff --git a/target/linux/patches/4.1.13/j2-core.patch b/target/linux/patches/4.1.15/j2-core.patch
index 38136df2c..38136df2c 100644
--- a/target/linux/patches/4.1.13/j2-core.patch
+++ b/target/linux/patches/4.1.15/j2-core.patch
diff --git a/target/linux/patches/4.1.15/mtd-rootfs.patch b/target/linux/patches/4.1.15/mtd-rootfs.patch
new file mode 100644
index 000000000..5f6d82b5c
--- /dev/null
+++ b/target/linux/patches/4.1.15/mtd-rootfs.patch
@@ -0,0 +1,26 @@
+diff -Nur linux-4.1.15.orig/drivers/mtd/mtdpart.c linux-4.1.15/drivers/mtd/mtdpart.c
+--- linux-4.1.15.orig/drivers/mtd/mtdpart.c	2015-12-15 06:24:51.000000000 +0100
++++ linux-4.1.15/drivers/mtd/mtdpart.c	2015-12-26 21:02:02.766905805 +0100
+@@ -30,6 +30,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/err.h>
++#include <linux/root_dev.h>
+ #include <linux/kconfig.h>
+ 
+ #include "mtdcore.h"
+@@ -667,6 +668,14 @@
+ 		if (IS_ERR(slave))
+ 			return PTR_ERR(slave);
+ 
++		if (strcmp(parts[i].name, "rootfs") == 0) {
++			if (ROOT_DEV == 0) {
++				printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++					"set to be root filesystem\n");
++					ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i);
++			}
++		}
++
+ 		mutex_lock(&mtd_partitions_mutex);
+ 		list_add(&slave->list, &mtd_partitions);
+ 		mutex_unlock(&mtd_partitions_mutex);
diff --git a/target/linux/patches/4.1.13/use-libgcc-for-sh.patch b/target/linux/patches/4.1.15/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.1.13/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.1.15/use-libgcc-for-sh.patch
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