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

Conflicts:
	package/nspr/Makefile

1 files changed, 264 insertions, 125 deletions

diff --git a/target/Config.in b/target/Config.in
index 01dfd5ac3..1c6211d83 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -29,6 +29,9 @@ config ADK_TARGET_WITH_PP
 config ADK_TARGET_WITH_CARDBUS
 	bool
 
+config ADK_TARGET_WITH_WATCHDOG
+	bool
+
 config ADK_TOOLCHAIN_ONLY
 	bool
 
@@ -56,6 +59,30 @@ config ADK_alix2d13
 config ADK_wrap
 	tristate
 
+config ADK_arm_toolchain
+	tristate
+
+config ADK_armel_toolchain
+	tristate
+
+config ADK_mips_toolchain
+	tristate
+
+config ADK_mipsel_toolchain
+	tristate
+
+config ADK_ppc_toolchain
+	tristate
+
+config ADK_sparc_toolchain
+	tristate
+
+config ADK_x86_toolchain
+	tristate
+
+config ADK_x86_64_toolchain
+	tristate
+
 config ADK_arm_qemu
 	tristate
 
@@ -92,9 +119,6 @@ config ADK_rb433
 config ADK_zaurus
 	tristate
 
-config ADK_tomtom
-	tristate
-
 config ADK_foxboard
 	tristate
 
@@ -122,21 +146,24 @@ config ADK_wag54g
 config ADK_shuttle
 	tristate
 
-config ADK_g1
-	tristate
-
 config ADK_TARGET
 	string
 	default "alix1c"  if ADK_alix1c
 	default "alix2d"  if ADK_alix2d
 	default "alix2d13"  if ADK_alix2d13
 	default "wrap"  if ADK_wrap
+	default "toolchain-arm"  if ADK_arm_toolchain
+	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 "toolchain-x86"  if ADK_x86_toolchain
+	default "toolchain-x86_64"  if ADK_x86_64_toolchain
 	default "qemu-arm"  if ADK_arm_qemu
 	default "qemu-cris"  if ADK_cris_qemu
 	default "qemu-mips"  if ADK_mips_qemu
 	default "qemu-mipsel"  if ADK_mipsel_qemu
-	default "qemu-mips64"  if ADK_mips64_qemu
-	default "qemu-mips64el"  if ADK_mips64el_qemu
 	default "qemu-x86"  if ADK_x86_qemu
 	default "qemu-x86_64"  if ADK_x86_64_qemu
 	default "foxboard"  if ADK_foxboard
@@ -153,8 +180,6 @@ config ADK_TARGET
 	default "rescue-mips"  if ADK_mips_rescue
 	default "rescue-mipsel"  if ADK_mipsel_rescue
 	default "shuttle"  if ADK_shuttle
-	default "tomtom"  if ADK_tomtom
-	default "g1"  if ADK_g1
 
 # c library
 config ADK_uclibc
@@ -171,6 +196,7 @@ config ADK_LIBC
 	default "uclibc"  if ADK_uclibc
 	default "eglibc"  if ADK_eglibc
 	default "glibc"  if ADK_glibc
+	default "native"  if ADK_NATIVE
 
 menu "Target system"
 
@@ -186,85 +212,11 @@ config ADK_LINUX_NATIVE
 	  Make a native build. Use host tools.
 	  No toolchain will be created.
 
-config ADK_LINUX_X86_ALIX1C
-	bool "PC Engines Alix1C"
-	select ADK_alix1c
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select ADK_KERNEL_WATCHDOG
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_INPUT
+config ADK_LINUX_ALIX
+	bool "ALIX and WRAP boards"
 	help
-	  Support for ALIX1C boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_ALIX2D
-	bool "PC Engines Alix2D"
-	select ADK_alix2d
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_LEDS
-	help
-	  Support for ALIX2D boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_ALIX2D13
-	bool "PC Engines Alix2D13"
-	select ADK_alix2d13
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NEW_LEDS
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_LEDS
-	help
-	  Support for ALIX2D13 boards.
-	  http://www.pcengines.ch/
-	  Status: stable
-
-config ADK_LINUX_X86_WRAP
-	bool "PC Engines WRAP"
-	select ADK_wrap
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_NET_PCI
-	select ADK_KERNEL_NETDEVICES
-	select ADK_KERNEL_NET_ETHERNET
-	select ADK_KERNEL_MII
-	select BUSYBOX_HWCLOCK
-	help
-	  End of life, but I still have one board.
-	  http://www.pcengines.ch/
-	  Status: stable
+	  Support for Alix and Wrap boards.
+	  http://www.pcengines.ch
 
 config ADK_LINUX_CRIS_FOXBOARD
 	bool "Foxboard (ETRAX LX100)"
@@ -330,30 +282,6 @@ config ADK_LINUX_MIPS_AG241
 	  (Texas Instruments AR7 platform)
 	  Status: stable
 
