convert microblaze to miniconfig kernel config generation, add support for squashfs and jffs2 rootfs for qemu-microblaze, add support for both machine emulations

4 files changed, 45 insertions, 11 deletions

diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 091cb98a4..26f00845a 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -1,6 +1,10 @@
 config ADK_KERNEL_MTD
+	select ADK_KERNEL_GENERIC_IO
  	boolean
 
+config ADK_KERNEL_GENERIC_IO
+	boolean
+
 config ADK_KERNEL_MTD_MTDRAM
 	boolean
  
@@ -41,6 +45,9 @@ config ADK_KERNEL_MTD_GEN_PROBE
 config ADK_KERNEL_MTD_PHYSMAP
 	boolean
 
+config ADK_KERNEL_MTD_PHYSMAP_OF
+	boolean
+
 config ADK_KERNEL_MTD_CFI_ADV_OPTIONS
 	boolean
 
@@ -57,16 +64,31 @@ config ADK_KERNEL_MTD_AR7_PARTS
 config ADK_KERNEL_MTD_CFI_INTELEXT
 	boolean
 	default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	default n
 
 config ADK_KERNEL_MTD_CFI_AMDSTD
 	boolean
 	default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
 	default n
 
 config ADK_KERNEL_MTD_CFI_STAA
 	boolean
 	default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	default n
+
+config ADK_KERNEL_MTD_OF_PARTS
+	boolean
+	default n
+
+config ADK_KERNEL_MTD_M25P80
+	boolean
+	default y if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default n
 
 config ADK_KERNEL_MTD_AR2315
@@ -78,6 +100,7 @@ config ADK_KERNEL_MTD_AR2315
 
 config ADK_TARGET_NAND
 	boolean
+	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_YAFFS_FS
 	select ADK_KERNEL_YAFFS_YAFFS2
@@ -88,22 +111,31 @@ config ADK_TARGET_NAND
 	select ADK_KERNEL_MTD_NAND_PLATFORM
 	select ADK_KERNEL_MTD_CHAR
 	select ADK_KERNEL_MTD_BLKDEVS
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MTD_BLOCK
 	default y if ADK_TARGET_WITH_NAND
 	default n
 
 config ADK_TARGET_MTD
 	boolean
+	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_JFFS2_FS
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
 	select ADK_KERNEL_MTD_CHAR
 	select ADK_KERNEL_MTD_BLKDEVS
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MTD_BLOCK
 	select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV
 	select ADK_KERNEL_MTD_CFI
 	select ADK_KERNEL_MTD_GEN_PROBE
 	select ADK_KERNEL_MTD_PHYSMAP
+	select ADK_KERNEL_MTD_PHYSMAP_OF if ADK_LINUX_MICROBLAZE
+	select ADK_KERNEL_MTD_OF_PARTS if ADK_LINUX_MICROBLAZE
 	default y if ADK_TARGET_WITH_MTD
 	default n
+
+config ADK_TARGET_MTD_SIZE
+	int
+	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE	
+	default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default ""
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 10b2d7e1b..a764e7491 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -1,5 +1,8 @@
 menu "Filesystems support"
 
+config ADK_KERNEL_MISC_FILESYSTEMS
+	boolean
+
 config ADK_KERNEL_FSNOTIFY
 	boolean
 	default y
@@ -8,6 +11,9 @@ config ADK_KERNEL_EXPORTFS
 	boolean
 	default y
 
+config ADK_KERNEL_JFFS2_FS
+	boolean
+
 config ADK_KERNEL_YAFFS_FS
 	tristate
 
@@ -27,9 +33,6 @@ config ADK_KERNEL_YAFFS_CHECKPOINT_RESERVED_BLOCKS
 config ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM
 	boolean
 
-config ADK_KERNEL_MISC_FILESYSTEMS
-	boolean
-
 config ADK_KERNEL_DNOTIFY
 	boolean
 
@@ -44,10 +47,15 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
 	string
 	default "iso8859-1"
 
+config ADK_KERNEL_SQUASHFS_XZ
+	boolean
+	default n
+
 config ADK_KERNEL_SQUASHFS
 	prompt "squashfs.......................... SquashFS filesystem"
 	boolean
 	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_SQUASHFS_XZ
 	default n
 
 config ADK_KERNEL_EXT2_FS
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 75c05449f..af28b91d7 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -1,6 +1,5 @@
 config ADK_KERNEL_VT
 	boolean
-	default y if ADK_HARDWARE_QEMU
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -9,7 +8,6 @@ config ADK_KERNEL_VT
 
 config ADK_KERNEL_VT_CONSOLE
 	boolean
-	default y if ADK_HARDWARE_QEMU
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
diff --git a/target/linux/config/Config.in.microblaze b/target/linux/config/Config.in.microblaze
deleted file mode 100644
index 5a6764250..000000000
--- a/target/linux/config/Config.in.microblaze
+++ /dev/null
@@ -1,4 +0,0 @@
-config ADK_KERNEL_OPT_LIB_ASM
-	default y if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-	default n
-	boolean