merge of '3fa76fd2a4646a878f0810156dec4b7da94c14f2'

     and 'ee31c6e3fc63b93eae8552042728645a8206cf1c'

14 files changed, 93 insertions, 51 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 3182fa7d77..9cbb19cd2d 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -6,9 +6,9 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.1"
+#DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "15"
+DISTRO_REVISION = "19"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -50,6 +50,10 @@ FEED_ARCH_tosa		= "armv5te"
 FEED_ARCH_guinness	= "i686"
 FEED_ARCH_progear	= "i686"
 
+#powerpc machines
+
+FEED_ARCH_efika		= "ppc603e"
+
 FEED_URIS += " \
 		no-arch##${ANGSTROM_URI}/unstable/feed/all \
 		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
@@ -132,12 +136,9 @@ PREFERRED_PROVIDER_ntp = "ntp"
 PREFERRED_PROVIDER_hotplug = "udev"
 PREFERRED_PROVIDER_libxss = "libxss"
 
-#Machine related toolchain stuff
-ARCH_BYTE_SEX_ixp4xx = "le"
-
 
 #EABI stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 
@@ -155,12 +156,14 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
 PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 
 PREFERRED_VERSION_glibc ?= "2.5"
 
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.5"
 
 # To use an EABI compatible version 3 series gcc, either uncomment 
 # the lines below or set them in local.conf: 
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 0b333e2f01..0bcdac1db5 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # Add modules required for usb support
 DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-usbcore \
 kernel-module-ohci-hcd \
-kernel-module-ehci-hcd \
 kernel-module-uhci-hcd \
-kernel-module-scsi-mod \
-kernel-module-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7f0546c271..c057d1a05e 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -22,7 +22,7 @@ MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 
 #use ipkg package format with debian style naming
 #use multimachine buildrules 
-INHERIT += "package_ipk debian multimachine sanity devshell"
+INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors"
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
diff --git a/conf/distro/include/ludeos-packages.inc b/conf/distro/include/ludeos-packages.inc
deleted file mode 100644
index f88d593a17..0000000000
--- a/conf/distro/include/ludeos-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = ""
-require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index fd57eb8cf9..3c4dc11bb8 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -81,7 +81,8 @@ TARGET_OS = "linux"
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
 #<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools"
+DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \
+                         parted dialog"
 
 
 #<>------------------------------------------------------------------>
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 55a6942a4f..dec16d8cd7 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # Add modules required for usb support
 OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-usbcore \
 kernel-module-ohci-hcd \
-kernel-module-ehci-hcd \
 kernel-module-uhci-hcd \
-kernel-module-scsi-mod \
-kernel-module-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 7270e52484..38ec778b7a 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -16,6 +16,7 @@ TARGET_FPU = ""
 TARGET_ARCH = "arm"
 TARGET_CC_ARCH = "-march=armv4"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2"
+FULL_OPTIMIZATION_pn-fetchmail = "-fexpensive-optimizations -fomit-frame-pointer -O1"
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 # prebuilt toolchain doesn't know about -isystem
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index eae1a3433d..ffd114ace4 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -1,20 +1,15 @@
+#@TYPE: Machine
+#@Name: DHT-Walnut Development Platform
+#@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
+
 TARGET_ARCH = "powerpc"
 PACKAGE_ARCHS = "all powerpc ${MACHINE}"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-dht-walnut"
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
-#TARGET_FPU = "soft"
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.9"
 
-# TARGET_VENDOR = "-oe"
-
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev"
-
-udevdir = "/dev"
-OLDEST_KERNEL = "2.6.5"
-# GLIBC_ADDONS = "nptl"
-# GLIBC_EXTRA_OECONF = "--with-tls"
-
+#tune for the 405 cpu
+include conf/machine/include/tune-ppc405.conf
 
diff --git a/conf/machine/include/tune-ppc405.conf b/conf/machine/include/tune-ppc405.conf
new file mode 100644
index 0000000000..cf8f58c115
--- /dev/null
+++ b/conf/machine/include/tune-ppc405.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=405"
+PACKAGE_ARCH = "ppc405"
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
index dc174b8e35..6d7fd11a05 100644
--- a/conf/machine/ixp4xx.conf
+++ b/conf/machine/ixp4xx.conf
@@ -7,3 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 include conf/machine/include/ixp4xx.conf
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
new file mode 100644
index 0000000000..5108623750
--- /dev/null
+++ b/conf/machine/ixp4xxbe.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Generic IXP4XX kernel
+#@DESCRIPTION: Machine configuration for a generic ixp4xx board in bigendian mode
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
+ARCH_BYTE_SEX = "be"
+include conf/machine/include/ixp4xx.conf
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 --faketime -n"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
new file mode 100644
index 0000000000..ac62d669e5
--- /dev/null
+++ b/conf/machine/ixp4xxle.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: Generic IXP4XX kernel
+#@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+
+ARCH_BYTE_SEX = "le"
+include conf/machine/include/ixp4xx.conf
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
+
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
deleted file mode 100644
index 29a3b04f5f..0000000000
--- a/conf/machine/nas100d.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Iomega NAS 100d
-#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
-
-include conf/machine/include/ixp4xx.conf
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
new file mode 100644
index 0000000000..c0324c887d
--- /dev/null
+++ b/conf/machine/rx3000.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: HP iPAQ rx3xxx
+#@DESCRIPTION: Machine configuration for the HP iPAQ rx3xxx
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+# Samsung S3C2xxx CPU
+include conf/machine/include/tune-arm920t.conf
+
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.conf