-config ADK_LINUX_ARM_TOMTOM
-	bool "TomTom Applications"
-	select ADK_tomtom
-	select ADK_TARGET_NO_FPU
-	select ADK_EABI
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Support for TomTom Rider 2 (or others).
-	  Just toolchain support to cross-compile your own
-	  applications. 
-	  Status: toolchain only
-
-config ADK_LINUX_ARM_G1
-	bool "Google G1 Applications"
-	select ADK_g1
-	select ADK_TARGET_NO_FPU
-	select ADK_EABI
-	select ADK_TOOLCHAIN_ONLY
-	help
-	  Support for Google G1.
-	  Just toolchain support to cross-compile your own
-	  applications. Use static linking for your packages.
-	  Status: toolchain only
-
 config ADK_LINUX_XSCALE_ZAURUS
 	bool "Zaurus SL-C3200"
 	select ADK_zaurus
@@ -381,6 +309,11 @@ config ADK_LINUX_QEMU
 	help
 	 Support for Qemu Emulator
 
+config ADK_LINUX_TOOLCHAIN
+	bool "Toolchain only support"
+	help
+	 Toolchain only support
+
 config ADK_LINUX_X86_64_SHUTTLE
 	bool "Shuttle PC"
 	select ADK_shuttle
@@ -441,6 +374,92 @@ endchoice
 
 choice
 prompt "Architecture"
+depends on ADK_LINUX_TOOLCHAIN
+
+config ADK_LINUX_ARM_TOOLCHAIN
+	bool "ARM BE Toolchain"
+	select ADK_arm_toolchain
+	select ADK_TARGET_NO_FPU
+	select ADK_EABI
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  Status: toolchain only
+
+config ADK_LINUX_ARMEL_TOOLCHAIN
+	bool "ARM LE Toolchain"
+	select ADK_armel_toolchain
+	select ADK_TARGET_NO_FPU
+	select ADK_EABI
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  Status: toolchain only
+
+config ADK_LINUX_MIPS_TOOLCHAIN
+	bool "MIPS BE Toolchain (32 Bit)"
+	select ADK_mips_toolchain
+	select ADK_TOOLCHAIN_ONLY
+	help
+	  Status: toolchain only
+
+config ADK_LINUX_MIPSEL_TOOLCHAIN
+	bool "MIPS EL Toolchain (32 Bit)"
+	select ADK_mipsel_toolchain
+	select ADK_TOOLCHAIN_ONLY
+	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_TOOLCHAIN
+	bool "X86 Toolchain (32 Bit)"
+	select ADK_x86_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 
+prompt "Target Optimization"
+depends on ADK_LINUX_ARMEL_TOOLCHAIN || ADK_LINUX_ARM_TOOLCHAIN
+
+config ADK_LINUX_ARM_V5TE
+	bool "armv5te"
+	help
+
+config ADK_LINUX_ARM_V4T
+	bool "armv4t"
+	help
+
+endchoice
+
+config ADK_TARGET_ARCH_OPTIMIZATION
+	string
+	default "armv5te" if ADK_LINUX_ARM_V5TE
+	default "armv4t" if ADK_LINUX_ARM_V4T
+
+choice
+prompt "Architecture"
 depends on ADK_LINUX_QEMU
 
 config ADK_LINUX_ARM_QEMU
@@ -470,6 +489,7 @@ config ADK_LINUX_MIPS64_QEMU
 	bool "mips64 (big endian)"
 	select ADK_mips64_qemu
 	select ADK_LINUX_64
+	depends on ADK_BROKEN
 	help
 	 Qemu support for MIPS64 BE architecture.
 	 Status: development
@@ -478,6 +498,7 @@ config ADK_LINUX_MIPS64EL_QEMU
 	bool "mips64 (little endian)"
 	select ADK_mips64el_qemu
 	select ADK_LINUX_64
+	depends on ADK_BROKEN
 	help
 	 Qemu support for MIPS64 LE architecture.
 	 Status: development
@@ -497,6 +518,7 @@ config ADK_LINUX_X86_QEMU
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_CRC32
 	select ADK_TARGET_WITH_VGA
 	help
 	 Qemu support for x86 architecture.
@@ -518,6 +540,93 @@ config ADK_LINUX_X86_64_QEMU
 endchoice
 
 choice
+prompt "Alix/Wrap model"
+default ADK_LINUX_X86_ALIX1C
+depends on ADK_LINUX_ALIX
+
+config ADK_LINUX_X86_ALIX1C
+	bool "PC Engines Alix1C"
+	select ADK_alix1c
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select BUSYBOX_HWCLOCK
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_INPUT
+	help
+	  Support for ALIX1C boards.
+	  http://www.pcengines.ch/
+	  Status: stable
+
+config ADK_LINUX_X86_ALIX2D
+	bool "PC Engines Alix2D"
+	select ADK_alix2d
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select BUSYBOX_HWCLOCK
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_LEDS
+	select ADK_TARGET_WITH_WATCHDOG
+	help
+	  Support for ALIX2D boards.
+	  http://www.pcengines.ch/
+	  Status: stable
+
+config ADK_LINUX_X86_ALIX2D13
+	bool "PC Engines Alix2D13"
+	select ADK_alix2d13
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NEW_LEDS
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select BUSYBOX_HWCLOCK
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_LEDS
+	help
+	  Support for ALIX2D13 boards.
+	  http://www.pcengines.ch/
+	  Status: stable
+
+config ADK_LINUX_X86_WRAP
+	bool "PC Engines WRAP"
+	select ADK_wrap
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_ATA
+	select ADK_KERNEL_BLK_DEV_SD
+	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_NET_PCI
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_MII
+	select BUSYBOX_HWCLOCK
+	help
+	  End of life, but I still have one board.
+	  http://www.pcengines.ch/
+	  Status: stable
+
+endchoice
+
+choice
 prompt "Routerboard model"
 default ADK_LINUX_MIPS_RB433
 depends on ADK_LINUX_MIKROTIK
