From 2dfe6deb4a0333ec34a6a508cf56e2bf53463d65 Mon Sep 17 00:00:00 2001 From: Chase Maupin Date: Fri, 16 Jul 2010 03:24:19 +0000 Subject: dm3730-am3715-evm: split machine type into two * Split the dm3730-am3715-evm machine type into two separate machines. These are dm37x-evm and am37x-evm. * This split will allow for being able to distiguish different MACHINE_FEATURES in the future such as whether the machine has a DSP or not. This will allow for cleaner task creation. * In order to be able to choose the proper collateral and software such as documentation and codecs we need machine types that differentiate product lines (i.e. AM vs DM) and product families (i.e. 37x vs 35x). This change allows enough differentiation to chose proper collateral without requiring a machine type for every derivative chip. Signed-off-by: Chase Maupin Acked-by: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko --- conf/machine/am37x-evm.conf | 53 +++++++++++++++++++++++++++++++++++++ conf/machine/dm3730-am3715-evm.conf | 53 ------------------------------------- conf/machine/dm37x-evm.conf | 53 +++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 53 deletions(-) create mode 100644 conf/machine/am37x-evm.conf delete mode 100644 conf/machine/dm3730-am3715-evm.conf create mode 100644 conf/machine/dm37x-evm.conf (limited to 'conf') diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf new file mode 100644 index 0000000000..fb10efd597 --- /dev/null +++ b/conf/machine/am37x-evm.conf @@ -0,0 +1,53 @@ +#@TYPE: Machine +#@NAME: AM37x EVM +#@DESCRIPTION: Machine configuration for the TI AM37x 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 + +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" + +SERIAL_CONSOLE = "115200 ttyS0" +USE_VT = "0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_VERSION_u-boot = "git" + +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "omap3_evm_config" +XLOAD_MACHINE = "omap3evm_config" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" + +# 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/dm3730-am3715-evm.conf b/conf/machine/dm3730-am3715-evm.conf deleted file mode 100644 index 32aa65ac14..0000000000 --- a/conf/machine/dm3730-am3715-evm.conf +++ /dev/null @@ -1,53 +0,0 @@ -#@TYPE: Machine -#@NAME: DM37x/AM37x EVM -#@DESCRIPTION: Machine configuration for the TI DM37x/AM37x 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 - -IMAGE_FSTYPES ?= "jffs2 tar.bz2" -EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" - -SERIAL_CONSOLE = "115200 ttyS0" -USE_VT = "0" - -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" - -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -PREFERRED_VERSION_u-boot = "git" - -UBOOT_ARCH = "arm" -UBOOT_MACHINE = "omap3_evm_config" -XLOAD_MACHINE = "omap3evm_config" - -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" - -# 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/dm37x-evm.conf b/conf/machine/dm37x-evm.conf new file mode 100644 index 0000000000..c9b9ca2f6a --- /dev/null +++ b/conf/machine/dm37x-evm.conf @@ -0,0 +1,53 @@ +#@TYPE: Machine +#@NAME: DM37x EVM +#@DESCRIPTION: Machine configuration for the TI DM37x 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 + +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" + +SERIAL_CONSOLE = "115200 ttyS0" +USE_VT = "0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_VERSION_u-boot = "git" + +UBOOT_ARCH = "arm" +UBOOT_MACHINE = "omap3_evm_config" +XLOAD_MACHINE = "omap3evm_config" + +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" + +# 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" + -- cgit 1.2.3-korg