All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] sitara-linux-ti-staging: Create recipe for Sitara 3.14 kernel tree
@ 2015-01-14 20:43 Franklin S. Cooper Jr
  2015-01-14 21:02 ` Denys Dmytriyenko
  0 siblings, 1 reply; 3+ messages in thread
From: Franklin S. Cooper Jr @ 2015-01-14 20:43 UTC (permalink / raw)
  To: meta-ti

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* The Sitara 3.14 Kernel tree is based on the linux-ti-staging_3.14 recipe and
  kernel. However, the tree includes additional patches and configs.
* This tree is only meant for AM335x and AM437x

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../linux/sitara-linux-ti-staging-3.14/defconfig   |    1 +
 ...ing_3.14.bb => sitara-linux-ti-staging_3.14.bb} |   23 ++++----------------
 2 files changed, 5 insertions(+), 19 deletions(-)
 create mode 100644 recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
 copy recipes-kernel/linux/{linux-ti-staging_3.14.bb => sitara-linux-ti-staging_3.14.bb} (58%)

diff --git a/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
new file mode 100644
index 0000000..98c4069
--- /dev/null
+++ b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
@@ -0,0 +1 @@
+use-kernel-config=singlecore-omap2plus_defconfig
diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
similarity index 58%
copy from recipes-kernel/linux/linux-ti-staging_3.14.bb
copy to recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
index d762be8..f9c4641 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.14.bb
+++ b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
@@ -20,46 +20,31 @@ RDEPENDS_kernel-base += "kernel-devicetree"
 RDEPENDS_kernel-base_append_ti33x = " am33x-cm3"
 RDEPENDS_kernel-base_append_ti43x = " am33x-cm3"
 
-# Add a run-time dependency for the VPE VPDMA firmware to be installed
-# on the target file system.
-RDEPENDS_kernel-base_append_dra7xx = " vpe-vpdma-fw"
 
 # Default is to package all dtb files for ti33x devices unless building
 # for the specific beaglebone machine.
 KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
 KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb"
 KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb"
-KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
-KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra7-evm-lcd7.dtb dra7-evm-lcd10.dtb dra72-evm.dtb dra72-evm-lcd7.dtb dra72-evm-lcd10.dtb am57xx-beagle-x15.dtb"
-KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb"
-KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
-KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
-KERNEL_DEVICETREE_am37x-evm = "omap3-evm-37xx.dtb"
-KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-xm.dtb"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3"
+COMPATIBLE_MACHINE = "ti33x|ti43x"
 
 S = "${WORKDIR}/git"
 
-BRANCH = "ti-linux-3.14.y"
+BRANCH = "sitara-ti-linux-3.14.y"
 
-SRCREV = "7828f3b4cb26fa9c978aa96cc46cca8521957f24"
+SRCREV = "2d7148a3a95a2811604611f6c66a8826a61b8b12"
 PV = "3.14.26"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}"
 PR = "${MACHINE_KERNEL_PR}"
 
-KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
-
-KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
-KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
-
 MULTI_CONFIG_BASE_SUFFIX = ""
 
-KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_URI = "git://git.ti.com/sitara-linux/sitara-linux.git"
 KERNEL_GIT_PROTOCOL = "git"
 SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
             file://defconfig \
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] sitara-linux-ti-staging: Create recipe for Sitara 3.14 kernel tree
  2015-01-14 20:43 [PATCH] sitara-linux-ti-staging: Create recipe for Sitara 3.14 kernel tree Franklin S. Cooper Jr
@ 2015-01-14 21:02 ` Denys Dmytriyenko
  2015-01-14 22:11   ` Cooper Jr., Franklin
  0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2015-01-14 21:02 UTC (permalink / raw)
  To: Franklin S. Cooper Jr; +Cc: meta-ti

Franklin,

Isn't it heavy-handed? How many changes on top do you foresee you'd need? Have 
you considered doing those changes (patches or configs) inside the recipe 
itself?

-- 
Denys


On Wed, Jan 14, 2015 at 02:43:29PM -0600, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> * The Sitara 3.14 Kernel tree is based on the linux-ti-staging_3.14 recipe and
>   kernel. However, the tree includes additional patches and configs.
> * This tree is only meant for AM335x and AM437x
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../linux/sitara-linux-ti-staging-3.14/defconfig   |    1 +
>  ...ing_3.14.bb => sitara-linux-ti-staging_3.14.bb} |   23 ++++----------------
>  2 files changed, 5 insertions(+), 19 deletions(-)
>  create mode 100644 recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
>  copy recipes-kernel/linux/{linux-ti-staging_3.14.bb => sitara-linux-ti-staging_3.14.bb} (58%)
> 
> diff --git a/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
> new file mode 100644
> index 0000000..98c4069
> --- /dev/null
> +++ b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
> @@ -0,0 +1 @@
> +use-kernel-config=singlecore-omap2plus_defconfig
> diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
> similarity index 58%
> copy from recipes-kernel/linux/linux-ti-staging_3.14.bb
> copy to recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
> index d762be8..f9c4641 100644
> --- a/recipes-kernel/linux/linux-ti-staging_3.14.bb
> +++ b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
> @@ -20,46 +20,31 @@ RDEPENDS_kernel-base += "kernel-devicetree"
>  RDEPENDS_kernel-base_append_ti33x = " am33x-cm3"
>  RDEPENDS_kernel-base_append_ti43x = " am33x-cm3"
>  
> -# Add a run-time dependency for the VPE VPDMA firmware to be installed
> -# on the target file system.
> -RDEPENDS_kernel-base_append_dra7xx = " vpe-vpdma-fw"
>  
>  # Default is to package all dtb files for ti33x devices unless building
>  # for the specific beaglebone machine.
>  KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
>  KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-evm.dtb"
>  KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-boneblack.dtb"
> -KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
> -KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra7-evm-lcd7.dtb dra7-evm-lcd10.dtb dra72-evm.dtb dra72-evm-lcd7.dtb dra72-evm-lcd10.dtb am57xx-beagle-x15.dtb"
> -KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb"
> -KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
> -KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
> -KERNEL_DEVICETREE_am37x-evm = "omap3-evm-37xx.dtb"
> -KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-xm.dtb"
>  
>  KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
>  
> -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3"
> +COMPATIBLE_MACHINE = "ti33x|ti43x"
>  
>  S = "${WORKDIR}/git"
>  
> -BRANCH = "ti-linux-3.14.y"
> +BRANCH = "sitara-ti-linux-3.14.y"
>  
> -SRCREV = "7828f3b4cb26fa9c978aa96cc46cca8521957f24"
> +SRCREV = "2d7148a3a95a2811604611f6c66a8826a61b8b12"
>  PV = "3.14.26"
>  
>  # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
>  MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}"
>  PR = "${MACHINE_KERNEL_PR}"
>  
> -KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
> -
> -KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
> -KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
> -
>  MULTI_CONFIG_BASE_SUFFIX = ""
>  
> -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
> +KERNEL_GIT_URI = "git://git.ti.com/sitara-linux/sitara-linux.git"
>  KERNEL_GIT_PROTOCOL = "git"
>  SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
>              file://defconfig \
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sitara-linux-ti-staging: Create recipe for Sitara 3.14 kernel tree
  2015-01-14 21:02 ` Denys Dmytriyenko
