summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-07-27 15:04:16 +0000
committerThomas Kunze <thommycheck@gmx.de>2008-07-27 15:04:16 +0000
commitbe5fab607dec7bf7f9c69208cdc2ff98ef354357 (patch)
treed1a81a99ee4310bc3078ea9c684b88df67511b8c /conf/machine
parent84e1dfca874acce93d66951a9203353d76964246 (diff)
collie.conf: -make collie also use device-table with mmc added
-collie kernels are not checked for size now -other minor stuff zaurus-2.6.inc: -add kernel to rootfs for collie -change do_installkit accordingly
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/collie.conf14
-rw-r--r--conf/machine/include/zaurus-2.6.inc10
2 files changed, 20 insertions, 4 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 5170f8993e..3914184a22 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -8,11 +8,19 @@ MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
require conf/machine/include/tune-strongarm.inc
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-IMAGE_LINGUAS = ""
+EXTRA_IMAGECMD_jffs2 ?= "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+IMAGE_LINGUAS ?= ""
IMAGE_FSTYPES ?= "jffs2 tar.gz"
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
+
+# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
+DONT_CHECK_KERNELSIZE ?= "1"
+
+IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt \
+ files/device_table_add-mmc.txt"
+
+XSERVER ?= "xserver-kdrive-fbdev"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index c7e6d46872..4bea25a0ed 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -51,7 +51,13 @@ zaurus_make_installkit () {
mkdir ${IMAGE_NAME}-installkit/
# Get the latest kernel using the zImage-<machine>.bin symlink
- cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+ if [ "${MACHINE}" = "collie" ]; then
+ [ -f "zImage-${MACHINE}-kexecboot.bin" ] && cp zImage-${MACHINE}-kexecboot.bin ${IMAGE_NAME}-installkit/zImage
+ # we need also tgz for mmc or cf cards
+ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+ else
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+ fi
if [ "${MACHINE}" = "spitz" ]; then
cp gnu-tar ${IMAGE_NAME}-installkit/
@@ -72,4 +78,6 @@ zaurus_make_installkit () {
# Don't include kernels in standard images for Zaurus machines
RDEPENDS_kernel-base = ""
+# collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it.
+RDEPENDS_kernel-base_collie = "kernel-image"
KERNEL_IMAGETYPE = "zImage"