[PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot recipe

[PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot recipe

[Chase Maupin]

* Pull the TI staging U-Boot tree for use with ti33x devices and
  the omap-a15 devices.
* Used the PN u-boot-ti-staging to make it easy to set a
  PREFERRED_PROVIDER in the machine configuration to point to
  this recipe instead of the default u-boot recipe since TI devices
  should point to the TI staging trees by default.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 ...> u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
 copy recipes-bsp/u-boot/{u-boot_2011.09-psp04.06.00.08.bb => u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} (61%)

diff --git a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb
similarity index 61%
copy from recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
copy to recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb
index 1bd4b9e..67e1988 100644
--- a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb
@@ -1,11 +1,11 @@
 # Use the version of u-boot.inc in oe-core not the meta-ti version
 require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
 
-DESCRIPTION = "u-boot bootloader for ARM MPU devices"
+DESCRIPTION = "u-boot bootloader for TI devices"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-COMPATIBLE_MACHINE = "ti33x|omap3"
+COMPATIBLE_MACHINE = "ti33x|omap3|omap-a15"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -13,13 +13,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PR = "r0+gitr${SRCPV}"
 
-SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://gitorious.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}"
 
-BRANCH = "AM335XPSP_04.06.00.08"
+BRANCH = "ti-u-boot-2013.01.01"
 
 # Lock to the commit corresponding to TAG:
-# v2011.09_AM335xPSP_04.06.00.08
-SRCREV = "1e4626f0d5f3bb04ec974e76a5d9029875269d31"
+# TBD
+SRCREV = "c44c35e24b1532272118c58c57f658f21b72a4dd"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.0.4

[PATCH 2/3] linux-ti-staging: Add OMAP5 support

[Chase Maupin]

* Add the KERNEL_DEVICETREE definitions for omap5-evm
* Add the omap-a15 SOC_FAMILY to the list of COMPATIBLE_MACHINEs

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 recipes-kernel/linux/linux-ti-staging_git.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index 9ce507b..19b6254 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -32,8 +32,9 @@ DEPENDS_ti33x += "am33x-cm3"
 # for the specific beaglebone machine.
 KERNEL_DEVICETREE_ti33x = "arch/arm/boot/dts/am335x-evm.dts arch/arm/boot/dts/am335x-evmsk.dts arch/arm/boot/dts/am335x-bone.dts"
 KERNEL_DEVICETREE_beaglebone = "arch/arm/boot/dts/am335x-bone.dts"
+KERNEL_DEVICETREE_omap5-evm = "arch/arm/boot/dts/omap5-evm.dts"
 
-COMPATIBLE_MACHINE = "ti33x"
+COMPATIBLE_MACHINE = "ti33x|omap-a15"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.0.4

[PATCH 3/3] omap5-evm: Add OMAP5 EVM configuration

[Chase Maupin]

* Add the machine configuration for the OMAP5 EVM device.
* Create the omap-a15.inc file to be shared with all Cortex-A15
  derivative devices.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 .../machine/include/{keystone.inc => omap-a15.inc} |   14 +++++++-------
 conf/machine/{am335x-evm.conf => omap5-evm.conf}   |   17 +++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)
 copy conf/machine/include/{keystone.inc => omap-a15.inc} (52%)
 copy conf/machine/{am335x-evm.conf => omap5-evm.conf} (78%)

diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/omap-a15.inc
similarity index 52%
copy from conf/machine/include/keystone.inc
copy to conf/machine/include/omap-a15.inc
index bd447d4..3ea1a05 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -1,18 +1,18 @@
-SOC_FAMILY = "keystone"
+SOC_FAMILY = "omap-a15"
 require conf/machine/include/soc-family.inc
 
 require conf/machine/include/tune-cortexa15.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-keystone"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r5"
+MACHINE_KERNEL_PR = "r0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-EXTRA_IMAGEDEPENDS += "u-boot"
-EXTRA_IMAGEDEPENDS += "boot-monitor"
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/omap5-evm.conf
similarity index 78%
copy from conf/machine/am335x-evm.conf
copy to conf/machine/omap5-evm.conf
index 2889358..daa5f58 100644
--- a/conf/machine/am335x-evm.conf
+++ b/conf/machine/omap5-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: AM335x EVM
-#@DESCRIPTION: Machine configuration for the TI AM335x EVM
+#@NAME: OMAP5 EVM
+#@DESCRIPTION: Machine configuration for the TI OMAP5 uEVM
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -9,14 +9,12 @@ XSERVER = "xserver-xorg \
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-require conf/machine/include/ti33x.inc
+require conf/machine/include/omap-a15.inc
 
 IMAGE_FSTYPES += "ubi tar.gz"
 
 SERIAL_CONSOLE = "115200 ttyO0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti33x-psp"
-
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
 # details about this board please see
@@ -38,9 +36,8 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
 # UBI: VID header offset:          2048 (aligned 2048)
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-
-UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "am335x_evm_config"
+UBOOT_MACHINE = "omap5_evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx"
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
-- 
1.7.0.4

Re: [PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot recipe

[Maupin, Chase]

> -----Original Message-----
> From: Maupin, Chase
> Sent: Monday, March 11, 2013 3:17 PM
> To: meta-ti@yoctoproject.org
> Cc: Maupin, Chase
> Subject: [PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot
> recipe
> 

Denys,

I know you are working on something here too.  I just wanted to give you an idea of what I was using for comparison.

> * Pull the TI staging U-Boot tree for use with ti33x devices and
>   the omap-a15 devices.
> * Used the PN u-boot-ti-staging to make it easy to set a
>   PREFERRED_PROVIDER in the machine configuration to point to
>   this recipe instead of the default u-boot recipe since TI
> devices
>   should point to the TI staging trees by default.
> 
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
>  ...> u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} |   12
> ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
>  copy recipes-bsp/u-boot/{u-boot_2011.09-psp04.06.00.08.bb => u-
> boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} (61%)
> 
> diff --git a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb
> similarity index 61%
> copy from recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> copy to recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-
> ti2013.2Q.00.bb
> index 1bd4b9e..67e1988 100644
> --- a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-
> ti2013.2Q.00.bb
> @@ -1,11 +1,11 @@
>  # Use the version of u-boot.inc in oe-core not the meta-ti
> version
>  require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
> 
> -DESCRIPTION = "u-boot bootloader for ARM MPU devices"
> +DESCRIPTION = "u-boot bootloader for TI devices"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM =
> "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
> 
> -COMPATIBLE_MACHINE = "ti33x|omap3"
> +COMPATIBLE_MACHINE = "ti33x|omap3|omap-a15"
> 
>  DEFAULT_PREFERENCE = "-1"
> 
> @@ -13,13 +13,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
>  PR = "r0+gitr${SRCPV}"
> 
> -SRC_URI = "git://arago-project.org/git/projects/u-boot-
> am33x.git;protocol=git;branch=${BRANCH}"
> +SRC_URI = "git://gitorious.ti.com/ti-u-boot/ti-u-
> boot.git;protocol=git;branch=${BRANCH}"
> 
> -BRANCH = "AM335XPSP_04.06.00.08"
> +BRANCH = "ti-u-boot-2013.01.01"
> 
>  # Lock to the commit corresponding to TAG:
> -# v2011.09_AM335xPSP_04.06.00.08
> -SRCREV = "1e4626f0d5f3bb04ec974e76a5d9029875269d31"
> +# TBD
> +SRCREV = "c44c35e24b1532272118c58c57f658f21b72a4dd"
> 
>  S = "${WORKDIR}/git"
> 
> --
> 1.7.0.4

Re: [PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot recipe

[Denys Dmytriyenko]

On Mon, Mar 11, 2013 at 08:18:36PM +0000, Maupin, Chase wrote:
> > -----Original Message-----
> > From: Maupin, Chase
> > Sent: Monday, March 11, 2013 3:17 PM
> > To: meta-ti@yoctoproject.org
> > Cc: Maupin, Chase
> > Subject: [PATCH 1/3] u-boot-ti-staging: Add TI staging U-Boot
> > recipe
> > 
> 
> Denys,
> 
> I know you are working on something here too.  I just wanted to give you an 
> idea of what I was using for comparison.

Thanks for the heads up! I'll try to incorporate this in my work.

-- 
Denys


> > * Pull the TI staging U-Boot tree for use with ti33x devices and
> >   the omap-a15 devices.
> > * Used the PN u-boot-ti-staging to make it easy to set a
> >   PREFERRED_PROVIDER in the machine configuration to point to
> >   this recipe instead of the default u-boot recipe since TI
> > devices
> >   should point to the TI staging trees by default.
> > 
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> >  ...> u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} |   12
> > ++++++------
> >  1 files changed, 6 insertions(+), 6 deletions(-)
> >  copy recipes-bsp/u-boot/{u-boot_2011.09-psp04.06.00.08.bb => u-
> > boot-ti-staging_2013.01.01-ti2013.2Q.00.bb} (61%)
> > 
> > diff --git a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> > b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-ti2013.2Q.00.bb
> > similarity index 61%
> > copy from recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> > copy to recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-
> > ti2013.2Q.00.bb
> > index 1bd4b9e..67e1988 100644
> > --- a/recipes-bsp/u-boot/u-boot_2011.09-psp04.06.00.08.bb
> > +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2013.01.01-
> > ti2013.2Q.00.bb
> > @@ -1,11 +1,11 @@
> >  # Use the version of u-boot.inc in oe-core not the meta-ti
> > version
> >  require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc
> > 
> > -DESCRIPTION = "u-boot bootloader for ARM MPU devices"
> > +DESCRIPTION = "u-boot bootloader for TI devices"
> >  LICENSE = "GPLv2+"
> >  LIC_FILES_CHKSUM =
> > "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
> > 
> > -COMPATIBLE_MACHINE = "ti33x|omap3"
> > +COMPATIBLE_MACHINE = "ti33x|omap3|omap-a15"
> > 
> >  DEFAULT_PREFERENCE = "-1"
> > 
> > @@ -13,13 +13,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
> > 
> >  PR = "r0+gitr${SRCPV}"
> > 
> > -SRC_URI = "git://arago-project.org/git/projects/u-boot-
> > am33x.git;protocol=git;branch=${BRANCH}"
> > +SRC_URI = "git://gitorious.ti.com/ti-u-boot/ti-u-
> > boot.git;protocol=git;branch=${BRANCH}"
> > 
> > -BRANCH = "AM335XPSP_04.06.00.08"
> > +BRANCH = "ti-u-boot-2013.01.01"
> > 
> >  # Lock to the commit corresponding to TAG:
> > -# v2011.09_AM335xPSP_04.06.00.08
> > -SRCREV = "1e4626f0d5f3bb04ec974e76a5d9029875269d31"
> > +# TBD
> > +SRCREV = "c44c35e24b1532272118c58c57f658f21b72a4dd"
> > 
> >  S = "${WORKDIR}/git"
> > 
> > --
> > 1.7.0.4
> 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>