Browse Source

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

Waldemar Brodkorb 13 years ago
parent
commit
8e057f22ce

+ 12 - 12
mk/build.mk

@@ -331,23 +331,23 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/.defconfig; \
 			>> $(TOPDIR)/.defconfig; \
 	fi
 	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}))
 ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig
 endif
 endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
 endif
 endif
-ifneq (,$(filter rescue%,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
-endif
 ifneq (,$(filter rb%,${TARGET}))
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 endif
 endif
 ifneq (,$(filter alix%,${TARGET}))
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
-endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
 endif
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 	@if [ ! -z "$(TARGET)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
@@ -408,24 +408,24 @@ endif
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(TOPDIR)/all.config; \
 			>> $(TOPDIR)/all.config; \
 	fi
 	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}))
 ifneq (,$(filter %_qemu,${TARGET}))
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 	@echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config
 endif
 endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
 endif
 endif
-ifneq (,$(filter %_rescue,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
-endif
 ifneq (,$(filter rb%,${TARGET}))
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
 endif
 ifneq (,$(filter alix%,${TARGET}))
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
 endif
 endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
-endif
 
 
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
 	@if [ ! -f .config ];then \
 	@if [ ! -f .config ];then \

+ 0 - 2
package/xf86-video-cirrus/Makefile

@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
 
-PKG_TARGET_DEPENDS:=	x86_qemu x86_64_qemu
-
 include $(TOPDIR)/mk/package.mk
 include $(TOPDIR)/mk/package.mk
 
 
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 33 - 34
target/Config.in

@@ -77,10 +77,10 @@ config ADK_mips_toolchain
 config ADK_mipsel_toolchain
 config ADK_mipsel_toolchain
 	tristate
 	tristate
 
 
-config ADK_ppc_toolchain
+config ADK_ppc
 	tristate
 	tristate
 
 
-config ADK_sparc_toolchain
+config ADK_sparc
 	tristate
 	tristate
 
 
 config ADK_arm_qemu
 config ADK_arm_qemu
@@ -101,12 +101,6 @@ config ADK_mips64el_qemu
 config ADK_cris_qemu
 config ADK_cris_qemu
 	tristate
 	tristate
 
 
-config ADK_x86_qemu
-	tristate
-
-config ADK_x86_64_qemu
-	tristate
-
 config ADK_rb532
 config ADK_rb532
 	tristate
 	tristate
 
 
@@ -151,15 +145,13 @@ config ADK_TARGET
 	default "toolchain-armel"  if ADK_armel_toolchain
 	default "toolchain-armel"  if ADK_armel_toolchain
 	default "toolchain-mips"  if ADK_mips_toolchain
 	default "toolchain-mips"  if ADK_mips_toolchain
 	default "toolchain-mipsel"  if ADK_mipsel_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-arm"  if ADK_arm_qemu
 	default "qemu-cris"  if ADK_cris_qemu
 	default "qemu-cris"  if ADK_cris_qemu
 	default "qemu-mips"  if ADK_mips_qemu
 	default "qemu-mips"  if ADK_mips_qemu
 	default "qemu-mips64"  if ADK_mips64_qemu
 	default "qemu-mips64"  if ADK_mips64_qemu
 	default "qemu-mipsel"  if ADK_mipsel_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 "foxboard"  if ADK_foxboard
 	default "foxg20"  if ADK_foxg20
 	default "foxg20"  if ADK_foxg20
 	default "native"  if ADK_NATIVE
 	default "native"  if ADK_NATIVE
@@ -174,6 +166,9 @@ config ADK_TARGET
 config ADK_HARDWARE_QEMU
 config ADK_HARDWARE_QEMU
 	boolean
 	boolean
 
 
+config ADK_CPU_SPARC_V8
+	boolean
+
 config ADK_CPU_I686
 config ADK_CPU_I686
 	boolean
 	boolean
 
 
@@ -188,6 +183,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=i686" if ADK_CPU_I686
 	default "-march=i686" if ADK_CPU_I686
 	default "-march=pentium-m" if ADK_CPU_PENTIUM_M
 	default "-march=pentium-m" if ADK_CPU_PENTIUM_M
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
+	default "-mcpu=v8" if ADK_CPU_SPARC_V8
 
 
 # c library
 # c library
 config ADK_uclibc
 config ADK_uclibc
@@ -319,12 +315,12 @@ config ADK_LINUX_MIPS_AG241
 
 
 config ADK_LINUX_MIPS_BRCM
 config ADK_LINUX_MIPS_BRCM
 	bool "Broadcom BCM47xx based routers"
 	bool "Broadcom BCM47xx based routers"
+	select ADK_brcm
 	select ADK_TARGET_WITH_SSB
 	select ADK_TARGET_WITH_SSB
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
 	select ADK_KERNEL_MII
-	select ADK_brcm
 	help
 	help
 	  Broadcom bcm47xx based router.
 	  Broadcom bcm47xx based router.
 	  Status: development
 	  Status: development
@@ -354,6 +350,18 @@ config ADK_LINUX_TOOLCHAIN
 	help
 	help
 	 Toolchain only support
 	 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
 config ADK_LINUX_X86
 	bool "x86 system"
 	bool "x86 system"
 	select ADK_x86
 	select ADK_x86
@@ -404,27 +412,6 @@ config ADK_LINUX_MIPSEL_TOOLCHAIN
 	help
 	help
 	  Status: toolchain only
 	  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
 endchoice
 
 
 choice
 choice
@@ -499,6 +486,8 @@ config ADK_LINUX_X86_64_QEMU
 endchoice
 endchoice
 
 
 source "target/Config.in.alix"
 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"
 source "target/Config.in.x86_64"
 source "target/Config.in.x86_64"
 
 
@@ -583,6 +572,8 @@ config ADK_TARGET_LIB_EGLIBC
 	bool "Embedded GNU C library"
 	bool "Embedded GNU C library"
 	select ADK_eglibc
 	select ADK_eglibc
 	depends on ADK_LINUX_QEMU || \
 	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_ARM_FOXG20 || \
@@ -599,6 +590,8 @@ config ADK_TARGET_LIB_GLIBC
 	bool "GNU C library"
 	bool "GNU C library"
 	select ADK_glibc
 	select ADK_glibc
 	depends on ADK_LINUX_QEMU || \
 	depends on ADK_LINUX_QEMU || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_ARM_FOXG20 || \
@@ -630,6 +623,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	depends on \
 	depends on \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_X86_64 || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_NATIVE || \
 		ADK_LINUX_NATIVE || \
@@ -643,6 +638,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	select ADK_LINUX_INITRAMFS_BUILTIN
 	depends on \
 	depends on \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_ALIX || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
 		ADK_LINUX_X86_64 || \
@@ -724,6 +721,8 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	bool "Archive usable for different filesystems"
 	depends on \
 	depends on \
 		ADK_LINUX_NATIVE || \
 		ADK_LINUX_NATIVE || \
+		ADK_LINUX_PPC || \
+		ADK_LINUX_SPARC || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_QEMU || \
 		ADK_LINUX_XSCALE_ZAURUS || \
 		ADK_LINUX_XSCALE_ZAURUS || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86 || \

+ 16 - 0
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

+ 18 - 0
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
+

+ 5 - 6
target/bulk.lst

@@ -1,6 +1,8 @@
 ag241		uclibc		nfsroot
 ag241		uclibc		nfsroot
 foxboard	uclibc		nfsroot
 foxboard	uclibc		nfsroot
 foxg20		uclibc		nfsroot
 foxg20		uclibc		nfsroot
+foxg20		eglibc		nfsroot
+foxg20		glibc		nfsroot
 rb4xx		uclibc		nfsroot
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -22,14 +24,11 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		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		eglibc		archive
 lemote		glibc		archive
 lemote		glibc		archive
 x86		uclibc		archive
 x86		uclibc		archive
 x86		eglibc		archive
 x86		eglibc		archive
 x86		glibc		archive
 x86		glibc		archive
+x86_64		uclibc		archive
+x86_64		eglibc		archive
+x86_64		glibc		archive

+ 13 - 15
target/bulkdef.lst

@@ -4,6 +4,10 @@ foxboard	uclibc		nfsroot
 foxboard	uclibc		squashfs
 foxboard	uclibc		squashfs
 foxg20		uclibc		nfsroot
 foxg20		uclibc		nfsroot
 foxg20		uclibc		ext2-block
 foxg20		uclibc		ext2-block
+foxg20		eglibc		nfsroot
+foxg20		eglibc		ext2-block
+foxg20		glibc		nfsroot
+foxg20		glibc		ext2-block
 rb4xx		uclibc		nfsroot
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -40,18 +44,6 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		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		eglibc		archive
 lemote		glibc		archive
 lemote		glibc		archive
 lemote		eglibc		initramfs
 lemote		eglibc		initramfs
@@ -67,6 +59,12 @@ x86		glibc		initramfs
 x86		uclibc		initramfs-piggyback
 x86		uclibc		initramfs-piggyback
 x86		eglibc		initramfs-piggyback
 x86		eglibc		initramfs-piggyback
 x86		glibc		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

+ 0 - 3
target/bulktool.lst

@@ -10,6 +10,3 @@ mips_toolchain	glibc
 mipsel_toolchain	uclibc
 mipsel_toolchain	uclibc
 mipsel_toolchain	eglibc
 mipsel_toolchain	eglibc
 mipsel_toolchain	glibc
 mipsel_toolchain	glibc
-ppc_toolchain	uclibc
-ppc_toolchain	eglibc
-ppc_toolchain	glibc

+ 5 - 0
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)

+ 226 - 0
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

+ 5 - 0
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)

