summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/at2440evb.conf19
-rw-r--r--conf/machine/dm355-evm.conf2
-rw-r--r--conf/machine/dm365-evm.conf2
-rw-r--r--conf/machine/dm6467-evm.conf2
-rw-r--r--conf/machine/ep93xx.conf14
-rw-r--r--conf/machine/include/davinci.inc5
-rw-r--r--conf/machine/include/kirkwood.inc2
-rw-r--r--conf/machine/include/omap3.inc21
-rw-r--r--conf/machine/include/zaurus-2.6.inc5
-rw-r--r--conf/machine/include/zaurus-kernel.inc7
-rw-r--r--conf/machine/micro2440.conf20
-rw-r--r--conf/machine/mini2440.conf33
-rw-r--r--conf/machine/mpc8315e-rdb.conf6
-rw-r--r--conf/machine/mx27ads.conf19
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/tx25.conf29
-rw-r--r--conf/machine/tx27.conf10
18 files changed, 174 insertions, 30 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 9930c89c6a..6f71787fa1 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,3 +21,7 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/at2440evb.conf b/conf/machine/at2440evb.conf
new file mode 100644
index 0000000000..f3fa5edfaf
--- /dev/null
+++ b/conf/machine/at2440evb.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Avantech AT2440EVB Dev Board
+#@DESCRIPTION: Machine configuration for Avantech AT2440EVB Dev Board
+
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_FSTYPES = "tar.gz"
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+MACHINE_FEATURES = "kernel26 screen touchscreen"
+
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
index d509152b22..9ef4ff7c7d 100644
--- a/conf/machine/dm355-evm.conf
+++ b/conf/machine/dm355-evm.conf
@@ -4,4 +4,4 @@
require conf/machine/include/davinci.inc
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 09f4a353ca..de2cc4a759 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -4,4 +4,4 @@
require conf/machine/include/davinci.inc
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf
index 66ed1fe1f2..a7596f17f8 100644
--- a/conf/machine/dm6467-evm.conf
+++ b/conf/machine/dm6467-evm.conf
@@ -4,4 +4,4 @@
require conf/machine/include/davinci.inc
-UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_dm6467_evm_config"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 11bae2ff52..6b91d1b951 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
#don't try to access tty1
USE_VT = "0"
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen maverick"
# used by sysvinit_2
SERIAL_CONSOLE = "57600 ttyAM0"
@@ -21,9 +21,11 @@ ROOT_FLASH_SIZE = "8"
#extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
-#tune for ep93xx cpus
-#can be used for crunch support later on
-require conf/machine/include/tune-ep9312.inc
+# tune for ep93xx cpus can be used for crunch support but it is not
+# recommended to build whole rootfs with it (it boots anyway)
+# better would be building separate applications/libraries which makes
+# use of floating point operations
+#
+#require conf/machine/include/tune-ep9312.inc
-
-#require conf/machine/include/tune-arm920t.inc
+require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 0f6123a359..af9dc0ff9c 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,16 +1,15 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r6"
+MACHINE_KERNEL_PR = "r8"
TARGET_ARCH = "arm"
KERNEL_IMAGETYPE = "uImage"
PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
UBOOT_MACHINE = "davinci_dvevm_config"
UBOOT_ENTRYPOINT = "0x80008000"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 9e6f130c35..c185deb555 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
PREFERRED_PROVIDER_virtual/bootloader = ""
PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
-MACHINE_KERNEL_PR = "r5"
+MACHINE_KERNEL_PR = "r8"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 1249837ddb..8e90453d4c 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,13 +1,30 @@
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 = "r36"
+MACHINE_KERNEL_PR = "r37"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
+# Only build u-boot, xload is optional
+EXTRA_IMAGEDEPENDS += "u-boot"
MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+
+# TI DVSDK stuff:
+CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530"
+DSPCFG ?= "OMAP3530SHMEM"
+DSPLINKDSPCFG ?= "OMAP3530SHMEM"
+DSPLINKGPPOS ?= "OMAPLSP"
+GPPOS ?= "OMAPLSP"
+DSPLINKPLATFORM ?= "OMAP3530"
+DSPLINKSOC ?= "3530"
+DSPPOWERSOC ?= "omap3530"
+LPMDSPPOWERSOC ?= "omap3530"
+PLATFORM ?= "omap3530"
+TARGET ?= "o3530_al"
+XDC_PLATFORM ?= ti.platforms.evm3530
+
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 69589a0d60..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -40,9 +40,10 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-px
MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup
+# For tosa: OHCI suspend/resume fixup
+# wlan-ng is now in kernel (2.6.29)
# Fixme ? module-snd for tosa
-MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix"
+MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
# Fixme ? module-snd for collie
MACHINE_EXTRA_RRECOMMENDS_collie = ""
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 2ca00da9c7..d9f1c1ba85 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -6,13 +6,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
-# Increase PR everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r11"
-MACHINE_KERNEL_PR_collie = "r8"
-MACHINE_KERNEL_PR_tosa = "r4"
-
-MACHINE_KERNEL_PR_pn-linux-kexecboot = "r13"
-
KERNEL_IMAGE_MAXSIZE = "1294336"
KERNEL_IMAGE_MAXSIZE_collie = "1048576"
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index f46d4f5822..37311ad965 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -4,21 +4,35 @@
TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.29"
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+ files/device_table_add-s3c_serial.txt"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_MACHINE = "mini2440_config"
+UBOOT_ENTRYPOINT = "30008000"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440"
+
+# This can be used as alternative, stable kernel
+# PREFERRED_PROVIDER_virtual/kernel = "linux"
+# PREFERRED_VERSION_linux = "2.6.29"
+
# This is not necessarily true, there is a 800x480 display as well
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "110"
+# used by matchbox-panel large icons look ok on both displays
+GUI_MACHINE_CLASS = "bigscreen"
# used by sysvinit
SERIAL_CONSOLE = "115200 ttySAC0"
IMAGE_FSTYPES = "jffs2 tar.gz"
-MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet"
+MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa ethernet mmc mmcroot i2c spi"
+MACHINE_EXTRA_RDEPENDS = "rt73-firmware"
require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/mini2440.conf b/conf/machine/mini2440.conf
new file mode 100644
index 0000000000..f4fc17cdc6
--- /dev/null
+++ b/conf/machine/mini2440.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: Samsung MINI2440 Dev Board
+#@DESCRIPTION: Machine configuration for MINI2440 Dev Board
+
+
+TARGET_ARCH = "arm"
+
+PREFERRED_VERSION_u-boot = "git"
+UBOOT_ENTRYPOINT = "30008000"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mini2440"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+ files/device_table_add-s3c_serial.txt"
+
+IMAGE_FSTYPES = "jffs2 ext3 tar.gz"
+
+MACHINE_FEATURES = "kernel26 uboot touchscreen screen lcd rgb16"
+MACHINE_FEATURES += "usbhost usbgadget"
+MACHINE_FEATURES += "i2c spi"
+MACHINE_FEATURES += "mmc mmcroot vfat"
+MACHINE_FEATURES += "ethernet"
+MACHINE_FEATURES += "sound alsa"
+
+KERNEL_IMAGETYPE = "uImage"
+
+require conf/machine/include/tune-arm920t.inc
+
+MACHINE_EXTRA_RDEPENDS = "rt73-firmware"
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash -s 0x200 -n -e 16KiB"
diff --git a/conf/machine/mpc8315e-rdb.conf b/conf/machine/mpc8315e-rdb.conf
index 7d3a93b815..d7e733bd66 100644
--- a/conf/machine/mpc8315e-rdb.conf
+++ b/conf/machine/mpc8315e-rdb.conf
@@ -2,8 +2,8 @@
#@Name: Freescale MPC8315E-RDB
#@DESCRIPTION: Machine configuration for the Freescale MPC8315E-RDB
-# Development board with low power PowerPC SoC with MMU/FPU and PCI,
-# PCI Express x1, 2x SATA.
+# Development board with low-power PowerPC SoC with MMU/FPU and PCI,
+# 2x PCI Express x1, 2x SATA.
TARGET_ARCH = "powerpc"
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot ?= "1.3.2"
+PREFERRED_VERSION_u-boot ?= "2009.06"
UBOOT_MACHINE = "MPC8315ERDB_config"
UBOOT_ENTRYPOINT = "0"
UBOOT_LOADADDRESS = "0"
diff --git a/conf/machine/mx27ads.conf b/conf/machine/mx27ads.conf
new file mode 100644
index 0000000000..d7e8782a50
--- /dev/null
+++ b/conf/machine/mx27ads.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@Name: Freescale MX27ADS
+#@DESCRIPTION: Machine configuration for Freescale MX27ADS
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 4fe62b5f43..dde1bd1499 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,3 +27,7 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
+
+# xserver-kdrive 1.3.0.0 is still the only working version:
+XSERVER = "xserver-kdrive-1300-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf
new file mode 100644
index 0000000000..92a8fef3df
--- /dev/null
+++ b/conf/machine/tx25.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: KARO TX25
+#@DESCRIPTION: Machine configuration for Freescale i.MX25 based Karo TX25 + baseboard
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camera"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.30"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+ROOT_FLASH_SIZE = "128"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+ --pad ; sumtool --eraseblock=0x20000 -n \
+ --littleendian --pad \
+ -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/conf/machine/tx27.conf b/conf/machine/tx27.conf
index fd04a6319a..a3e784c110 100644
--- a/conf/machine/tx27.conf
+++ b/conf/machine/tx27.conf
@@ -10,6 +10,8 @@ GUI_MACHINE_CLASS = "bigscreen"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.28"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
require conf/machine/include/tune-arm926ejs.inc
@@ -17,3 +19,11 @@ require conf/machine/include/tune-arm926ejs.inc
SERIAL_CONSOLE = "115200 ttymxc0"
ROOT_FLASH_SIZE = "128"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \
+ --pad ; sumtool --eraseblock=0x20000 -n \
+ --littleendian --pad \
+ -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"