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

8 files changed, 12 insertions, 39 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 25e34c9cd..2bcb4751b 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -202,7 +202,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB
 	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
 	default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
-	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
+	default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_I486
 	default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
 	default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index dda8ad4c9..d35f1c866 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -87,7 +87,6 @@ config ADK_KERNEL_MTD_OF_PARTS
 	default n
 
 config ADK_KERNEL_MTD_M25P80
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MTD
 	select ADK_KERNEL_MTD_PARTITIONS
 	select ADK_KERNEL_MTD_CHAR
@@ -113,7 +112,6 @@ 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
@@ -130,7 +128,6 @@ config ADK_TARGET_NAND
 
 config ADK_TARGET_MTD
 	boolean
-	select ADK_KERNEL_BLOCK
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_JFFS2_FS
 	select ADK_KERNEL_MTD
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 5ebf38794..69af555c8 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -80,7 +80,6 @@ config ADK_KPACKAGE_KMOD_EXT2_FS
 	tristate
 	default n
 	depends on !ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_BLOCK
 	help
 	  Ext2 is a standard Linux file system for hard disks.
 
@@ -98,7 +97,6 @@ config ADK_KPACKAGE_KMOD_EXT3_FS
 	tristate
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS
 	depends on !ADK_KERNEL_EXT3_FS
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  This is the journalling version of the Second extended file system
@@ -136,7 +134,6 @@ config ADK_KPACKAGE_KMOD_EXT4_FS
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE
 	select ADK_KPACKAGE_KMOD_CRC16
 	depends on !ADK_KERNEL_EXT4_FS 
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  Ext4 filesystem.
@@ -147,7 +144,6 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS_UTF8
 	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  If you say Y here, you will be able to mount extended format
@@ -162,7 +158,6 @@ config ADK_KPACKAGE_KMOD_NTFS_FS
 	prompt "kmod-fs-ntfs...................... NTFS file system support"
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
@@ -193,7 +188,6 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
-	select ADK_KERNEL_BLOCK
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -217,7 +211,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
-	select ADK_KERNEL_BLOCK
 	depends on !ADK_KERNEL_XFS_FS
 	default n
 	help
@@ -256,7 +249,6 @@ config ADK_KPACKAGE_KMOD_ISO9660_FS
 	prompt "kmod-fs-iso9660................... ISO 9660 CDROM file system support"
 	tristate
 	select ADK_KERNEL_JOLIET
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  This is the standard file system used on CD-ROMs.  It was previously
@@ -273,7 +265,6 @@ config ADK_KPACKAGE_KMOD_UDF_FS
 	prompt "kmod-fs-udf....................... UDF file system support"
 	tristate
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
-	select ADK_KERNEL_BLOCK
 	default n
 	help
 	  This is the new file system used on some CD-ROMs and DVDs. Say Y if
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 62479c2cb..64bfb15f4 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -1,9 +1,6 @@
 menu "Network devices support"
 comment "Ethernet network driver for target system is included into kernel"
 
-config ADK_KERNEL_NETDEVICES
-	boolean
-
 config ADK_KERNEL_NET_ETHERNET
 	boolean
 
@@ -42,7 +39,6 @@ config ADK_KERNEL_ATH_CARDS
 
 config ADK_KERNEL_CPMAC
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -52,7 +48,6 @@ config ADK_KERNEL_CPMAC
 
 config ADK_KERNEL_MACB
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -63,7 +58,6 @@ config ADK_KERNEL_MACB
 
 config ADK_KERNEL_PCNET32
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -72,7 +66,6 @@ config ADK_KERNEL_PCNET32
 
 config ADK_KERNEL_NATSEMI
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -82,7 +75,6 @@ config ADK_KERNEL_NATSEMI
 
 config ADK_KERNEL_VIA_RHINE
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -95,7 +87,6 @@ config ADK_KERNEL_VIA_RHINE
 
 config ADK_KERNEL_AR231X_ETHERNET
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -106,7 +97,6 @@ config ADK_KERNEL_AR231X_ETHERNET
 
 config ADK_KERNEL_KORINA
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -116,7 +106,6 @@ config ADK_KERNEL_KORINA
 
 config ADK_KERNEL_AG71XX
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -127,7 +116,6 @@ config ADK_KERNEL_AG71XX
 
 config ADK_KERNEL_B44
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -137,7 +125,6 @@ config ADK_KERNEL_B44
 
 config ADK_KERNEL_R8169
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_MII
@@ -147,7 +134,6 @@ config ADK_KERNEL_R8169
 
 config ADK_KERNEL_USB_NET_SMSC95XX
 	boolean
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_USB_USBNET
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
@@ -160,7 +146,6 @@ depends on ADK_TARGET_WITH_PCI
 config ADK_KPACKAGE_KMOD_NE2K_PCI
 	prompt "kmod-net-ne2k-pci............. NE2000 PCI driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_NATSEMI