+ 229 - 0
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

+ 0 - 4
target/target.lst

@@ -10,8 +10,6 @@ arm_toolchain	ADK_LINUX_ARM_TOOLCHAIN
 armel_toolchain	ADK_LINUX_ARMEL_TOOLCHAIN
 armel_toolchain	ADK_LINUX_ARMEL_TOOLCHAIN
 mips_toolchain	ADK_LINUX_MIPS_TOOLCHAIN
 mips_toolchain	ADK_LINUX_MIPS_TOOLCHAIN
 mipsel_toolchain	ADK_LINUX_MIPSEL_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
 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
 arm_qemu	ADK_LINUX_ARM_QEMU
 mips_qemu	ADK_LINUX_MIPS_QEMU
 mips_qemu	ADK_LINUX_MIPS_QEMU
@@ -19,8 +17,6 @@ mipsel_qemu	ADK_LINUX_MIPSEL_QEMU
 mips64_qemu	ADK_LINUX_MIPS64_QEMU
 mips64_qemu	ADK_LINUX_MIPS64_QEMU
 mips64el_qemu	ADK_LINUX_MIPS64EL_QEMU
 mips64el_qemu	ADK_LINUX_MIPS64EL_QEMU
 cris_qemu	ADK_LINUX_CRIS_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
 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
 rb4xx	ADK_LINUX_MIPS_RB4XX
 rb532	ADK_LINUX_MIPS_RB532
 rb532	ADK_LINUX_MIPS_RB532

+ 4 - 2
tools/adk/pkgmaker.c

@@ -629,10 +629,12 @@ int main() {
 
 
 				fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name));
 				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);
 					fprintf(cfg, "\tdefault %s\n", pkg_dflt);
-				else
+					pkg_dflt = NULL;
+				} else {
 					fprintf(cfg, "\tdefault n\n");
 					fprintf(cfg, "\tdefault n\n");
+				}
 
 
 				fprintf(cfg, "\thelp\n");
 				fprintf(cfg, "\thelp\n");
 				fprintf(cfg, "\t  %s\n\n", pkg_descr);
 				fprintf(cfg, "\t  %s\n\n", pkg_descr);