aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/at91sam9260ek.conf20
-rw-r--r--conf/machine/at91sam9261ek.conf20
-rw-r--r--conf/machine/i586-generic.conf3
-rw-r--r--conf/machine/i686-generic.conf3
-rw-r--r--conf/machine/include/motorola-ezx-base.inc13
-rw-r--r--conf/machine/include/motorola-ezx.inc41
-rw-r--r--conf/machine/include/tune-pentium.inc3
-rw-r--r--conf/machine/include/tune-pentiumpro.inc3
-rw-r--r--conf/machine/nokia770.conf2
-rw-r--r--conf/machine/rokre6.conf8
-rw-r--r--conf/machine/ts72xx.conf19
11 files changed, 86 insertions, 49 deletions
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
new file mode 100644
index 0000000000..e8903a960a
--- /dev/null
+++ b/conf/machine/at91sam9260ek.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9260EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9260ek development board with a at91sam9260 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
new file mode 100644
index 0000000000..489575cd2b
--- /dev/null
+++ b/conf/machine/at91sam9261ek.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9261EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9261ek development board with a at91sam9261 processor
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.conf
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 2cae2a87dc..0ef522441b 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -24,3 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_TASK_PROVIDER = "task-base"
+#tune for pentium cpu
+require conf/machine/include/tune-pentium.inc
+
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 883d6b4dd0..8ff87553ba 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -22,3 +22,6 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_TASK_PROVIDER = "task-base"
+#tune for pentium pro cpu
+require conf/machine/include/tune-pentiumpro.inc
+
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 6baa6a50ba..3912d8fc9b 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -4,8 +4,6 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
#cat /proc/mtd
#dev: size erasesize name
#mtd0: 00020000 00008000 "Bootloader"
@@ -14,10 +12,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
#mtd3: 00020000 00020000 "Logo"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
-# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_ORIENTATION = "0"
@@ -25,9 +19,14 @@ MACHINE_DISPLAY_PPI = "180"
ROOT_FLASH_SIZE = "24"
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-# Opentapi needs to be started very early so we need the mux devices in static /dev
+# the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "ezxd"
+
+# Ezxd needs to be started very early so we need the mux devices in static /dev
IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
files/device_table-ezx.txt"
diff --git a/conf/machine/include/motorola-ezx.inc b/conf/machine/include/motorola-ezx.inc
deleted file mode 100644
index e87f6aa70f..0000000000
--- a/conf/machine/include/motorola-ezx.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-# choose the proper kernel for this hardware
-PREFERRED_PROVIDER_virtual/kernel = "ezx-kernels"
-# we don't need support for kernel 2.4
-MODUTILS = "26"
-# build tar.gz for SD/MMC/Transflash and jffs2 for later when we have mtd
-IMAGE_FSTYPES = "tar.gz jffs2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils apm irda-utils udev-utils ppp ppp-dialin module-init-tools"
-
-#
-# disable all modules until we have something that boots...
-#
-
-# Ethernet modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
-# NFS Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
-# Crypto Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
-# SMB and CRAMFS
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
-# Serial Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
-# Bluetooth Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
-# kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
-# Infrared Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
-# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-#
-# USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-# kernel-module-g-serial kernel-module-g-ether"
-#
-# Sound Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-#BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc
-# kernel-module-snd-timer kernel-module-snd-pcm \
-# kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-#
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
new file mode 100644
index 0000000000..7b1a517895
--- /dev/null
+++ b/conf/machine/include/tune-pentium.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentium"
+PACKAGE_ARCH = "i586"
+
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
new file mode 100644
index 0000000000..aa9a8dfa1d
--- /dev/null
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-mcpu=pentiumpro"
+PACKAGE_ARCH = "i686"
+
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 2727fd44d3..0e308b0a67 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
PREFERRED_PROVIDER_virtual/bootloader = ""
PREFERRED_PROVIDER_tslib = "tslib-maemo"
-XSERVER = "xserver-kdrive-omap"
+XSERVER = "xserver-kdrive-xomap"
# 800x480 is big enough for me
GUI_MACHINE_CLASS = "bigscreen"
diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf
new file mode 100644
index 0000000000..7b20091140
--- /dev/null
+++ b/conf/machine/rokre6.conf
@@ -0,0 +1,8 @@
+#@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"
diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
new file mode 100644
index 0000000000..632f3044cc
--- /dev/null
+++ b/conf/machine/ts72xx.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Technologic Systems TS-72xx SBC
+#@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# default is 2.6.22.6
+#PREFERRED_VERSION_linux = "2.6.23-rc5"
+
+SERIAL_CONSOLE = "115200 ttyAM0"
+USE_VT = "0"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+
+require conf/machine/include/tune-arm920t.inc