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

75 files changed, 277165 insertions, 2985 deletions

diff --git a/target/Makefile b/target/Makefile
index b8b92c960..562d2b86b 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -59,12 +59,22 @@ ifeq ($(ADK_NATIVE),y)
 	if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \
 	fi
 else
+ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
+	@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
+		cat ${TOPDIR}/target/linux/kernel.config \
+		    ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \
+	else \
+		echo "no miniconfig found for target system"; \
+		exit 1; \
+	fi
+else
 	@if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
 		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
 	else \
 		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
 	fi
 endif
+endif
 	@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
 	    while IFS='=' read symbol value; do \
 		sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
diff --git a/target/arm/kernel/qemu-arm-versatile b/target/arm/kernel/qemu-arm-versatile
new file mode 100644
index 000000000..83d19b085
--- /dev/null
+++ b/target/arm/kernel/qemu-arm-versatile
@@ -0,0 +1,40 @@
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_VERSATILE=y
+CONFIG_ARCH_VERSATILE_PB=y
+CONFIG_PLAT_VERSATILE_CLOCK=y
+CONFIG_PLAT_VERSATILE_CLCD=y
+CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
+CONFIG_PLAT_VERSATILE=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_ARM_AMBA=y
+CONFIG_PCI=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_AEABI=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_VFP=y
+CONFIG_DTC=y
+CONFIG_OF=y
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_PROC_FS=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 141e80d25..4247b8862 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/sys-available/qemu-arm
@@ -7,5 +7,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Support for Qemu Emulator (arm).
diff --git a/target/config/Config.in b/target/config/Config.in
index 99b056546..d0183fdbb 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -36,6 +36,11 @@ config ADK_TARGET_ENDIAN
 	default "little" if ADK_little
 	default "big" if ADK_big
 
+config ADK_JFFS2_OPTS
+	string
+	default "-l" if ADK_little
+	default "-b" if ADK_big
+
 config ADK_TOOLCHAIN
 	boolean
 
@@ -143,19 +148,40 @@ config ADK_TARGET_LIBC_PATH
 
 
 # submodel support
-#
+
+config ADK_TARGET_KERNEL_MINICONFIG
+	string
+	default "qemu-microblaze-s3adsp1800" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	default "qemu-arm-versatile" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
+	default "qemu-mips" if ADK_TARGET_SYSTEM_QEMU_MIPS
+	default "qemu-mipsel" if ADK_TARGET_SYSTEM_QEMU_MIPSEL
+	default "qemu-mips64" if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+	default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC
+	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
+	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
+	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
+
+choice
+prompt "Qemu MICROBLAZE Emulation"
+depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+
+config ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
+	boolean "Xilinx ml605"
+	select ADK_TARGET_WITH_MTD
+
+config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	boolean "Xilinx Spartan S3ADSP1800"
+
+endchoice
+
 choice
 prompt "Qemu ARM Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_ARM
 
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
 	boolean "ARM Ltd. Versatile"
-	select ADK_KERNEL_ARCH_VERSATILE
-	select ADK_KERNEL_PCI
-	select ADK_KERNEL_BLOCK
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_SCSI_SYM53C8XX_2
 
 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	boolean "Xscale PXA270 Spitz PDA"
@@ -501,8 +527,10 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686
-	default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-	default "console=ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL
+	default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC
+	default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64
+	default "console=ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
+	default "console=ttyS0,115200" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_VBOX_I686
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
@@ -680,6 +708,14 @@ config ADK_TARGET_ROOTFS_SQUASHFS
 	help
 	  highly compressed read-only filesystem for MTD flash systems.
 
+config ADK_TARGET_ROOTFS_JFFS2
+	bool "Compressed read-write root filesystem (jffs2)"
+	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_JFFS2
+	depends on ADK_TARGET_WITH_MTD
+	help
+	  compressed read-write filesystem for MTD flash systems.
+
 config ADK_TARGET_ROOTFS_YAFFS
 	bool "YAFFS2 root filesystem (NAND)"
 	select ADK_KERNEL_MISC_FILESYSTEMS
@@ -762,6 +798,7 @@ config ADK_TARGET_ROOTFS_ISO
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
+	depends on !ADK_LINUX_MICROBLAZE
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
 
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 51b2dde0c..6e580f614 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -23,6 +23,7 @@ config ADK_RUNTIME_PASSWORD
 config ADK_RUNTIME_TMPFS_SIZE
 	string "size of /tmp in memory (kB)"
 	default "16384" if ADK_HARDWARE_QEMU
+	default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "32768" if ADK_TARGET_SYSTEM_IBM_X40
 	default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "2048"
@@ -37,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_RUNTIME_CONSOLE_SERIAL
 
 config ADK_RUNTIME_CONSOLE_VGA
@@ -145,10 +146,6 @@ config ADK_BINSH_ZSH
 
 endchoice
 
-
-
-
-
 config ADK_SIMPLE_NETWORK_CONFIG
 	prompt "simple network configuration"
 	boolean
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 79511489c..e4b81dd2f 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -18,7 +18,6 @@ source target/linux/config/Config.in.bluetooth
 source target/linux/config/Config.in.watchdog
 source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
-source target/linux/config/Config.in.microblaze
 source target/linux/config/Config.in.mips
 source target/linux/config/Config.in.lib
 source target/linux/config/Config.in.pm
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index 091cb98a4..773c518e8 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 "0"
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.input b/target/linux/config/Config.in.input
index 51d25c4ac..c2516c27d 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -107,6 +107,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KERNEL_INPUT_MOUSEDEV
@@ -142,6 +143,7 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_HID
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_INPUT_MOUSEDEV
+	select ADK_KERNEL_INPUT_MOUSE
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
         depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
@@ -155,6 +157,7 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 	select ADK_KERNEL_INPUT
 	select ADK_KERNEL_INPUT_KEYBOARD
 	depends on !ADK_KERNEL_KEYBOARD_ATKBD
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
@@ -169,6 +172,7 @@ config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 	tristate
 	select ADK_KERNEL_INPUT
 	depends on !ADK_KERNEL_INPUT_EVDEV
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
 endmenu
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
diff --git a/target/linux/config/Config.in.