merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'

     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'

9 files changed, 22 insertions, 9 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 77d6c1ee83..e305dc3251 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -246,6 +246,7 @@ export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
 export OBJCOPY = "${HOST_PREFIX}objcopy"
 export OBJDUMP = "${HOST_PREFIX}objdump"
+PYTHON = "${@sys.executable}"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
 export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
@@ -462,6 +463,10 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
 
+# Forcefully set CACHE now so future changes to things like 
+# MACHINE don't change the path to the cache
+CACHE := "${CACHE}"
+
 ##################################################################
 # Magic Cookie for SANITY CHECK
 ##################################################################
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index da946d4784..1f39916f4f 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070212"
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf
index 565f37b43f..821ebc4c03 100644
--- a/conf/machine/include/palm.conf
+++ b/conf/machine/include/palm.conf
@@ -41,7 +41,6 @@ module_autoload_pcmcia = "pcmcia"
 module_autoload_pcmcia_core = "pcmcia-core"
 module_autoload_pda_power = "pda_power"
 module_autoload_pxa2xx_core = "pxa2xx-core"
-module_autoload_pxapwm_bl = "pxapwm_bl"
 module_autoload_snd = "snd"
 module_autoload_snd-ac97-codec = "snd-ac97-codec"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 7adb352ba4..3d1d90fbd8 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -24,7 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 	kernel-module-pcmcia-core \
 	kernel-module-pda-power \
 	kernel-module-pxa2xx-core \
-	kernel-module-pxapwm-bl \
 	kernel-module-snd-pxa2xx-ac97 \
 	kernel-module-snd-pxa2xx-pcm \
 	"
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 46e5fafdb5..4d1032dae8 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -10,8 +10,8 @@ SERIAL_CONSOLE = "115200 ttyS1"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
-                           kernel-module-pxapwm-bl \
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
+                           kernel-module-pxa27x-keyboard \
                            kernel-module-wm97xx-ts"
 
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf
new file mode 100644
index 0000000000..b5e8aebb54
--- /dev/null
+++ b/conf/machine/palmt680.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Palm Treo 680
+#@DESCRIPTION: Machine configuration for the Palm TX
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts"
diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf
index f4fcb405c5..b1139c21fa 100644
--- a/conf/machine/palmtc.conf
+++ b/conf/machine/palmtc.conf
@@ -12,5 +12,3 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxapwm-bl"
-
diff --git a/conf/machine/palmtt5.conf b/conf/machine/palmtt5.conf
index aedaf4ba30..d2de3fa87b 100644
--- a/conf/machine/palmtt5.conf
+++ b/conf/machine/palmtt5.conf
@@ -11,6 +11,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 GUI_MACHINE_CLASS = "bigscreen"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
-                           kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts \
 			   kernel-module-palmt5-battery"
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
index d9b934a306..9f1f079cdc 100644
--- a/conf/machine/palmtx.conf
+++ b/conf/machine/palmtx.conf
@@ -14,6 +14,5 @@ ROOT_FLASH_SIZE = "100"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
-                           kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts \
                            kernel-module-palmtx-battery"