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

4 files changed, 24 insertions, 5 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index ab651028f..36cad132f 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -371,7 +371,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
 	default "-mcpu=v8" if ADK_CPU_SPARC_V8
 	default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9
-	default "-march=loongson2f" if ADK_CPU_LOONGSON2F
+	default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F
 	default "-march=mips32" if ADK_CPU_MIPS32
 	default "-march=mips64" if ADK_CPU_MIPS64
 	default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 60b331755..88bf02f62 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -45,7 +45,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
 	default "iso8859-1"
 
 config ADK_KERNEL_SQUASHFS
-	prompt ".................................. SquashFS filesystem"
+	prompt "squashfs.......................... SquashFS filesystem"
 	boolean
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	default n
@@ -181,12 +181,13 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 
 
 config ADK_KERNEL_XFS_FS
+	prompt "xfs............................... XFS filesystem support (kernel)"
 	boolean
 	select ADK_KERNEL_EXPORTFS
 	default n
 
 config ADK_KPACKAGE_KMOD_XFS_FS
-	prompt "kmod-fs-xfs....................... XFS filesystem support"
+	prompt "kmod-fs-xfs....................... XFS filesystem support (module)"
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	depends on !ADK_KERNEL_XFS_FS
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index e058676db..449e1a5b5 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -10,6 +10,7 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
 	select ADK_PACKAGE_GREP
+	select ADK_PACKAGE_TAR
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
@@ -30,9 +31,17 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_ZLIB_DEV
 	select ADK_PACKAGE_XZ
+	# optional
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_GDB
+	select ADK_PACKAGE_FLEX
+	select ADK_PACKAGE_BISON
+	select ADK_PACKAGE_AUTOCONF
+	select ADK_PACKAGE_AUTOMAKE
+	select ADK_PACKAGE_LIBTOOL
 	help
 	  After bootstrapping a Linux system you might want to
 	  switch to native builds with your target. 
-	  If you choose this option, all necessary software needed
+	  If you choose this option, all software required
 	  for native building will be selected by this option.
 
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop
index 9663690fe..0193703de 100644
--- a/target/packages/pkg-available/laptop
+++ b/target/packages/pkg-available/laptop
@@ -1,5 +1,5 @@
 config ADK_PKG_LAPTOP
-	bool "Choose packages for a laptop system with X"
+	bool "Choose packages for my laptop system with X"
 	default n
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM
@@ -16,10 +16,19 @@ config ADK_PKG_LAPTOP
 	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
 	select ADK_PACKAGE_XF86_INPUT_KEYBOARD
 	select ADK_PACKAGE_XF86_INPUT_MOUSE
+	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_PACKAGE_FONT_MISC_MISC
 	select ADK_PACKAGE_SETXKBMAP
 	select ADK_PACKAGE_XBINDKEYS
 	select ADK_PACKAGE_DISPLAY
+	select ADK_PACKAGE_FEH
 	select ADK_PACKAGE_XINIT
 	select ADK_PACKAGE_EVILWM
+	select ADK_PACKAGE_XRDB
 	select ADK_PACKAGE_FIREFOX
+	select ADK_PACKAGE_DILLO
 	select ADK_PACKAGE_MPLAYER
+	select ADK_PACKAGE_MPC
+	select ADK_PACKAGE_WPA_SUPPLICANT
+	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
+	select ADK_KPACKAGE_KMOD_USB_STORAGE