@@ -553,9 +662,12 @@ config ADK_LINUX_MIPS_RB532
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
+	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_EXT2_FS
 	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_WATCHDOG
 	help
 	 Support for Mikrotik RB532.
 	 Status: stable
@@ -589,7 +701,7 @@ depends on ! ADK_NATIVE
 config ADK_TARGET_LIB_UCLIBC
 	bool "uClibc embedded C library"
 	# broken, because of 16kB pagesize
-	depends on !ADK_LINUX_MIPS64_LEMOTE
+	#depends on !ADK_LINUX_MIPS64_LEMOTE
 	select ADK_uclibc
 	help
  	 http://uclibc.org
@@ -615,7 +727,8 @@ config ADK_TARGET_LIB_EGLIBC
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_ARM_TOMTOM || \
 		ADK_LINUX_ARM_G1 || \
-		ADK_LINUX_MIPS64_LEMOTE
+		ADK_LINUX_MIPS64_LEMOTE || \
+		ADK_LINUX_TOOLCHAIN 
 	help
 	 http://www.eglibc.org
 
@@ -639,7 +752,8 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_ARM_TOMTOM || \
 		ADK_LINUX_ARM_G1 || \
-		ADK_LINUX_MIPS64_LEMOTE
+		ADK_LINUX_MIPS64_LEMOTE || \
+		ADK_LINUX_TOOLCHAIN 
 	help
 	 http://www.gnu.org/libc
 
@@ -652,7 +766,6 @@ config ADK_TARGET_SUFFIX
 	default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI
 	default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI
 
-
 choice
 prompt "Target Firmware type"
 	depends on !ADK_TOOLCHAIN_ONLY
@@ -712,6 +825,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 		ADK_LINUX_MIPS_WAG54G || \
 		ADK_LINUX_MIPS_AG241 || \
 		ADK_LINUX_MIPS64_LEMOTE
+	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_NFS_FS
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_ROOT_NFS
@@ -812,6 +926,33 @@ config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 
 endchoice
 
+choice
+prompt "Compression method for Kernel"
+	depends on ADK_LINUX_QEMU || ADK_LINUX_ALIX
+	
+config ADK_TARGET_KERNEL_COMPRESSION_GZIP
+	boolean
+	prompt "gzip"
+	select ADK_KERNEL_KERNEL_GZIP
+	help
+	  Select gzip compression for Kernel.
+
+config ADK_TARGET_KERNEL_COMPRESSION_BZIP2
+	boolean
+	prompt "bzip2"
+	select ADK_KERNEL_KERNEL_BZIP2
+	help
+	  Select BZIP2 compression for Kernel.
+
+config ADK_TARGET_KERNEL_COMPRESSION_LZMA
+	boolean
+	prompt "lzma"
+	select ADK_KERNEL_KERNEL_LZMA
+	help
+	  Select LZMA compression for Kernel.
+
+endchoice
+
 config ADK_COMPRESSION_TOOL
 	string
 	default "gzip -n9" if ADK_TARGET_INITRAMFS_COMPRESSION_GZIP
@@ -819,7 +960,6 @@ config ADK_COMPRESSION_TOOL
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	help
 
-
 choice
 prompt "Root filesystem type"
 	depends on ADK_TARGET_ROOTFS_ARCHIVE
@@ -867,7 +1007,7 @@ config ADK_PACKAGE_SUFFIX
 	string
 	default "ipk" if ADK_TARGET_PACKAGE_IPKG
 	default "tar.gz" if ADK_TARGET_PACKAGE_TGZ
-	default "rpm" if ADK_TARGET_PACKAGE_RPM
+#	default "rpm" if ADK_TARGET_PACKAGE_RPM
 	help
 
 choice
@@ -891,13 +1031,12 @@ config ADK_TARGET_PACKAGE_TGZ
 	  directory. There will be no package manager installed onto the target.
 	  
 
-config ADK_TARGET_PACKAGE_RPM
-	boolean
-	prompt "rpm package format"
-	help
-	  Create rpm packages and use rpm package management on the
-          target. WARNING: NOT YET IMPLEMENTED
+#config ADK_TARGET_PACKAGE_RPM
+#	boolean
+#	prompt "rpm package format"
+#	help
+#	  Create rpm packages and use rpm package management on the
+#         target. WARNING: NOT YET IMPLEMENTED
 
 endchoice
-
 endmenu