diff options
Diffstat (limited to 'conf/machine')
40 files changed, 481 insertions, 49 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 6f71787fa1..9930c89c6a 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -21,7 +21,3 @@ 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/archos5.conf b/conf/machine/archos5.conf new file mode 100644 index 0000000000..8640912b0f --- /dev/null +++ b/conf/machine/archos5.conf @@ -0,0 +1,41 @@ +#@TYPE: Machine +#@NAME: OMAP3 based Archos 5 +#@DESCRIPTION: Machine configuration for the Archos 5 + +TARGET_ARCH = "arm" +require conf/machine/include/omap3.inc + +ASSUME_PROVIDED += "u-boot" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +#What is the correct one, both seem in use? +MACHINE_GUI_CLASS = "bigscreen" +GUI_MACHINE_CLASS = "bigscreen" + +#800 * 480 Widescreen +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" + +KERNEL_IMAGETYPE = "zImage" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-archos" + +# Ship all kernel modules +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" + +IMAGE_FSTYPES += "tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +SERIAL_CONSOLE = "115200 ttyS2" + +CMDLINE = "root=/dev/sda1 rw init=/sbin/init console=ttyS2,115200n8 mem=128M nohz=off" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen wifi" + diff --git a/conf/machine/at91sam9g45ek.conf b/conf/machine/at91sam9g45ek.conf new file mode 100644 index 0000000000..98fd7113c0 --- /dev/null +++ b/conf/machine/at91sam9g45ek.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@Name: Atmel AT91SAM9G45EK Development Platform +#@DESCRIPTION: Machine configuration for the at91sam9g45ek development board with a at91sam9g45-ES2 processor +# Once a at91sam9g45ek development board with a production at91sam9g45 processor +# is available we should change the recipe to use the at91sam9m10g45ek_defconfig + +include conf/machine/include/AT91-LCD.inc + +# Has linux config file in OpenEmbedded +# +# LINUX26_DEFCONFIG = "at91sam9g45ek_defconfig" +# LINUX26_DEFCONFIG = "at91sam9m10g45ek_defconfig" + +# Supported u-boot machines +#UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config" +#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config" +UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config" +#UBOOT_MACHINE = "at91sam9m10g45ek_config" +#UBOOT_MACHINE = "at91sam9g45ekes_nandflash_config" +#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_config" +#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_cs0_config" +#UBOOT_MACHINE = "at91sam9g45ekes_config" + +# Boot from Dataflash, so we do not have to reprogram +# At91bootstrap/U-Boot everytime we erase the NAND flash +AT91BOOTSTRAP_BOARD = "at91sam9g45df" + +MACHINE_FEATURES += "usbhost" + diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf new file mode 100644 index 0000000000..08bcdea3e5 --- /dev/null +++ b/conf/machine/ben-nanonote.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: Ben Nanonote +#@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote + +TARGET_ARCH = "mipsel" +require conf/machine/include/tune-mips32.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben" +KERNEL_IMAGETYPE = "uImage" +IMAGE_FSTYPES ?= "jffs2" + diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf index cec3d5b785..d79cf15129 100644 --- a/conf/machine/bug.conf +++ b/conf/machine/bug.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the BUG base unit. TARGET_ARCH = "arm" -MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw" +MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw" PREFERRED_PROVIDER_virtual/kernel = "linux-bug" MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget" @@ -14,3 +14,11 @@ CPU_FEATURES += "vfp" require conf/machine/include/tune-arm1136jf-s.inc KERNEL_IMAGETYPE = "uImage" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-input-mouse \ + xf86-video-fbdev \ + xf86-input-keyboard" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 16073fee82..4daedde482 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc # please set the right value in your local.conf ROOT_FLASH_SIZE = "25" -XSERVER = "xserver-kdrive-imageon" - MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "640" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" diff --git a/conf/machine/cm-t35.conf b/conf/machine/cm-t35.conf new file mode 100644 index 0000000000..ccb9f95773 --- /dev/null +++ b/conf/machine/cm-t35.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@NAME: CM-T35 machine +#@DESCRIPTION: Machine configuration for the CompuLab CM-T35 board (http://www.compulab.co.il/t3530/html/t3530-cm-datasheet.htm) + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-evtouch \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +IMAGE_FSTYPES += "tar.bz2 ubi" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "cm_t35_config" +PREFERRED_VERSION_u-boot = "git" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 126976 bytes +# from ubiattach stdout: +# UBI device number 0, total 4039 LEBs +MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4039" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 512 +UBINIZE_ARGS = "-O 2048 -m 2048 -p 128KiB" + +MACHINE_EXTRA_RRECOMMENDS = "marvell-sdio-fw" +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi ext2" + diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 47f6e30dfd..66995e9b09 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14" # actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -XSERVER = "xserver-kdrive-fbdev" - MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf index 4df4d63cca..0164e1c27d 100644 --- a/conf/machine/da830-omapl137-evm.conf +++ b/conf/machine/da830-omapl137-evm.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/omapl137.inc UBOOT_MACHINE = "da830_omapl137_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf index bbcb45002e..b61c00ca27 100644 --- a/conf/machine/da850-omapl138-evm.conf +++ b/conf/machine/da850-omapl138-evm.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/omapl138.inc UBOOT_MACHINE = "da850_omapl138_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index e3c0554f71..63fc2cacc4 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial" #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" require conf/machine/include/tune-arm926ejs.inc +require conf/machine/include/dm6446.inc diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf index 73c9f1e017..a352b5e926 100644 --- a/conf/machine/dm355-evm.conf +++ b/conf/machine/dm355-evm.conf @@ -5,4 +5,4 @@ require conf/machine/include/davinci.inc require conf/machine/include/dm355.inc -UBOOT_MACHINE = "davinci_dm355evm_config" +UBOOT_MACHINE = "davinci_dm355_evm_config" diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf index 7cea5dc727..5a5161673b 100644 --- a/conf/machine/dm365-evm.conf +++ b/conf/machine/dm365-evm.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/dm365.inc -UBOOT_MACHINE = "davinci_dm365evm_config" +UBOOT_MACHINE = "davinci_dm365_evm_config" diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf index 8b048a5474..aaa7492991 100644 --- a/conf/machine/dm6446-evm.conf +++ b/conf/machine/dm6446-evm.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/dm6446.inc UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf new file mode 100644 index 0000000000..ae53a53377 --- /dev/null +++ b/conf/machine/hawkboard.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: OMAP-L138 based board +#@DESCRIPTION: Machine configuration for the TI Hawkboard + +require conf/machine/include/davinci.inc +require conf/machine/include/omapl138.inc + +UBOOT_MACHINE = "da850_omapl138_evm_config" +UBOOT_ENTRYPOINT = "0xc0008000" +UBOOT_LOADADDRESS = "0xc0008000" + +MACHINE_FEATURES = "kernel26 serial ethernet ide screen" + +SERIAL_CONSOLE = "115200 ttyS2" diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc new file mode 100644 index 0000000000..3036295f48 --- /dev/null +++ b/conf/machine/include/AT91-LCD.inc @@ -0,0 +1,15 @@ +# Common description for Atmel ARM processors with LCD controller + +include conf/machine/include/AT91.inc + +MACHINE_FEATURES += "screen touchscreen keyboard" + +# Some options we disable for now +# MACHINE_FEATURES += "apm" +# MACHINE_FEATURES += "lcd" +# MACHINE_FEATURES += "bluetooth wifi irda phone gps" +# MACHINE_FEATURES += "mmc mmcroot fat" +# MACHINE_FEATURES += "i2c spi serial" +# MACHINE_FEATURES += "sound libogg libvorbis" + + diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc new file mode 100644 index 0000000000..6c0f8f04ac --- /dev/null +++ b/conf/machine/include/AT91.inc @@ -0,0 +1,51 @@ +# Common description for Atmel ARM processors + +TARGET_ARCH = "arm" +#PACKAGE_EXTRA_ARCHS = "armv4t armv5te" +CPU_FAMILY = "at91" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.32" + +#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" +#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +#PREFERRED_PROVIDER_xserver = "xserver-xorg" +#PREFERRED_PROVIDER_xserver = "xserver-kdrive" +#XSERVER = "xserver-kdrive-fbdev" +# Angstrom defines: +#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +#PREFERRED_VERSION_xserver-kdrive = "1.6.1" + +PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13" +PREFERRED_VERSION_at91bootstrap = "2.13" + +PREFERRED_PROVIDER_u-boot = "u-boot_2009.08" +PREFERRED_VERSION_u-boot = "2009.08" + +KERNEL_IMAGETYPE = "uImage" + +# PREFERRED_VERSION_mplayer = "svn" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot " +EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "at91bootstrap" + +MACHINE_EXTRA_RDEPENDS += " kernel-modules " +#MACHINE_EXTRA_RDEPENDS += " atmel-fixes " + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" +# +# Uncomment or add kernel modules that should be autoloaded +#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)} +#module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)} +module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)} + +require conf/machine/include/tune-arm926ejs.inc + diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 206afd46f2..a262059d45 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r10" +MACHINE_KERNEL_PR = "r32" TARGET_ARCH = "arm" @@ -15,7 +15,7 @@ UBOOT_MACHINE = "davinci_dvevm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -#EXTRA_IMAGEDEPENDS += "u-boot ubl" +EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc index dffafe4460..d666d5e030 100644 --- a/conf/machine/include/dm355.inc +++ b/conf/machine/include/dm355.inc @@ -1,9 +1,2 @@ - -DEVICES = "DM355" -GPPOS = "LINUX_GCC" -PLATFORM = "dm355" -PROGRAMS = "APP_LOCAL" -TARGET = "dm355_al" -XDC_PLATFORM = ti.platforms.evmDM355 - +SOC_FAMILY = "dm355" diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc new file mode 100644 index 0000000000..c53680ea63 --- /dev/null +++ b/conf/machine/include/dm365.inc @@ -0,0 +1,12 @@ +SOC_FAMILY = "dm365" + + +# DMAI +PLATFORM = "dm365" +XDC_PLATFORM = ti.platforms.evmDM365 + +# Obsoleted (CE examples rebuild) +#GPPOS = "LINUX_GCC" + +# DMAI recipe +#TARGET = "dm365_al" diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc new file mode 100644 index 0000000000..c14e573c74 --- /dev/null +++ b/conf/machine/include/dm6446.inc @@ -0,0 +1,13 @@ +SOC_FAMILY = "dm6446" + +# TI DVSDK stuff: +DSPCFG ?= "DM6446GEMSHMEM" +DSPLINKDSPCFG ?= "DM6446GEMSHMEM" +DSPLINKGPPOS ?= "MVL5G" +DSPLINKPLATFORM ?= "DAVINCI" +DSPLINKSOC ?= "DM6446" +DSPPOWERSOC ?= "DM6446" +GPPOS ?= "LINUX_GCC" +PLATFORM ?= "dm6446" +XDC_PLATFORM ?= "ti.platforms.evmDM6446" + diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index f91607cf76..c3c59aa48b 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 = "r12" +MACHINE_KERNEL_PR = "r14" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 2c5c4f2387..dd1188b7c5 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,9 @@ +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 = "r49" +MACHINE_KERNEL_PR = "r51" KERNEL_IMAGETYPE = "uImage" @@ -12,17 +14,10 @@ UBOOT_LOADADDRESS = "0x80008000" EXTRA_IMAGEDEPENDS += "u-boot" # TI DVSDK stuff: -CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" -CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" -DEVICES ?= "OMAP3530" -DSPCFG ?= "OMAP3530SHMEM" +# DSPLink rebuild DSPLINKDSPCFG ?= "OMAP3530SHMEM" DSPLINKGPPOS ?= "OMAPLSP" DSPLINKPLATFORM ?= "OMAP3530" DSPLINKSOC ?= "3530" -DSPPOWERSOC ?= "omap3530" -GPPOS ?= "LINUX_GCC" -LPMDSPPOWERSOC ?= "omap3530" -PLATFORM ?= "omap3530" -XDC_PLATFORM ?= "ti.platforms.evm3530" + diff --git a/conf/machine/include/omapl137.inc b/conf/machine/include/omapl137.inc new file mode 100644 index 0000000000..cd84594f86 --- /dev/null +++ b/conf/machine/include/omapl137.inc @@ -0,0 +1 @@ +SOC_FAMILY = "omapl137" diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc new file mode 100644 index 0000000000..4c222753df --- /dev/null +++ b/conf/machine/include/omapl138.inc @@ -0,0 +1 @@ +SOC_FAMILY = "omapl138" diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc new file mode 100644 index 0000000000..44058c12be --- /dev/null +++ b/conf/machine/include/tune-atom.inc @@ -0,0 +1,9 @@ +# GCC 4.3.0- (see Poky) +# TARGET_CC_ARCH = "-march=i586" +# GCC 4.3.1+ (see Gentoo) +TARGET_CC_ARCH = "-march=core2" +# GCC 4.4.2+ (see Fedora 12) +#TARGET_CC_ARCH = "-march=i686 -mtune=atom" +BASE_PACKAGE_ARCH = "i686" +FEED_ARCH = "i686" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index cd83a7b5a6..02a48629c8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" SERIAL_CONSOLE_collie = "115200 ttySA0" +# FIXME: xserver-xorg is in testing + +# deprecated defaults PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +# c7x0 uses kdrive-imageon (W100) PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +XSERVER_c7x0 = "xserver-kdrive-imageon" + +# collie uses kdrive-fbdev PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" +XSERVER_collie = "xserver-kdrive-fbdev" + +# FIXME xserver-kdrive 1.3.0.0 is still the only working version ? +PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300" +XSERVER_akita = "xserver-kdrive-1300-fbdev" + +# spitz uses xserver-xorg +PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" +XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" PCMCIA_MANAGER ?= "pcmciautils" diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index d9f1c1ba85..1ba4a3422d 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -3,6 +3,9 @@ MACHINE_KERNEL_VERSION = "2.6" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +# Starting with 2.6.32 linux-rp is deprecated +#PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf new file mode 100644 index 0000000000..23b3cf7c37 --- /dev/null +++ b/conf/machine/ion.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: Ion + +#@DESCRIPTION: Machine configuration for NVidia Ion based machines. +#Point of View ION, Asrock 330, etc. + +TARGET_ARCH = "i686" + +#MACHINE_ARCH = "core2" + +include conf/machine/include/tune-atom.inc + +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ + acpi" + +KERNEL_IMAGETYPE = "bzImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 3735bc0312..f709f51c09 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -6,7 +6,16 @@ TARGET_ARCH = "sh3" require conf/machine/include/tune-sh3.inc +MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" -PCMCIA_MANAGER = "pcmciautils" +PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat" +PCMCIA_MANAGER = "pcmciautils"
\ No newline at end of file diff --git a/conf/machine/mtcdp-embedded.conf b/conf/machine/mtcdp-embedded.conf new file mode 100644 index 0000000000..f571f2d8f0 --- /dev/null +++ b/conf/machine/mtcdp-embedded.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@Name: Multi-Tech MTCDP Embedded +#@DESCRIPTION: Machine configuration for the Embedded MTCDP (Cellular Development Platform) + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +PREFERRED_VERSION_linux = "2.6.32" +PREFERRED_VERSION_mts-io ?= "0.4.1" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "at91sam9g20ek_nandflash_config" + +PREFERRED_VERSION_at91bootstrap = "2.13" +PREFERRED_VERSION_u-boot = "1.3.4" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf new file mode 100644 index 0000000000..336e31b182 --- /dev/null +++ b/conf/machine/mtcdp.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@Name: Multi-Tech MTCDP +#@DESCRIPTION: Machine configuration for the MTCDP (Cellular Development Platform) + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +PREFERRED_VERSION_linux = "2.6.32" +PREFERRED_VERSION_mts-io ?= "0.4.1" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "at91sam9g20ek_nandflash_config" + +PREFERRED_VERSION_at91bootstrap = "2.13" +PREFERRED_VERSION_u-boot = "1.3.4" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index b751cbcac2..9b552a462a 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -26,4 +26,5 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen" require conf/machine/include/tune-arm926ejs.inc require conf/machine/include/neuros.inc +require conf/machine/include/dm6446.inc diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index cbc66d8748..e1c5127072 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -7,8 +7,18 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" + +# SHR-specific overrides to the machine.conf file +PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" +PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" +PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" +PREFERRED_PROVIDER_virtual/libgl = "mesa" +XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" + UBOOT_ENTRYPOINT = "300080 |