6 files changed, 7 insertions, 13 deletions
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index ecfd2d4fee..f82d446d68 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "avr32"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 3b06e8fcf7..fdf4dafdf8 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r25" 
+MACHINE_KERNEL_PR = "r26" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 714380e9aa..cc58c4a48b 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,7 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "0xA0008000"
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 99d92d5512..16d28ba6a3 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -28,11 +28,4 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-
-#UBOOT_ARCH = "arm"
-#UBOOT_MACHINE = "omap3_pandora_config"
-
-#EXTRA_IMAGEDEPENDS += "u-boot-omap3 x-load"
-
-
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi"
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
index cb32539928..a703a898d0 100644
--- a/conf/machine/overo.conf
+++ b/conf/machine/overo.conf
@@ -12,7 +12,6 @@ UBOOT_MACHINE_overo = "omap3_overo_config"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 IMAGE_FSTYPES += "tar.bz2"
-EXTRA_IMAGEDEPENDS += " u-boot-omap3 x-load"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 272c0dca1c..f81ade3d2e 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
                            kernel-module-pxa27x-keyboard \
-                           kernel-module-wm97xx-ts"
+                           kernel-module-wm97xx-ts \
+			   "
+
+MACHINE_EXTRA_RDEPENDS += "palmt650-keyboard-modmap"
 
 module_autoload_g_ether = "g_ether"