@ 2015-01-14 22:11   ` Cooper Jr., Franklin
  0 siblings, 0 replies; 3+ messages in thread
From: Cooper Jr., Franklin @ 2015-01-14 22:11 UTC (permalink / raw)
  To: Dmytriyenko, Denys; +Cc: meta-ti



> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Wednesday, January 14, 2015 3:02 PM
> To: Cooper Jr., Franklin
> Cc: meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH] sitara-linux-ti-staging: Create recipe for Sitara
> 3.14 kernel tree
> 
> Franklin,
> 
> Isn't it heavy-handed?
[Franklin] Yes :(
 How many changes on top do you foresee you'd
> need? 
[Franklin] Very little
Have you considered doing those changes (patches or configs) inside
> the recipe itself?
[Franklin] Yes. We want to point customers to a commit with all of our patches and configs. We don't want to give them a list of patches they need to apply themselves. So no matter what we will end up needing a separate git tree.

When the customer downloads the SDK I end up having to tell customers to go to the git tree and manually commit the patches that OE applied and create a branch that only exist on their local setup. They end up being confused since now the git tree inside of the sdk is different than the one they cloned manually. 

For AMSDK 7 this was painful when disabling SMP wasn't a part of the git tree and was only an OE patch. It's surprising how many issues that were reported to simply find out that a customer either cloned the kernel git tree manually or used the git tree within the SDK but checked out the tag or commit id we have in our documentation (doesn't include the patches). It even made creating the PRU addon package for SDK 7 complicated due to these out of tree patches.

It is heavy-handed and honestly something I tried extremely hard to avoid but since I was unable to get the patches and config added to the main git tree I was left with no choice.
> 
> --
> Denys
> 
> 
> On Wed, Jan 14, 2015 at 02:43:29PM -0600, Franklin S. Cooper Jr wrote:
> > From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> >
> > * The Sitara 3.14 Kernel tree is based on the linux-ti-staging_3.14 recipe
> and
> >   kernel. However, the tree includes additional patches and configs.
> > * This tree is only meant for AM335x and AM437x
> >
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> >  .../linux/sitara-linux-ti-staging-3.14/defconfig   |    1 +
> >  ...ing_3.14.bb => sitara-linux-ti-staging_3.14.bb} |   23 ++++----------------
> >  2 files changed, 5 insertions(+), 19 deletions(-)
> >  create mode 100644 recipes-kernel/linux/sitara-linux-ti-staging-
> 3.14/defconfig
> >  copy recipes-kernel/linux/{linux-ti-staging_3.14.bb => sitara-linux-ti-
> staging_3.14.bb} (58%)
> >
> > diff --git a/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
> b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
> > new file mode 100644
> > index 0000000..98c4069
> > --- /dev/null
> > +++ b/recipes-kernel/linux/sitara-linux-ti-staging-3.14/defconfig
> > @@ -0,0 +1 @@
> > +use-kernel-config=singlecore-omap2plus_defconfig
> > diff --git a/recipes-kernel/linux/linux-ti-staging_3.14.bb b/recipes-
> kernel/linux/sitara-linux-ti-staging_3.14.bb
> > similarity index 58%
> > copy from recipes-kernel/linux/linux-ti-staging_3.14.bb
> > copy to recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
> > index d762be8..f9c4641 100644
> > --- a/recipes-kernel/linux/linux-ti-staging_3.14.bb
> > +++ b/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bb
> > @@ -20,46 +20,31 @@ RDEPENDS_kernel-base += "kernel-devicetree"
> >  RDEPENDS_kernel-base_append_ti33x = " am33x-cm3"
> >  RDEPENDS_kernel-base_append_ti43x = " am33x-cm3"
> >
> > -# Add a run-time dependency for the VPE VPDMA firmware to be installed
> > -# on the target file system.
> > -RDEPENDS_kernel-base_append_dra7xx = " vpe-vpdma-fw"
> >
> >  # Default is to package all dtb files for ti33x devices unless building
> >  # for the specific beaglebone machine.
> >  KERNEL_DEVICETREE_ti33x = "am335x-evm.dtb am335x-evmsk.dtb
> am335x-bone.dtb am335x-boneblack.dtb"
> >  KERNEL_DEVICETREE_ti43x = "am43x-epos-evm.dtb am43x-epos-evm-
> hdmi.dtb am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb am437x-sk-
> evm.dtb"
> >  KERNEL_DEVICETREE_beaglebone = "am335x-bone.dtb am335x-
> boneblack.dtb"
> > -KERNEL_DEVICETREE_omap5-evm = "omap5-uevm.dtb"
> > -KERNEL_DEVICETREE_dra7xx = "dra7-evm.dtb dra7-evm-lcd7.dtb dra7-
> evm-lcd10.dtb dra72-evm.dtb dra72-evm-lcd7.dtb dra72-evm-lcd10.dtb
> am57xx-beagle-x15.dtb"
> > -KERNEL_DEVICETREE_am57xx-evm = "am57xx-beagle-x15.dtb"
> > -KERNEL_DEVICETREE_omap3 = "omap3-beagle.dtb omap3-beagle-xm.dtb
> omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
> > -KERNEL_DEVICETREE_am3517-evm = "am3517-evm.dtb"
> > -KERNEL_DEVICETREE_am37x-evm = "omap3-evm-37xx.dtb"
> > -KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-
> xm.dtb"
> >
> >  KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
> >
> > -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3"
> > +COMPATIBLE_MACHINE = "ti33x|ti43x"
> >
> >  S = "${WORKDIR}/git"
> >
> > -BRANCH = "ti-linux-3.14.y"
> > +BRANCH = "sitara-ti-linux-3.14.y"
> >
> > -SRCREV = "7828f3b4cb26fa9c978aa96cc46cca8521957f24"
> > +SRCREV = "2d7148a3a95a2811604611f6c66a8826a61b8b12"
> >  PV = "3.14.26"
> >
> >  # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a
> rebuild
> >  MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}"
> >  PR = "${MACHINE_KERNEL_PR}"
> >
> > -KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
> > -
> > -KERNEL_CONFIG_FRAGMENTS_append_ti33x = "
> ${KERNEL_CONFIG_DIR}/am33xx_only.cfg"
> > -KERNEL_CONFIG_FRAGMENTS_append_ti43x = "
> ${KERNEL_CONFIG_DIR}/am43xx_only.cfg"
> > -
> >  MULTI_CONFIG_BASE_SUFFIX = ""
> >
> > -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
> > +KERNEL_GIT_URI = "git://git.ti.com/sitara-linux/sitara-linux.git"
> >  KERNEL_GIT_PROTOCOL = "git"
> >  SRC_URI +=
> "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRAN
> CH} \
> >              file://defconfig \
> > --
> > 1.7.9.5
> >
> > --
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-01-14 22:11 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-14 20:43 [PATCH] sitara-linux-ti-staging: Create recipe for Sitara 3.14 kernel tree Franklin S. Cooper Jr
2015-01-14 21:02 ` Denys Dmytriyenko
2015-01-14 22:11   ` Cooper Jr., Franklin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.