4 files changed, 26 insertions, 1 deletions
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 03115118ed..533b41526b 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -25,7 +25,8 @@ INHERIT += "debian multimachine"
 INHERIT += "package_ipk"
 IMAGE_FSTYPES = "jffs2 tar.gz"
 OPENPROTIUM_URI = "http://www.openprotium.org"
-FEED_ARCH ?= ${PACKAGE_ARCH}
+FEED_ARCH_storcenter = ppc603e
+FEED_ARCH_turbostation = ppc603e
 FEED_URIS = "\
 	no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \
 	base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \
diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf
new file mode 100644
index 0000000000..1e36ddcfc7
--- /dev/null
+++ b/conf/machine/chumby.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Chumby
+#@DESCRIPTION: Machine configuration for the Chumby
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "38400 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 45fc16dc29..4e36c6d38a 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -12,6 +12,8 @@ XSERVER = "xserver-kdrive-xomap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index 58ddb25744..144df2ed08 100644
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
 XSERVER = "xserver-kdrive-xomap"
 
 GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 TARGET_FPU = "hard"
 include conf/machine/include/tune-arm1136jf-s.inc