14 files changed, 30 insertions, 21 deletions
diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
new file mode 100644
index 0000000000..7898f7b349
--- /dev/null
+++ b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc
@@ -0,0 +1,6 @@
+# Opie
+#use 1337 mt version of opie to have a webbrowser
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+QTE_VERSION = "2.3.10"
+OPIE_VERSION = "1.2.2"
+require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
index 029246a8c2..468c2ebd7d 100644
--- a/conf/machine/devkitidp-pxa255.conf
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -5,12 +5,12 @@
 TARGET_ARCH = "arm"
 
 GUI_MACHINE_CLASS = "bigscreen"
-PACKAGE_EXTRA_ARCHS = "armv5te"
+PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
-PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_VERSION_u-boot = "1.1.6"
+UBOOT_MACHINE = "pxa255_idp_config"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,4 +20,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
 
+MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
+MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 0f18728087..72c2d33713 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index da8a58329a..6c43e75625 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 #Compile with armv5te optimizations, incompatible with armv4(t) cpus
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index eb0b6d40e6..a440078cb7 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 ipaqsa"
+PACKAGE_EXTRA_ARCHS = "armv4 "
 
 require conf/machine/include/tune-strongarm.conf
 
@@ -30,7 +30,7 @@ MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
                              kernel-module-micro"
 
-EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 
 
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 323aa8f061..32b6a8ea8a 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 3eaa96b327..2a34333bac 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c0c9b2fefe..ecc2e679d9 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index a61656ab5c..11f0e7e54f 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 0cb51ce383..d75a573f65 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.conf
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 0f8ed6ed82..843e26bed0 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 900da400b0..ffffc3a569 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU 
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 53903f7982..482c8c0d8a 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
@@ -39,10 +39,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \
 				kernel-module-hx4700-acx \
 				kernel-module-snd-hx4700-audio"
 
-
+#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there
 EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-			  -e 256KiB -p"
+			  -e 256KiB -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
+
 
 #
 # Modules autoload and other boot properties
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index e16a46c619..4e6c9a625a 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf