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

8 files changed, 99 insertions, 29 deletions

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.netdevice b/target/linux/config/Config.in.netdevice
index dcf9f03ec..b2eb73b57 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -113,16 +113,6 @@ config ADK_KERNEL_AR231X_ETHERNET
 	default n
 	help
 
-config ADK_KERNEL_NE2K_PCI
-	boolean
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_MII
-	default y if ADK_TARGET_SYSTEM_QEMU_PPC
-	default n
-	help
-
 config ADK_KERNEL_KORINA
 	boolean
 	select ADK_KERNEL_NETDEVICES
@@ -164,10 +154,6 @@ config ADK_KERNEL_E1000
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	default n
 	help
 
@@ -327,12 +313,30 @@ config ADK_KERNEL_WLAN_80211
 config ADK_KPACKAGE_KMOD_RT2X00
 	tristate
 
+config ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
+	tristate
+
+config ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
+	tristate
+
 config ADK_KERNEL_RT2X00
 	boolean
 	select ADK_KPACKAGE_KMOD_RT2X00
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_KPACKAGE_KMOD_EEPROM_93CX6
 
+config ADK_KERNEL_RT2800USB_RT3573
+	boolean
+
+config ADK_KERNEL_RT2800USB_RT53XX
+	boolean
+
+config ADK_KERNEL_RT2800USB_RT55XX
+	boolean
+
+config ADK_KERNEL_RT2800USB_UNKNOWN
+	boolean
+
 config ADK_KERNEL_MOD_CFG80211
 	tristate
 
@@ -479,10 +483,38 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	help
 	  Driver for Prism54 USB adaptors.
 
+config ADK_KPACKAGE_KMOD_RT2800USB
+	prompt "kmod-rt2800-usb.............. Ralink rt2800 USB"
+	tristate
+	select ADK_KERNEL_RT2X00
+	select ADK_KERNEL_RT2800USB_RT3573
+	select ADK_KERNEL_RT2800USB_RT53XX
+	select ADK_KERNEL_RT2800USB_RT55XX
+	select ADK_KERNEL_RT2800USB_UNKNOWN
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_USB
+	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_CRC_CCITT
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
+	help
+	  Driver for Ralink RT2800 USB.
+
+config ADK_KPACKAGE_KMOD_RTL8192CU
+	prompt "kmod-rtl8192cu............... Realtek RTL8192CU USB"
+	tristate
+	select ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KERNEL_CFG80211_WEXT
+	select ADK_KERNEL_WIRELESS_EXT
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+	default n
+	help
+	  Driver for Realtek RTL8192CU USB
+
 config ADK_KPACKAGE_KMOD_RT2400PCI
 	prompt "kmod-rt2400pci............... Ralink rt2400"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
@@ -495,6 +527,7 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	prompt "kmod-rt2500pci............... Ralink rt2500"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
@@ -507,6 +540,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 	prompt "kmod-rt61pci................. Ralink rt2501/rt61"
 	tristate
 	select ADK_KERNEL_RT2X00
+	select ADK_KPACKAGE_KMOD_RT2X00_LIB_PCI
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index 2cdd45d85..a9c42769a 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -38,6 +38,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
 	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_71
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_6
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
@@ -51,7 +52,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_11_10
+	depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_6
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index d41ce49f1..239f3495e 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -9,9 +9,6 @@ config ADK_KERNEL_PAGE_SIZE_16KB
 config ADK_KERNEL_ATHEROS_AR231X
 	boolean
 
-config ADK_KERNEL_MIPS_MALTA
-	boolean
-
 config ADK_KERNEL_MIKROTIK_RB532
 	boolean