From 858c356e525d47a591ec6975525e97a9ef62a371 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Sep 2009 10:29:32 +0200 Subject: omap machines: sync with .dev Now that the kernels are in sync we need MACHINE_KERNEL_PR as well. Add new machines as well. Signed-off-by: Koen Kooi Acked-by: Marcin Juszkiewicz Acked-by: Philip Balister --- conf/machine/include/omap3.inc | 21 +++++++++++++-- conf/machine/omap3-touchbook.conf | 50 ++++++++++++++++++++++++++++++++++ conf/machine/omap3517-evm.conf | 50 ++++++++++++++++++++++++++++++++++ conf/machine/omap3evm.conf | 2 +- conf/machine/omap4430-sdp.conf | 49 ++++++++++++++++++++++++++++++++++ conf/machine/omapzoom2.conf | 56 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 225 insertions(+), 3 deletions(-) create mode 100644 conf/machine/omap3-touchbook.conf create mode 100644 conf/machine/omap3517-evm.conf create mode 100644 conf/machine/omap4430-sdp.conf create mode 100644 conf/machine/omapzoom2.conf (limited to 'conf') diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 1b47888ab7..d52bc99a7d 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 = "r35" +MACHINE_KERNEL_PR = "r46" 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" +CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" +DEVICES ?= "OMAP3530" +DSPCFG ?= "OMAP3530SHMEM" +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/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf new file mode 100644 index 0000000000..3595383f03 --- /dev/null +++ b/conf/machine/omap3-touchbook.conf @@ -0,0 +1,50 @@ +#@TYPE: Machine +#@NAME: Always Innovating touchbook +#@DESCRIPTION: Machine configuration for the http://www.alwaysinnovating.com/touchbook/ +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-pm" + +IMAGE_FSTYPES += "squashfs tar.bz2 ubi" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "omap3_beagle_config" +XLOAD_MACHINE = "beagleboard_config" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# 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 = "-m 2048 -p 128KiB -s 512" + + +PREFERRED_VERSION_u-boot = "git" + +MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules " +# and sdio +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/omap3517-evm.conf b/conf/machine/omap3517-evm.conf new file mode 100644 index 0000000000..77ea2807b9 --- /dev/null +++ b/conf/machine/omap3517-evm.conf @@ -0,0 +1,50 @@ +#@TYPE: Machine +#@NAME: omap3 EVM +#@DESCRIPTION: Machine configuration for the TI omap3517 EVM +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +GUI_MACHINE_CLASS = "smallscreen" + +require conf/machine/include/omap3.inc + +# Ship all kernel modules +MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" + +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" + +SERIAL_CONSOLE = "115200 ttyS2" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" + +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "omap3517_evm_config" +XLOAD_MACHINE = "omap3517evm_config" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet" + +# NOTE: there are NAND and OneNAND versions of this board... + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# 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 = "-m 2048 -p 128KiB -s 512" + diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index 8780b827f5..ad410fae4c 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" diff --git a/conf/machine/omap4430-sdp.conf b/conf/machine/omap4430-sdp.conf new file mode 100644 index 0000000000..efa9c814bb --- /dev/null +++ b/conf/machine/omap4430-sdp.conf @@ -0,0 +1,49 @@ +#@TYPE: Machine +#@NAME: OMAP4430 SDP +#@DESCRIPTION: Machine configuration for the OMAP4430 SDP +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-tslib \ + xf86-video-fbdev \ + xf86-input-keyboard" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +# Use omap3 include for the time being +require conf/machine/include/omap3.inc + +IMAGE_FSTYPES += "tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "omap3_beagle_config" + +# Copied from beagle config, needs checking: + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# 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 = "-m 2048 -p 128KiB -s 512" + + +PREFERRED_VERSION_u-boot = "git" + +# and sdio +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf new file mode 100644 index 0000000000..7d0a72b5d7 --- /dev/null +++ b/conf/machine/omapzoom2.conf @@ -0,0 +1,56 @@ +#@TYPE: Machine +#@NAME: omapzoom2 machine +#@DESCRIPTION: Machine configuration for the zoom2 at http://omapzoom.org +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-input-mouse \ + xf86-video-omapfb \ + xf86-video-fbdev \ + xf86-input-keyboard" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +IMAGE_FSTYPES += "tar.bz2 jffs2" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS3" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" +UBOOT_MACHINE = "omap3_zoom2_config" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 129024 bytes +# from ubiattach stdout: +# UBI device number 0, total 1996 LEBs +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" + +# 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 = "-m 2048 -p 128KiB -s 512" + + +PREFERRED_VERSION_u-boot = "git" +#EXTRA_IMAGEDEPENDS += "u-boot x-load" + +#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " +MACHINE_EXTRA_RRECOMMENDS = "" +# and sdio +MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" -- cgit 1.2.3-korg