7 files changed, 82 insertions, 19 deletions
diff --git a/conf/machine/chumby-falconwing.conf b/conf/machine/chumby-falconwing.conf
new file mode 100644
index 0000000000..e451c5ce49
--- /dev/null
+++ b/conf/machine/chumby-falconwing.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@Name: chumby Falconwing i.MX233-based boards
+#@DESCRIPTION: Machine configuration for chumby Falconwing platform
+
+TARGET_ARCH = "arm"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-imx"
+PREFERRED_PROVIDER_virtual/bootloader = "bootstream-chumby-falconwing"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyAM0"
+
+ROOT_FLASH_SIZE = "128"
+
+MACHINE_FEATURES = "kernel26 usbhost touchscreen ext2 ext3 vfat keyboard alsa"
+IMAGE_FSTYPES = "ext3.gz tar.gz"
diff --git a/conf/machine/efikamx.conf b/conf/machine/efikamx.conf
index 935649b240..ffc0cc96f8 100644
--- a/conf/machine/efikamx.conf
+++ b/conf/machine/efikamx.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@Name: Genisi EFIKA MX Development Platform
-#@DESCRIPTION: Machine configuration for the EFIKA development platform (http://www.powerdeveloper.org/platforms/efikamx)
+#@Name: Genesi EFIKA MX Development Platform
+#@DESCRIPTION: Machine configuration for the EFIKA MX development platform (http://www.powerdeveloper.org/platforms/efikamx)
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 1052296d8a..60ec0ff42a 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r88"
+MACHINE_KERNEL_PR = "r89"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 8741eb4ff6..64fca12069 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -9,4 +9,4 @@ require conf/machine/include/tune-strongarm.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat"
-MACHINE_EXTRA_RDEPENDS = "kernel-modules"
+MACHINE_EXTRA_RDEPENDS = "kernel-modules bluez-dtl1-workaround"
diff --git a/conf/machine/mini6410.conf b/conf/machine/mini6410.conf
new file mode 100644
index 0000000000..494de25131
--- /dev/null
+++ b/conf/machine/mini6410.conf
@@ -0,0 +1,48 @@
+#@TYPE: Machine
+#@Name: FriendlyARM Mini6410
+#@DESCRIPTION: Machine configuration for FriendlyARM Mini6410 Dev Board
+
+TARGET_ARCH = "arm"
+
+# Definitions matching the default kit display
+MACHINE_DISPLAY_WIDTH_PIXELS ?= "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS ?= "272"
+MACHINE_DISPLAY_ORIENTATION ?= "0"
+MACHINE_DISPLAY_PPI ?= "120"
+GUI_MACHINE_CLASS = "bigscreen"
+
+SERIAL_CONSOLE ?= "115200 ttySAC0"
+UBOOT_ENTRYPOINT = "50008000"
+
+# Software selections
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-video-fbdev \
+           xf86-input-keyboard \
+           xf86-input-mouse \
+"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# Filesystem parameter
+ROOT_FLASH_SIZE ?= "128"
+
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 512"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+EXTRA_IMAGECMD_jffs2 = " -e 128KiB -l -p ; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+                         -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+                         -e 128KiB -p -l "
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+MACHINE_FEATURES = "kernel26 alsa ext2 keyboard screen touchscreen usbgadget usbhost vfat"
+
+# Output files
+KERNEL_IMAGETYPE = "uImage"
+IMAGE_FSTYPES = "tar.bz2 ubi"
+
+
+require conf/machine/include/tune-arm1176jzf-s.inc
+
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index 4ceb936c61..b1b8a870ad 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -1,7 +1,11 @@
 #@TYPE: Machine
 #@NAME: Nokia 900 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 900
+
 TARGET_ARCH = "arm"
+SOC_FAMILY = "omap3"
+require conf/machine/include/tune-cortexa8.inc
+
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -13,15 +17,12 @@ GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
-require conf/machine/include/omap3.inc
-
-# omap3.inc redefine it to uImage
 KERNEL_IMAGETYPE = "zImage"
 
 ROOT_FLASH_SIZE = "100"
 EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n"
 
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -35,4 +36,4 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat"
 # Copied from include/omap3.inc (as we do not use linux-omap recipes):
 #
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r52"
+MACHINE_KERNEL_PR = "r53"
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index fb70437bd8..d43a2dc8db 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -20,17 +20,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda wifi usbgadget screen vfa
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.35"
 PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-#
-# Modules autoload and other boot properties
-#
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_g_ether = "g_ether"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
-
-require conf/machine/include/LAB-settings.inc