summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-07-19 22:40:02 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-07-19 22:40:02 +0000
commit5ba491d8e43f191d8543f59057fd00a211aa6217 (patch)
tree5b998d3460f899326028acd9379943f54ba82b88 /conf
parent0fed4443d244760bf7879685d85ea5763ff7bb82 (diff)
parent2e747d3e035660f279e778c606d8f3fd8845feba (diff)
merge of '2d7a4954a028d357fdb005ec7dc50e56f4e997f4'
and 'cde22aa5c39460e2787e0255619a9416ebfb680d'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/machine/compulab-pxa270.conf2
-rw-r--r--conf/machine/spitz.conf5
3 files changed, 7 insertions, 2 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index c2970d2b99..bb1605e41b 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index dab556006b..063a68481a 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -21,7 +21,7 @@ ROOT_FLASH_SIZE ?= "32"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
- -e 0x20000 -p\
+ -e 0x20000 -p; \
cd ${DEPLOY_DIR_IMAGE}; \
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 6b08ec1aa9..81c789dcc4 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -11,3 +11,8 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt"
IMAGE_FSTYPES += "tar.gz"
ROOT_FLASH_SIZE = "100"
+
+MACHINE_GUI_CLASS=bigscreen
+MACHINE_DISPLAY_WIDTH_PIXELS=480
+MACHINE_DISPLAY_HEIGHT_PIXELS=640
+MACHINE_DISPLAY_ORIENTATION=270