@@ -173,7 +158,6 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI
 config ADK_KPACKAGE_KMOD_PCNET32
 	prompt "kmod-net-pcnet32.............. AMD PCNet32 PCI driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -184,7 +168,6 @@ config ADK_KPACKAGE_KMOD_PCNET32
 config ADK_KPACKAGE_KMOD_8139CP
 	prompt "kmod-net-rtl8139cp............ RTL8139C+ PCI driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_VENDOR_REALTEK
@@ -196,7 +179,6 @@ config ADK_KPACKAGE_KMOD_8139CP
 config ADK_KPACKAGE_KMOD_8139TOO
 	prompt "kmod-net-rtl8139.............. RTL8139 PCI driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
@@ -207,7 +189,6 @@ config ADK_KPACKAGE_KMOD_8139TOO
 config ADK_KPACKAGE_KMOD_E100
 	prompt "kmod-net-e100................. Intel(R) PRO/100+ driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_MII
 	default n
@@ -217,7 +198,6 @@ config ADK_KPACKAGE_KMOD_E100
 config ADK_KPACKAGE_KMOD_E1000
 	prompt "kmod-net-e1000................ Intel(R) PRO/1000 Gigabit Ethernet driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	depends on !ADK_KERNEL_E1000
@@ -232,7 +212,6 @@ config ADK_KPACKAGE_KMOD_E1000
 config ADK_KPACKAGE_KMOD_SKY2
 	prompt "kmod-net-sky2................. Marvell Yukon driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_VENDOR_MARVELL
@@ -243,7 +222,6 @@ config ADK_KPACKAGE_KMOD_SKY2
 config ADK_KPACKAGE_KMOD_R8169
 	prompt "kmod-net-r8169................ RTL8169 driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_MII
@@ -258,7 +236,6 @@ config ADK_KERNEL_WLAN
 	boolean
 
 config ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_WLAN
 	boolean
 
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 71a510d69..f35f2ce80 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -180,7 +180,6 @@ config ADK_KPACKAGE_KMOD_IPV6_SIT
 config ADK_KPACKAGE_KMOD_PPP
 	prompt "kmod-ppp.......................... PPP support"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_PPP_ASYNC
 	select ADK_KERNEL_SLHC
 	select ADK_KPACKAGE_KMOD_CRC_CCITT
@@ -243,7 +242,6 @@ config ADK_KPACKAGE_KMOD_PPPOE
 config ADK_KPACKAGE_KMOD_TUN
 	prompt "kmod-tun.......................... Universal TUN/TAP driver"
 	tristate
-	select ADK_KERNEL_NETDEVICES
 	default n
 	help
 	  Kernel support for the TUN/TAP tunneling device
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-x86
index 7eb708745..7eb708745 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-x86
diff --git a/target/x86/sys-available/qemu-i486 b/target/x86/sys-available/qemu-i486
new file mode 100644
index 000000000..dc0da52ca
--- /dev/null
+++ b/target/x86/sys-available/qemu-i486
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_I486
+	bool "Qemu Emulator (i486)"
+	select ADK_x86
+	select ADK_qemu_i486
+	select ADK_CPU_I486
+	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	help
+	 Support for Qemu Emulator (i486).
+
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686
index b047bc482..b2951a1e2 100644
--- a/target/x86/sys-available/qemu-i686
+++ b/target/x86/sys-available/qemu-i686
@@ -1,5 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_I686
-	bool "Qemu Emulator"
+	bool "Qemu Emulator (i686)"
 	select ADK_x86
 	select ADK_qemu_i686
 	select ADK_CPU_I686