[oe-commits] org.oe.dev merge of '1401e62254aef0a87a8ce5b685e66d1eb00359e3'
koen commit
openembedded-commits at lists.openembedded.org
Mon Oct 1 13:04:57 UTC 2007
merge of '1401e62254aef0a87a8ce5b685e66d1eb00359e3'
and '782254b73af8b1a6dcd10f60816bb473eaf366a0'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c723d3021982e983a448b3d76081aa584113b4bf
ViewMTN: http://monotone.openembedded.org/revision/info/c723d3021982e983a448b3d76081aa584113b4bf
Files:
1
conf/machine/er0100.conf
conf/machine/akita.conf
conf/machine/htcuniversal.conf
conf/machine/hx4700.conf
conf/machine/include/motorola-ezx-base.inc
conf/machine/magician.conf
conf/machine/palmld.conf
conf/machine/rokre2.conf
conf/machine/rokre6.conf
conf/machine/spitz.conf
Diffs:
#
# mt diff -r1401e62254aef0a87a8ce5b685e66d1eb00359e3 -rc723d3021982e983a448b3d76081aa584113b4bf
#
#
#
# add_file "conf/machine/er0100.conf"
# content [570f149fb1fe2a7a357447a40ec4436bdf7a83dd]
#
============================================================
--- conf/machine/er0100.conf 570f149fb1fe2a7a357447a40ec4436bdf7a83dd
+++ conf/machine/er0100.conf 570f149fb1fe2a7a357447a40ec4436bdf7a83dd
@@ -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.conf
+
+# 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"
+
#
# mt diff -r782254b73af8b1a6dcd10f60816bb473eaf366a0 -rc723d3021982e983a448b3d76081aa584113b4bf
#
#
#
# patch "conf/machine/akita.conf"
# from [d78f90a2a5e1ad9b362e5152e6132f227e1e8839]
# to [9b0f2249c3421c2371583ca663039e640ed69a34]
#
# patch "conf/machine/htcuniversal.conf"
# from [43f093279581726335ce51c61212c3e9e06fab8d]
# to [b9678e7e01aac968b7e658323a6544aaecf39abb]
#
# patch "conf/machine/hx4700.conf"
# from [179a54e56304f0ee92e6d3fb8e9df9d6cc4d9eed]
# to [ff48628632c761276f1e19ddd62582b88b0b19ef]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [b15c44e8a69d78f98777ef55046a1a3e8914d80f]
# to [f5993e521de6d914bfbeae8f9176fb7d1f227f3c]
#
# patch "conf/machine/magician.conf"
# from [8fdf0542994a9fd288727dc5edcbfdf644e0e5a6]
# to [4266fe41e816fc7ff187a9504cb52b6064f20fb9]
#
# patch "conf/machine/palmld.conf"
# from [4783dfab0f1d64a89606fbec3e0289176735ec3d]
# to [66a0b58da6cfebf45232bf38a02a9c20cfd91732]
#
# patch "conf/machine/rokre2.conf"
# from [88c317268af239bc9fcc109e27a2f5803fa232a0]
# to [7c7c12dab9de76acd435f84f001dc087216c0e62]
#
# patch "conf/machine/rokre6.conf"
# from [ece99da8e7ed762f80283fa0d3bb0bff732d8418]
# to [45986388fa89ee5a5b0fde33b4ce59348584e942]
#
# patch "conf/machine/spitz.conf"
# from [f3d290ba190219e5b8c3accc84c10a6b44980827]
# to [eac3637cf485585570f8a6fa0876727d7c01f30d]
#
============================================================
--- conf/machine/akita.conf d78f90a2a5e1ad9b362e5152e6132f227e1e8839
+++ conf/machine/akita.conf 9b0f2249c3421c2371583ca663039e640ed69a34
@@ -6,6 +6,8 @@ PACKAGE_EXTRA_ARCHS += "iwmmxt"
require conf/machine/include/zaurus-clamshell.inc
PACKAGE_EXTRA_ARCHS += "iwmmxt"
+MACHINE_FEATURES += "iwmmxt"
+
IMAGE_FSTYPES ?= "jffs2"
ROOT_FLASH_SIZE = "58"
============================================================
--- conf/machine/htcuniversal.conf 43f093279581726335ce51c61212c3e9e06fab8d
+++ conf/machine/htcuniversal.conf b9678e7e01aac968b7e658323a6544aaecf39abb
@@ -18,6 +18,7 @@ MACHINE_FEATURES = "kernel26 apm alsa ir
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
+MACHINE_FEATURES += "iwmmxt"
#
# Software/packages selection
============================================================
--- conf/machine/hx4700.conf 179a54e56304f0ee92e6d3fb8e9df9d6cc4d9eed
+++ conf/machine/hx4700.conf ff48628632c761276f1e19ddd62582b88b0b19ef
@@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+MACHINE_FEATURES += "iwmmxt"
#
# Software/packages selection
============================================================
--- conf/machine/include/motorola-ezx-base.inc b15c44e8a69d78f98777ef55046a1a3e8914d80f
+++ conf/machine/include/motorola-ezx-base.inc f5993e521de6d914bfbeae8f9176fb7d1f227f3c
@@ -12,6 +12,9 @@ MACHINE_FEATURES = "kernel26 touchscreen
#mtd3: 00020000 00020000 "Logo"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
+
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_ORIENTATION = "0"
============================================================
--- conf/machine/magician.conf 8fdf0542994a9fd288727dc5edcbfdf644e0e5a6
+++ conf/machine/magician.conf 4266fe41e816fc7ff187a9504cb52b6064f20fb9
@@ -20,7 +20,9 @@ MACHINE_FEATURES = "alsa apm bluetooth i
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+MACHINE_FEATURES += "iwmmxt"
+
#
# We don't support jffs2 installations (yet).
#
============================================================
--- conf/machine/palmld.conf 4783dfab0f1d64a89606fbec3e0289176735ec3d
+++ conf/machine/palmld.conf 66a0b58da6cfebf45232bf38a02a9c20cfd91732
@@ -10,6 +10,7 @@ MACHINE_FEATURES += "pcmcia wifi"
MACHINE_DISPLAY_WIDTH_PIXELS = "320"
MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
MACHINE_FEATURES += "pcmcia wifi"
+MACHINE_FEATURES += "iwmmxt"
MACHINE_EXTRA_RRECOMMENDS += "\
============================================================
--- conf/machine/rokre2.conf 88c317268af239bc9fcc109e27a2f5803fa232a0
+++ conf/machine/rokre2.conf 7c7c12dab9de76acd435f84f001dc087216c0e62
@@ -6,3 +6,5 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
# there is no touchscreen
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
============================================================
--- conf/machine/rokre6.conf ece99da8e7ed762f80283fa0d3bb0bff732d8418
+++ conf/machine/rokre6.conf 45986388fa89ee5a5b0fde33b4ce59348584e942
@@ -1,8 +1,6 @@ require conf/machine/include/motorola-ez
#@TYPE: Machine
#@NAME: Motorola EZX ROKR E6
#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6
require conf/machine/include/motorola-ezx-base.inc
-# there is no touchscreen
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
============================================================
--- conf/machine/spitz.conf f3d290ba190219e5b8c3accc84c10a6b44980827
+++ conf/machine/spitz.conf eac3637cf485585570f8a6fa0876727d7c01f30d
@@ -5,6 +5,8 @@ require conf/machine/include/zaurus-clam
require conf/machine/include/zaurus-2.6.inc
require conf/machine/include/zaurus-clamshell.inc
+MACHINE_FEATURES += "iwmmxt"
+
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
PACKAGE_EXTRA_ARCHS += "iwmmxt"
More information about the Openembedded-commits
mailing list