merge of '55c714e37be4606a4166b3df883d5f404d3889bf'

     and 'd714000fc8a6b75093a93f01782724b65d31eac1'

1 files changed, 46 insertions, 0 deletions

diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
new file mode 100644
index 0000000000..211091d929
--- /dev/null
+++ b/conf/machine/er0100.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: iRex Iliad e-ink reader
+#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader
+
+#
+# Hardware-based properties
+#
+
+# CPU: Intel (now Marvell) PXA255
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Fix us:
+
+#ROOT_FLASH_SIZE = "80"
+#VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "768"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "1024"
+MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-er0100"
+PCMCIA_MANAGER = "pcmcia-cs"
+MODUTILS = "24"	
+XSERVER = "xserver-kdrive-fbdev"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_pcmcia = "pcmcia"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+USE_VT = "0"
+SERIAL_CONSOLE = "-L ttyS2 115200 vt100"
+