6 files changed, 8 insertions, 1 deletions
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6862a8095f..20fc2fb873 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -10,5 +10,5 @@ IMAGE_FSTYPES ?= "jffs2"
 ROOT_FLASH_SIZE = "25"
 # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
 
-XSERVER = "xserver-kdrive-w100"
+XSERVER = "xserver-kdrive-imageon"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 0ca65b79a9..146ecf9495 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+UBOOT_ENTRYPOINT = "0"
 
 MACHINE_FEATURES = "kernel26 ext2"
 MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index cc604a0ada..f3c70c56a7 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index c9e1e73814..d18e5e8b8b 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -8,6 +8,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index a9702cfce2..aa9046ee5d 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -67,3 +67,6 @@ zaurus_make_installkit () {
     md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
+
+# Don't include kernels in standard images for Zaurus machines
+RDEPENDS_kernel-base = ""
+\ No newline at end of file
diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf
index 0f7419f80b..199adb515f 100644
--- a/conf/machine/smdk2443.conf
+++ b/conf/machine/smdk2443.conf
@@ -7,6 +7,7 @@ TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443"
+UBOOT_ENTRYPOINT = "30008000"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySAC0"