* [PATCH 1/2] dm3730-am3715-evm: split machine type into two
@ 2010-07-16 13:24 Chase Maupin
2010-07-16 13:24 ` [PATCH 2/2] remove dm3730-am3715-evm machine type references Chase Maupin
2010-07-16 13:48 ` [PATCH 1/2] dm3730-am3715-evm: split machine type into two Denys Dmytriyenko
0 siblings, 2 replies; 4+ messages in thread
From: Chase Maupin @ 2010-07-16 13:24 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chase Maupin
* 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 <chase.maupin@ti.com>
---
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
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
new file mode 100644
index 0000000..fb10efd
--- /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 32aa65a..0000000
--- 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 0000000..c9b9ca2
--- /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"
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] remove dm3730-am3715-evm machine type references
2010-07-16 13:24 [PATCH 1/2] dm3730-am3715-evm: split machine type into two Chase Maupin
@ 2010-07-16 13:24 ` Chase Maupin
2010-07-16 13:48 ` Denys Dmytriyenko
2010-07-16 13:48 ` [PATCH 1/2] dm3730-am3715-evm: split machine type into two Denys Dmytriyenko
1 sibling, 1 reply; 4+ messages in thread
From: Chase Maupin @ 2010-07-16 13:24 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chase Maupin
* Removed references to the dm3730-am3715-evm machine type
and replaced with dm37x-evm and am37x-evm machine types.
Signed-off-by: Chase Maupin <chase.maupin@ti.com>
---
contrib/angstrom/sort.sh | 2 +-
recipes/clutter/clutter.inc | 2 +-
.../{dm3730-am3715-evm => am37x-evm}/defconfig | 0
.../{dm3730-am3715-evm => dm37x-evm}/defconfig | 0
recipes/linux/linux-omap-psp_2.6.32.bb | 2 +-
recipes/powervr-drivers/libgles-omap3.inc | 2 +-
recipes/ti/ti-dmai_2.05.00.14.bb | 2 +-
recipes/u-boot/u-boot_git.bb | 11 ++++++++---
recipes/x-load/x-load_git.bb | 11 ++++++++---
.../{dm3730-am3715-evm => am37x-evm}/xorg.conf | 0
.../{am3517-evm => dm37x-evm}/xorg.conf | 0
11 files changed, 21 insertions(+), 11 deletions(-)
copy recipes/linux/linux-omap-psp-2.6.32/{dm3730-am3715-evm => am37x-evm}/defconfig (100%)
rename recipes/linux/linux-omap-psp-2.6.32/{dm3730-am3715-evm => dm37x-evm}/defconfig (100%)
rename recipes/xorg-xserver/xserver-xorg-conf/{dm3730-am3715-evm => am37x-evm}/xorg.conf (100%)
copy recipes/xorg-xserver/xserver-xorg-conf/{am3517-evm => dm37x-evm}/xorg.conf (100%)
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 9a7615e..eed899d 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -60,7 +60,7 @@ case "$arch" in
"armv6-novfp")
machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
"armv7a")
- machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm3730-am3715-evm htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda" ;;
+ machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda" ;;
"avr32")
machines="at32stk1000 atngw100" ;;
"bfin")
diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
index fce3236..3bcf895 100644
--- a/recipes/clutter/clutter.inc
+++ b/recipes/clutter/clutter.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter graphics library"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPL"
-COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm3730-am3715-evm|beagleboard|overo|omap3evm|omap5912osk)"
+COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm37x-evm|am37x-evm|beagleboard|overo|omap3evm|omap5912osk)"
STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
diff --git a/recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig b/recipes/linux/linux-omap-psp-2.6.32/am37x-evm/defconfig
similarity index 100%
copy from recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig
copy to recipes/linux/linux-omap-psp-2.6.32/am37x-evm/defconfig
diff --git a/recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig b/recipes/linux/linux-omap-psp-2.6.32/dm37x-evm/defconfig
similarity index 100%
rename from recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig
rename to recipes/linux/linux-omap-psp-2.6.32/dm37x-evm/defconfig
diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
index 1e1562b..ae7429f 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -3,7 +3,7 @@ require multi-kernel.inc
DESCRIPTION = "Linux kernel for OMAP processors"
KERNEL_IMAGETYPE = "uImage"
-COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm3730-am3715-evm|omap3-touchbook|overo"
+COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm37x-evm|am37x-evm|omap3-touchbook|overo"
# This is the v2.6.32_OMAPPSP_03.00.01.06 branch
SRCREV = "a6bad4464f985fdd3bed72e1b82dcbfc004d7869"
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index f250de0..a570435 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -3,7 +3,7 @@ LICENSE = "proprietary-binary"
PR = "r5"
-COMPATIBLE_MACHINE = "(dm3730-am3715-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
+COMPATIBLE_MACHINE = "(dm37x-evm|am37x-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
DEPENDS = "virtual/libx11 libxau libxdmcp"
diff --git a/recipes/ti/ti-dmai_2.05.00.14.bb b/recipes/ti/ti-dmai_2.05.00.14.bb
index 1d49ba7..586ad47 100644
--- a/recipes/ti/ti-dmai_2.05.00.14.bb
+++ b/recipes/ti/ti-dmai_2.05.00.14.bb
@@ -3,7 +3,7 @@ require ti-dmai.inc
PV = "2_05_00_14"
PR = "r0"
-COMPATIBLE_MACHINE = "(omap3evm|dm3730-am3715-evm)"
+COMPATIBLE_MACHINE = "(omap3evm|dm37x-evm|am37x-evm)"
SRC_URI_append = " \
file://doxygen_templates.tar.gz \
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index d67e787..e96b7d2 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -110,9 +110,14 @@ SRCREV_omap3evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
PV_omap3evm = "2009.11+${PR}+gitr${SRCREV}"
# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
-SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
-SRCREV_dm3730-am3715-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
-PV_dm3730-am3715-evm = "2009.11+${PR}+gitr${SRCREV}"
+SRC_URI_dm37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
+SRCREV_dm37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
+PV_dm37x-evm = "2009.11+${PR}+gitr${SRCREV}"
+
+# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
+SRC_URI_am37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
+SRCREV_am37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
+PV_am37x-evm = "2009.11+${PR}+gitr${SRCREV}"
# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
SRC_URI_am3517-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb
index c7bb451..9f8c77d 100644
--- a/recipes/x-load/x-load_git.bb
+++ b/recipes/x-load/x-load_git.bb
@@ -30,9 +30,14 @@ SRCREV_omap3evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
PV_omap3evm = "1.46+${PR}+gitr${SRCREV}"
# TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
-SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
-SRCREV_dm3730-am3715-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
-PV_dm3730-am3715-evm = "1.46+${PR}+gitr${SRCREV}"
+SRC_URI_dm37x-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
+SRCREV_dm37x-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
+PV_dm37x-evm = "1.46+${PR}+gitr${SRCREV}"
+
+# TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
+SRC_URI_am37x-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
+SRCREV_am37x-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
+PV_am37x-evm = "1.46+${PR}+gitr${SRCREV}"
# TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
SRC_URI_am3517-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/dm3730-am3715-evm/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
similarity index 100%
rename from recipes/xorg-xserver/xserver-xorg-conf/dm3730-am3715-evm/xorg.conf
rename to recipes/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
similarity index 100%
copy from recipes/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
copy to recipes/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dm3730-am3715-evm: split machine type into two
2010-07-16 13:24 [PATCH 1/2] dm3730-am3715-evm: split machine type into two Chase Maupin
2010-07-16 13:24 ` [PATCH 2/2] remove dm3730-am3715-evm machine type references Chase Maupin
@ 2010-07-16 13:48 ` Denys Dmytriyenko
1 sibling, 0 replies; 4+ messages in thread
From: Denys Dmytriyenko @ 2010-07-16 13:48 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chase Maupin
On Fri, Jul 16, 2010 at 08:24:19AM -0500, Chase Maupin wrote:
> * 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 <chase.maupin@ti.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
> ---
> 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
>
> diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
> new file mode 100644
> index 0000000..fb10efd
> --- /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 32aa65a..0000000
> --- 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 0000000..c9b9ca2
> --- /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"
> +
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] remove dm3730-am3715-evm machine type references
2010-07-16 13:24 ` [PATCH 2/2] remove dm3730-am3715-evm machine type references Chase Maupin
@ 2010-07-16 13:48 ` Denys Dmytriyenko
0 siblings, 0 replies; 4+ messages in thread
From: Denys Dmytriyenko @ 2010-07-16 13:48 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chase Maupin
On Fri, Jul 16, 2010 at 08:24:20AM -0500, Chase Maupin wrote:
> * Removed references to the dm3730-am3715-evm machine type
> and replaced with dm37x-evm and am37x-evm machine types.
>
> Signed-off-by: Chase Maupin <chase.maupin@ti.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
> ---
> contrib/angstrom/sort.sh | 2 +-
> recipes/clutter/clutter.inc | 2 +-
> .../{dm3730-am3715-evm => am37x-evm}/defconfig | 0
> .../{dm3730-am3715-evm => dm37x-evm}/defconfig | 0
> recipes/linux/linux-omap-psp_2.6.32.bb | 2 +-
> recipes/powervr-drivers/libgles-omap3.inc | 2 +-
> recipes/ti/ti-dmai_2.05.00.14.bb | 2 +-
> recipes/u-boot/u-boot_git.bb | 11 ++++++++---
> recipes/x-load/x-load_git.bb | 11 ++++++++---
> .../{dm3730-am3715-evm => am37x-evm}/xorg.conf | 0
> .../{am3517-evm => dm37x-evm}/xorg.conf | 0
> 11 files changed, 21 insertions(+), 11 deletions(-)
> copy recipes/linux/linux-omap-psp-2.6.32/{dm3730-am3715-evm => am37x-evm}/defconfig (100%)
> rename recipes/linux/linux-omap-psp-2.6.32/{dm3730-am3715-evm => dm37x-evm}/defconfig (100%)
> rename recipes/xorg-xserver/xserver-xorg-conf/{dm3730-am3715-evm => am37x-evm}/xorg.conf (100%)
> copy recipes/xorg-xserver/xserver-xorg-conf/{am3517-evm => dm37x-evm}/xorg.conf (100%)
>
> diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
> index 9a7615e..eed899d 100755
> --- a/contrib/angstrom/sort.sh
> +++ b/contrib/angstrom/sort.sh
> @@ -60,7 +60,7 @@ case "$arch" in
> "armv6-novfp")
> machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
> "armv7a")
> - machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm3730-am3715-evm htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda" ;;
> + machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda" ;;
> "avr32")
> machines="at32stk1000 atngw100" ;;
> "bfin")
> diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
> index fce3236..3bcf895 100644
> --- a/recipes/clutter/clutter.inc
> +++ b/recipes/clutter/clutter.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter graphics library"
> HOMEPAGE = "http://www.clutter-project.org/"
> LICENSE = "LGPL"
>
> -COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm3730-am3715-evm|beagleboard|overo|omap3evm|omap5912osk)"
> +COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm37x-evm|am37x-evm|beagleboard|overo|omap3evm|omap5912osk)"
>
> STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
> BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
> diff --git a/recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig b/recipes/linux/linux-omap-psp-2.6.32/am37x-evm/defconfig
> similarity index 100%
> copy from recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig
> copy to recipes/linux/linux-omap-psp-2.6.32/am37x-evm/defconfig
> diff --git a/recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig b/recipes/linux/linux-omap-psp-2.6.32/dm37x-evm/defconfig
> similarity index 100%
> rename from recipes/linux/linux-omap-psp-2.6.32/dm3730-am3715-evm/defconfig
> rename to recipes/linux/linux-omap-psp-2.6.32/dm37x-evm/defconfig
> diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
> index 1e1562b..ae7429f 100644
> --- a/recipes/linux/linux-omap-psp_2.6.32.bb
> +++ b/recipes/linux/linux-omap-psp_2.6.32.bb
> @@ -3,7 +3,7 @@ require multi-kernel.inc
> DESCRIPTION = "Linux kernel for OMAP processors"
> KERNEL_IMAGETYPE = "uImage"
>
> -COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm3730-am3715-evm|omap3-touchbook|overo"
> +COMPATIBLE_MACHINE = "beagleboard|omap3evm|am3517-evm|dm37x-evm|am37x-evm|omap3-touchbook|overo"
>
> # This is the v2.6.32_OMAPPSP_03.00.01.06 branch
> SRCREV = "a6bad4464f985fdd3bed72e1b82dcbfc004d7869"
> diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
> index f250de0..a570435 100644
> --- a/recipes/powervr-drivers/libgles-omap3.inc
> +++ b/recipes/powervr-drivers/libgles-omap3.inc
> @@ -3,7 +3,7 @@ LICENSE = "proprietary-binary"
>
> PR = "r5"
>
> -COMPATIBLE_MACHINE = "(dm3730-am3715-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
> +COMPATIBLE_MACHINE = "(dm37x-evm|am37x-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
>
> DEPENDS = "virtual/libx11 libxau libxdmcp"
>
> diff --git a/recipes/ti/ti-dmai_2.05.00.14.bb b/recipes/ti/ti-dmai_2.05.00.14.bb
> index 1d49ba7..586ad47 100644
> --- a/recipes/ti/ti-dmai_2.05.00.14.bb
> +++ b/recipes/ti/ti-dmai_2.05.00.14.bb
> @@ -3,7 +3,7 @@ require ti-dmai.inc
> PV = "2_05_00_14"
> PR = "r0"
>
> -COMPATIBLE_MACHINE = "(omap3evm|dm3730-am3715-evm)"
> +COMPATIBLE_MACHINE = "(omap3evm|dm37x-evm|am37x-evm)"
>
> SRC_URI_append = " \
> file://doxygen_templates.tar.gz \
> diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
> index d67e787..e96b7d2 100644
> --- a/recipes/u-boot/u-boot_git.bb
> +++ b/recipes/u-boot/u-boot_git.bb
> @@ -110,9 +110,14 @@ SRCREV_omap3evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
> PV_omap3evm = "2009.11+${PR}+gitr${SRCREV}"
>
> # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
> -SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
> -SRCREV_dm3730-am3715-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
> -PV_dm3730-am3715-evm = "2009.11+${PR}+gitr${SRCREV}"
> +SRC_URI_dm37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
> +SRCREV_dm37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
> +PV_dm37x-evm = "2009.11+${PR}+gitr${SRCREV}"
> +
> +# ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
> +SRC_URI_am37x-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
> +SRCREV_am37x-evm = "c0a8fb217fdca7888d89f9a3dee74a4cec865620"
> +PV_am37x-evm = "2009.11+${PR}+gitr${SRCREV}"
>
> # ~ TI PSP v2009.11_OMAPPSP_03.00.01.06 (+ couple of commits)
> SRC_URI_am3517-evm = "git://arago-project.org/git/projects/u-boot-omap3.git;protocol=git"
> diff --git a/recipes/x-load/x-load_git.bb b/recipes/x-load/x-load_git.bb
> index c7bb451..9f8c77d 100644
> --- a/recipes/x-load/x-load_git.bb
> +++ b/recipes/x-load/x-load_git.bb
> @@ -30,9 +30,14 @@ SRCREV_omap3evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
> PV_omap3evm = "1.46+${PR}+gitr${SRCREV}"
>
> # TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
> -SRC_URI_dm3730-am3715-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
> -SRCREV_dm3730-am3715-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
> -PV_dm3730-am3715-evm = "1.46+${PR}+gitr${SRCREV}"
> +SRC_URI_dm37x-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
> +SRCREV_dm37x-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
> +PV_dm37x-evm = "1.46+${PR}+gitr${SRCREV}"
> +
> +# TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
> +SRC_URI_am37x-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
> +SRCREV_am37x-evm = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
> +PV_am37x-evm = "1.46+${PR}+gitr${SRCREV}"
>
> # TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
> SRC_URI_am3517-evm = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
> diff --git a/recipes/xorg-xserver/xserver-xorg-conf/dm3730-am3715-evm/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
> similarity index 100%
> rename from recipes/xorg-xserver/xserver-xorg-conf/dm3730-am3715-evm/xorg.conf
> rename to recipes/xorg-xserver/xserver-xorg-conf/am37x-evm/xorg.conf
> diff --git a/recipes/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
> similarity index 100%
> copy from recipes/xorg-xserver/xserver-xorg-conf/am3517-evm/xorg.conf
> copy to recipes/xorg-xserver/xserver-xorg-conf/dm37x-evm/xorg.conf
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-16 13:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-16 13:24 [PATCH 1/2] dm3730-am3715-evm: split machine type into two Chase Maupin
2010-07-16 13:24 ` [PATCH 2/2] remove dm3730-am3715-evm machine type references Chase Maupin
2010-07-16 13:48 ` Denys Dmytriyenko
2010-07-16 13:48 ` [PATCH 1/2] dm3730-am3715-evm: split machine type into two Denys Dmytriyenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox