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

14 files changed, 566 insertions, 78 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 7e0fe8e2a..e876bd1f5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -331,24 +331,24 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 	fi
+	@if [ ! -z "$(HW)" ];then \
+		grep -h "^config" target/Config.in.* \
+			|grep -i "$(HW)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/.defconfig; \
+	fi
 ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
 endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
 endif
-ifneq (,$(filter rescue%,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
-endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 endif
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
 endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
-endif
 	@if [ ! -z "$(TARGET)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
@@ -408,24 +408,24 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 	fi
+	@if [ ! -z "$(HW)" ];then \
+		grep -h "^config" target/Config.in.* \
+			|grep -i "$(HW)" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			>> $(TOPDIR)/all.config; \
+	fi
 ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
 endif
-ifneq (,$(filter %_rescue,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
-endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
 endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
-endif
 
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
 	@if [ ! -f .config ];then \
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 705eb8ff3..ac28c461e 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
-PKG_TARGET_DEPENDS:=	x86_qemu x86_64_qemu
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/target/Config.in b/target/Config.in
index 8c2e56088..50e72ef5f 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -77,10 +77,10 @@ config ADK_mips_toolchain
 config ADK_mipsel_toolchain
 	tristate
 
-config ADK_ppc_toolchain
+config ADK_ppc
 	tristate
 
-config ADK_sparc_toolchain
+config ADK_sparc
 	tristate
 
 config ADK_arm_qemu
@@ -101,12 +101,6 @@ config ADK_mips64el_qemu
 config ADK_cris_qemu
 	tristate
 
-config ADK_x86_qemu
-	tristate
-
-config ADK_x86_64_qemu
-	tristate
-
 config ADK_rb532
 	tristate
 
@@ -151,15 +145,13 @@ config ADK_TARGET
 	default "toolchain-armel"  if ADK_armel_toolchain
 	default "toolchain-mips"  if ADK_mips_toolchain
 	default "toolchain-mipsel"  if ADK_mipsel_toolchain
-	default "toolchain-ppc"  if ADK_ppc_toolchain
-	default "toolchain-sparc"  if ADK_sparc_toolchain
+	default "ppc"  if ADK_ppc
+	default "sparc"  if ADK_sparc
 	default "qemu-arm"  if ADK_arm_qemu
 	default "qemu-cris"  if ADK_cris_qemu
 	default "qemu-mips"  if ADK_mips_qemu
 	default "qemu-mips64"  if ADK_mips64_qemu
 	default "qemu-mipsel"  if ADK_mipsel_qemu
-	default "qemu-x86"  if ADK_x86_qemu
-	default "qemu-x86_64"  if ADK_x86_64_qemu
 	default "foxboard"  if ADK_foxboard
 	default "foxg20"  if ADK_foxg20
 	default "native"  if ADK_NATIVE
@@ -174,6 +166,9 @@ config ADK_TARGET
 config ADK_HARDWARE_QEMU
 	boolean
 
+config ADK_CPU_SPARC_V8
+	boolean
+
 config ADK_CPU_I686
 	boolean
 
@@ -188,6 +183,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=i686" if ADK_CPU_I686
 	default "-march=pentium-m" if ADK_CPU_PENTIUM_M
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
+	default "-mcpu=v8" if ADK_CPU_SPARC_V8
 
 # c library
 config ADK_uclibc
@@ -319,12 +315,12 @@ config ADK_LINUX_MIPS_AG241
 
 config ADK_LINUX_MIPS_BRCM
 	bool "Broadcom BCM47xx based routers"
+	select ADK_brcm
 	select ADK_TARGET_WITH_SSB
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
-	select ADK_brcm
 	help
 	  Broadcom bcm47xx based router.
 	  Status: development
@@ -354,6 +350,18 @@ config ADK_LINUX_TOOLCHAIN
 	help
 	 Toolchain only support
 
+config ADK_LINUX_PPC
+	bool "ppc system"
+	select ADK_ppc
+	help
+	  Support for a ppc system.
+
+config ADK_LINUX_SPARC
+	bool "sparc system"
+	select ADK_sparc
+	help
+	  Support for a sparc system.
+
 config ADK_LINUX_X86
 	bool "x86 system"
 	select ADK_x86
@@ -404,27 +412,6 @@ config ADK_LINUX_MIPSEL_TOOLCHAIN
 	help
 	  Status: toolchain only
 
-config ADK_LINUX_PPC_TOOLCHAIN
-	bool "PPC Toolchain (32 Bit)"
-	select ADK_ppc_toolchain
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Status: toolchain only
-
-config ADK_LINUX_SPARC_TOOLCHAIN
-	bool "SPARC Toolchain (32 Bit)"
-	select ADK_sparc_toolchain
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Status: toolchain only
-
-config ADK_LINUX_X86_64_TOOLCHAIN
-	bool "X86 Toolchain (64 Bit)"
-	select ADK_x86_64_toolchain
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Status: toolchain only
-
 endchoice
 
 choice
@@ -499,6 +486,8 @@ config ADK_LINUX_X86_64_QEMU
 endchoice
 
 source "target/Config.in.alix"
+source "target/Config.in.sparc"
+source "target/Config.in.ppc"
 source "target/Config.in.x86"
 source "target/Config.in.x86_64"
 
@@ -583,6 +572,8 @@ config ADK_TARGET_LIB_EGLIBC
 	bool "Embedded GNU C library"
 	select ADK_eglibc
 	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_ARM_FOXG20 || \
@@ -599,6 +590,8 @@ config ADK_TARGET_LIB_GLIBC
 	bool "GNU C library"
 	select ADK_glibc
 	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_ARM_FOXG20 || \
@@ -630,6 +623,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	depends on \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_NATIVE || \
@@ -643,6 +638,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	depends on \
 		ADK_LINUX_X86_ALIX || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
@@ -724,6 +721,8 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	depends on \
 		ADK_LINUX_NATIVE || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_XSCALE_ZAURUS || \
 		ADK_LINUX_X86 || \
diff --git a/target/Config.in.ppc b/target/Config.in.ppc
new file mode 100644
index 000000000..491891722
--- /dev/null
+++ b/target/Config.in.ppc
@@ -0,0 +1,16 @@
+choice
+depends on ADK_LINUX_PPC
+prompt "Hardware model"
+
+config ADK_HARDWARE_GENERIC_PPC
+	bool "Generic ppc system"
+	help
+	  Generic ppc system.
+
+config ADK_HARDWARE_GENERIC_PPC_TOOLCHAIN
+	bool "ppc toolchain"
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  ppc toolchain.
+
+endchoice
diff --git a/target/Config.in.sparc b/target/Config.in.sparc
new file mode 100644
index 000000000..8332c4f13
--- /dev/null
+++ b/target/Config.in.sparc
@@ -0,0 +1,18 @@
+choice
+depends on ADK_LINUX_SPARC
+prompt "Hardware model"
+
+config ADK_HARDWARE_GENERIC_SPARC
+	bool "Generic sparc system"
+	select ADK_CPU_SPARC_V8
+	help
+	  Generic sparc system.
+
+config ADK_HARDWARE_GENERIC_SPARC_TOOLCHAIN
+	bool "sparc toolchain"
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  sparc toolchain.
+
+endchoice
+
diff --git a/target/bulk.lst b/target/bulk.lst
index 72bf5c124..d13d12ac3 100644
--- a/target/bulk.lst
+++ b/target/bulk.lst
@@ -1,6 +1,8 @@
 ag241		uclibc		nfsroot
 foxboard	uclibc		nfsroot
 foxg20		uclibc		nfsroot
+foxg20		eglibc		nfsroot
+foxg20		glibc		nfsroot
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -22,14 +24,11 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		archive
-x86_qemu	uclibc		archive
-x86_qemu	eglibc		archive
-x86_qemu	glibc		archive
-x86_64_qemu	uclibc		archive
-x86_64_qemu	eglibc		archive
-x86_64_qemu	glibc		archive
 lemote		eglibc		archive
 lemote		glibc		archive
 x86		uclibc		archive
 x86		eglibc		archive
 x86		glibc		archive
+x86_64		uclibc		archive
+x86_64		eglibc		archive
+x86_64		glibc		archive
diff --git a/target/bulkdef.lst b/target/bulkdef.lst
index e100ea2c7..88a29a56b 100644
--- a/target/bulkdef.lst
+++ b/target/bulkdef.lst
@@ -4,6 +4,10 @@ foxboard	uclibc		nfsroot
 foxboard	uclibc		squashfs
 foxg20		uclibc		nfsroot
 foxg20		uclibc		ext2-block
+foxg20		eglibc		nfsroot
+foxg20		eglibc		ext2-block
+foxg20		glibc		nfsroot
+foxg20		glibc		ext2-block
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -40,18 +44,6 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		archive
-x86_qemu	uclibc		archive
-x86_qemu	eglibc		archive
-x86_qemu	glibc		archive
-x86_qemu	uclibc		initramfs
-x86_qemu	eglibc		initramfs
-x86_qemu	glibc		initramfs
-x86_64_qemu	uclibc		archive
-x86_64_qemu	eglibc		archive
-x86_64_qemu	glibc		archive
-x86_64_qemu	uclibc		initramfs
-x86_64_qemu	eglibc		initramfs
-x86_64_qemu	glibc		initramfs
 lemote		eglibc		archive
 lemote		glibc		archive
 lemote		eglibc		initramfs
@@ -67,6 +59,12 @@ x86		glibc		initramfs
 x86		uclibc		initramfs-piggyback
 x86		eglibc		initramfs-piggyback
 x86		glibc		initramfs-piggyback
-shuttle		uclibc		archive
-shuttle		eglibc		archive
-shuttle		glibc		archive
+x86_64		uclibc		archive
+x86_64		eglibc		archive
+x86_64		glibc		archive
+x86_64		uclibc		initramfs
+x86_64		eglibc		initramfs
+x86_64		glibc		initramfs
+x86_64		uclibc		initramfs-piggyback
+x86_64		eglibc		initramfs-piggyback
+x86_64		glibc		initramfs-piggyback
diff --git a/target/bulktool.lst b/target/bulktool.lst
index abafba6d9..6869b1dbd 100644
--- a/target/bulktool.lst
+++ b/target/bulktool.lst
@@ -10,6 +10,3 @@ mips_toolchain	glibc
 mipsel_toolchain	uclibc
 mipsel_toolchain	eglibc
 mipsel_toolchain	glibc
-ppc_toolchain	uclibc
-ppc_toolchain	eglibc
-ppc_toolchain	glibc
diff --git a/target/ppc/target.mk b/target/ppc/target.mk
new file mode 100644
index 000000000..3654b0d35
--- /dev/null
+++ b/target/ppc/target.mk
@@ -0,0 +1,5 @@
+include $(TOPDIR)/mk/kernel-ver.mk
+ARCH:=			powerpc
+CPU_ARCH:=		ppc
+TARGET_OPTIMIZATION:=	-Os -pipe
+TARGET_CFLAGS_ARCH:=	$(ADK_TARGET_CFLAGS)
diff --git a/target/ppc/uclibc.config b/target/ppc/uclibc.config
new file mode 100644
index 000000000..328a70028
--- /dev/null
+++ b/target/ppc/uclibc.config
@@ -0,0 +1,226 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.30.2
+# Sun Feb 14 10:02:36 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+UCLIBC_HAS_FENV=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS=""
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+UCLIBC_HAS_ARC4RANDOM=y
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/target/sparc/target.mk b/target/sparc/target.mk
new file mode 100644
index 000000000..4de28f960
--- /dev/null
+++ b/target/sparc/target.mk
@@ -0,0 +1,5 @@
+include $(TOPDIR)/mk/kernel-ver.mk
+ARCH:=			sparc
+CPU_ARCH:=		sparc
+TARGET_OPTIMIZATION:=	-Os -pipe
+TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/sparc/uclibc.config b/target/sparc/uclibc.config
new file mode 100644
index 000000000..9ccf17a98
--- /dev/null
+++ b/target/sparc/uclibc.config
@@ -0,0 +1,229 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.30.2
+# Sun Feb 14 11:37:59 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+TARGET_sparc=y
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="sparc"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_CLASSIC is not set
+# CONFIG_E500 is not set
+# CONFIG_SPARC_V7 is not set
+CONFIG_SPARC_V8=y
+# CONFIG_SPARC_V9 is not set
+# CONFIG_SPARC_V9B is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+UCLIBC_HAS_FENV=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS=""
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+# UCLIBC_HAS_GETPT is not set
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr/"
+
+#
+# Security options
+#
+UCLIBC_HAS_ARC4RANDOM=y
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/target/target.lst b/target/target.lst
index 1d4f94e95..6220f3f69 100644
--- a/target/target.lst
+++ b/target/target.lst
@@ -10,8 +10,6 @@ arm_toolchain	ADK_LINUX_ARM_TOOLCHAIN
 armel_toolchain	ADK_LINUX_ARMEL_TOOLCHAIN
 mips_toolchain	ADK_LINUX_MIPS_TOOLCHAIN
 mipsel_toolchain	ADK_LINUX_MIPSEL_TOOLCHAIN
-ppc_toolchain	ADK_LINUX_PPC_TOOLCHAIN
-sparc_toolchain	ADK_LINUX_SPARC_TOOLCHAIN
 toolchain	ADK_LINUX_ARM_TOOLCHAIN ADK_LINUX_ARMEL_TOOLCHAIN ADK_LINUX_MIPS_TOOLCHAIN ADK_LINUX_MIPSEL_TOOLCHAIN ADK_LINUX_PPC_TOOLCHAIN ADK_LINUX_SPARC_TOOLCHAIN
 arm_qemu	ADK_LINUX_ARM_QEMU
 mips_qemu	ADK_LINUX_MIPS_QEMU
@@ -19,8 +17,6 @@ mipsel_qemu	ADK_LINUX_MIPSEL_QEMU
 mips64_qemu	ADK_LINUX_MIPS64_QEMU
 mips64el_qemu	ADK_LINUX_MIPS64EL_QEMU
 cris_qemu	ADK_LINUX_CRIS_QEMU
-x86_qemu	ADK_LINUX_X86_QEMU
-x86_64_qemu	ADK_LINUX_X86_64_QEMU
 qemu	ADK_LINUX_ARM_QEMU ADK_LINUX_MIPS_QEMU ADK_LINUX_MIPSEL_QEMU ADK_LINUX_MIPS64_QEMU ADK_LINUX_MIPS64EL_QEMU ADK_LINUX_CRIS_QEMU ADK_LINUX_X86_QEMU ADK_LINUX_X86_64_QEMU
 rb4xx	ADK_LINUX_MIPS_RB4XX
 rb532	ADK_LINUX_MIPS_RB532
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index 155daf00a..6902fba76 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -629,10 +629,12 @@ int main() {
 
 				fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name));
 
-				if (pkg_dflt != NULL)
+				if (pkg_dflt != NULL) {
 					fprintf(cfg, "\tdefault %s\n", pkg_dflt);
-				else
+					pkg_dflt = NULL;
+				} else {
 					fprintf(cfg, "\tdefault n\n");
+				}
 
 				fprintf(cfg, "\thelp\n");
 				fprintf(cfg, "\t  %s\n\n", pkg_descr);