[PATCH 1/5] setup-defconfig: move from meta-arago to meta-ti

[PATCH 1/5] setup-defconfig: move from meta-arago to meta-ti

[Chase Maupin]

* Moved the setup-defconfig.inc file from meta-arago to meta-ti.
  This functionality is used by the SDKs to allow the option for
  using an in-tree configuration file for the kernel build.
* This option was chosen to make it easy for other layers to
  override the config with their own using the normal OE method
  of specifying a defconfig file in their layer rather than having
  to use some custom variable setting.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 recipes-kernel/linux/setup-defconfig.inc |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 recipes-kernel/linux/setup-defconfig.inc

diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc
new file mode 100644
index 0000000..fc5e18e
--- /dev/null
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -0,0 +1,26 @@
+# Check the defconfig file and see if it points to an in kernel
+# defconfig that should be used, or if it is a complete config file
+
+addtask setup_defconfig before do_configure after do_patch
+do_setup_defconfig() {
+    # Always copy the defconfig file to .config to keep consistency
+    # between the case where there is a real config and the in kernel
+    # tree config
+    cp ${WORKDIR}/defconfig ${S}/.config
+}
+
+# define our own do_configure that will:
+#   1. Check the .config file and see if string use-kernel-config= is present
+#   2. If the use-kernel-config string is present parse out the config to use
+#      and run make ${config}
+#   3. else run yes '' | oe_runmake oldconfig like the default do_configure
+#      does
+do_configure() {
+    config=`cat ${S}/.config | grep use-kernel-config | cut -d= -f2`
+    if [ "x${config}" != "x" ]
+    then
+        oe_runmake ${config}
+    else
+        yes '' | oe_runmake oldconfig
+    fi
+}
-- 
1.7.0.4

[PATCH 2/5] linux-ti-staging: use setup-defconfig

[Chase Maupin]

* Use the setup-defconfig.inc functionality to specify the in
  kernel tree defconfig file to use rather than hard coding it
  in the do_configure step.
* This is to make it easier to modify which configs are use by
  other layers as well as supporting additional machines which
  may not use omap2plus_defconfig as needed.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 recipes-kernel/linux/linux-ti-staging/defconfig |    1 +
 recipes-kernel/linux/linux-ti-staging_git.bb    |   15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-ti-staging/defconfig

diff --git a/recipes-kernel/linux/linux-ti-staging/defconfig b/recipes-kernel/linux/linux-ti-staging/defconfig
new file mode 100644
index 0000000..926b35a
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging/defconfig
@@ -0,0 +1 @@
+use-kernel-config=omap2plus_defconfig
diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index 8cc7206..2581409 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -6,6 +6,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 inherit kernel
 require recipes-kernel/linux/linux-dtb.inc
+require recipes-kernel/linux/setup-defconfig.inc
 
 # Stage the power management firmware before building the kernel
 DEPENDS += "am33x-cm3"
@@ -23,17 +24,11 @@ SRCREV = "d26595a42220789b81a9d243e2fc0837c7776360"
 PV = "3.8.2"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}"
 
-SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH}"
-
-do_setup_defconfig() {
-        :
-}
-
-do_configure() {
-    oe_runmake omap2plus_defconfig
-}
+SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
+           file://defconfig \
+          "
 
 # Copy the am33x-cm3 firmware if it is available
 do_compile_prepend() {
-- 
1.7.0.4

Re: [PATCH 2/5] linux-ti-staging: use setup-defconfig

[Denys Dmytriyenko]

On Mon, Mar 11, 2013 at 03:03:32PM -0500, Chase Maupin wrote:
> * Use the setup-defconfig.inc functionality to specify the in
>   kernel tree defconfig file to use rather than hard coding it
>   in the do_configure step.
> * This is to make it easier to modify which configs are use by
>   other layers as well as supporting additional machines which
>   may not use omap2plus_defconfig as needed.
> 
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
>  recipes-kernel/linux/linux-ti-staging/defconfig |    1 +
>  recipes-kernel/linux/linux-ti-staging_git.bb    |   15 +++++----------
>  2 files changed, 6 insertions(+), 10 deletions(-)
>  create mode 100644 recipes-kernel/linux/linux-ti-staging/defconfig
> 
> diff --git a/recipes-kernel/linux/linux-ti-staging/defconfig b/recipes-kernel/linux/linux-ti-staging/defconfig
> new file mode 100644
> index 0000000..926b35a
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-ti-staging/defconfig
> @@ -0,0 +1 @@
> +use-kernel-config=omap2plus_defconfig

Do we want this defconfig to be in linux-ti-staging/ti33x to be SoC-specific? 
I see omap5 also uses the same omap2plus_defconfig, so maybe not...

-- 
Denys


> diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
> index 8cc7206..2581409 100644
> --- a/recipes-kernel/linux/linux-ti-staging_git.bb
> +++ b/recipes-kernel/linux/linux-ti-staging_git.bb
> @@ -6,6 +6,7 @@ KERNEL_IMAGETYPE = "uImage"
>  
>  inherit kernel
>  require recipes-kernel/linux/linux-dtb.inc
> +require recipes-kernel/linux/setup-defconfig.inc
>  
>  # Stage the power management firmware before building the kernel
>  DEPENDS += "am33x-cm3"
> @@ -23,17 +24,11 @@ SRCREV = "d26595a42220789b81a9d243e2fc0837c7776360"
>  PV = "3.8.2"
>  
>  # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> -MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
> +MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}"
>  
> -SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH}"
> -
> -do_setup_defconfig() {
> -        :
> -}
> -
> -do_configure() {
> -    oe_runmake omap2plus_defconfig
> -}
> +SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
> +           file://defconfig \
> +          "
>  
>  # Copy the am33x-cm3 firmware if it is available
>  do_compile_prepend() {
> -- 
> 1.7.0.4
> 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
> 

Re: [PATCH 2/5] linux-ti-staging: use setup-defconfig

[Maupin, Chase]

> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, March 11, 2013 4:34 PM
> To: Maupin, Chase
> Cc: meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH 2/5] linux-ti-staging: use setup-
> defconfig
> 
> On Mon, Mar 11, 2013 at 03:03:32PM -0500, Chase Maupin wrote:
> > * Use the setup-defconfig.inc functionality to specify the in
> >   kernel tree defconfig file to use rather than hard coding it
> >   in the do_configure step.
> > * This is to make it easier to modify which configs are use by
> >   other layers as well as supporting additional machines which
> >   may not use omap2plus_defconfig as needed.
> >
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> >  recipes-kernel/linux/linux-ti-staging/defconfig |    1 +
> >  recipes-kernel/linux/linux-ti-staging_git.bb    |   15 +++++--
> --------
> >  2 files changed, 6 insertions(+), 10 deletions(-)
> >  create mode 100644 recipes-kernel/linux/linux-ti-
> staging/defconfig
> >
> > diff --git a/recipes-kernel/linux/linux-ti-staging/defconfig
> b/recipes-kernel/linux/linux-ti-staging/defconfig
> > new file mode 100644
> > index 0000000..926b35a
> > --- /dev/null
> > +++ b/recipes-kernel/linux/linux-ti-staging/defconfig
> > @@ -0,0 +1 @@
> > +use-kernel-config=omap2plus_defconfig
> 
> Do we want this defconfig to be in linux-ti-staging/ti33x to be
> SoC-specific?
> I see omap5 also uses the same omap2plus_defconfig, so maybe
> not...

Since most things so far are using this same config I figured I would leave it generic.  When/if we find the majority of machines using something else then we can change this or split the defconfig out was my thought process.

> 
> --
> Denys
> 
> 
> > diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb
> b/recipes-kernel/linux/linux-ti-staging_git.bb
> > index 8cc7206..2581409 100644
> > --- a/recipes-kernel/linux/linux-ti-staging_git.bb
> > +++ b/recipes-kernel/linux/linux-ti-staging_git.bb
> > @@ -6,6 +6,7 @@ KERNEL_IMAGETYPE = "uImage"
> >
> >  inherit kernel
> >  require recipes-kernel/linux/linux-dtb.inc
> > +require recipes-kernel/linux/setup-defconfig.inc
> >
> >  # Stage the power management firmware before building the
> kernel
> >  DEPENDS += "am33x-cm3"
> > @@ -23,17 +24,11 @@ SRCREV =
> "d26595a42220789b81a9d243e2fc0837c7776360"
> >  PV = "3.8.2"
> >
> >  # Append to the MACHINE_KERNEL_PR so that a new SRCREV will
> cause a rebuild
> > -MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
> > +MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}"
> >
> > -SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-
> kernel.git;protocol=git;branch=${BRANCH}"
> > -
> > -do_setup_defconfig() {
> > -        :
> > -}
> > -
> > -do_configure() {
> > -    oe_runmake omap2plus_defconfig
> > -}
> > +SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-
> kernel.git;protocol=git;branch=${BRANCH} \
> > +           file://defconfig \
> > +          "
> >
> >  # Copy the am33x-cm3 firmware if it is available
> >  do_compile_prepend() {
> > --
> > 1.7.0.4
> >
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >

[PATCH 3/5] linux-ti-staging: mark dependencies am335x specific

[Chase Maupin]

* The DEPENDS on am33x-cm3 and the installation of the cm3
  firmware is specific to ti33x SOC_FAMILY devices.  Mark those
  pieces as specific so that other devices to not depend on
  am335x cm3 firmware.

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

diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index 2581409..5f4a05d 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -9,7 +9,8 @@ require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/setup-defconfig.inc
 
 # Stage the power management firmware before building the kernel
-DEPENDS += "am33x-cm3"
+# for ti33x SOC_FAMILY devices
+DEPENDS_ti33x += "am33x-cm3"
 
 KERNEL_DEVICETREE_am335x-evm = "arch/arm/boot/dts/am335x-evm.dts"
 KERNEL_DEVICETREE_beaglebone = "arch/arm/boot/dts/am335x-bone.dts"
@@ -30,8 +31,8 @@ SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=g
            file://defconfig \
           "
 
-# Copy the am33x-cm3 firmware if it is available
-do_compile_prepend() {
+# Copy the am33x-cm3 firmware if it is available for ti33x SOC_FAMILY devices
+do_compile_prepend_ti33x() {
     if [ -e "${STAGING_DIR_HOST}/${base_libdir}/firmware/am335x-pm-firmware.bin" ]
     then
         cp "${STAGING_DIR_HOST}/${base_libdir}/firmware/am335x-pm-firmware.bin" "${S}/firmware"
-- 
1.7.0.4

[PATCH 4/5] linux-ti-staging: package all dtb files for ti33x

[Chase Maupin]

* For the ti33x SOC_FAMILY device package the dtb files for all
  of the am335x boards instead of just the single EVM file.

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

diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index 5f4a05d..f6fa6d2 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -12,7 +12,9 @@ require recipes-kernel/linux/setup-defconfig.inc
 # for ti33x SOC_FAMILY devices
 DEPENDS_ti33x += "am33x-cm3"
 
-KERNEL_DEVICETREE_am335x-evm = "arch/arm/boot/dts/am335x-evm.dts"
+# Default is to package all dts files for ti33x devices unless building
+# 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"
 
 COMPATIBLE_MACHINE = "ti33x"
@@ -25,7 +27,7 @@ SRCREV = "d26595a42220789b81a9d243e2fc0837c7776360"
 PV = "3.8.2"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}"
 
 SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
            file://defconfig \
-- 
1.7.0.4

[PATCH 5/5] linux-ti-staging: fix DTB deploy steps

[Chase Maupin]

* Until the permanent fix can be picked up in oe-core fix the
  do_deploy function to properly package the dtb files built
  as part of the kernel build.

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

diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb
index f6fa6d2..9ce507b 100644
--- a/recipes-kernel/linux/linux-ti-staging_git.bb
+++ b/recipes-kernel/linux/linux-ti-staging_git.bb
@@ -5,6 +5,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 KERNEL_IMAGETYPE = "uImage"
 
 inherit kernel
+
+# This function must be here BEFORE the require of linux-dtb.inc below.
+# There is a "bug" in the base kernel.bbclass that after it's do_deploy
+# step it does not return back to the ${S} directory but stays in the
+# DEPLOY_DIR.  However, the do_deploy_append defined in linux-dtb.inc
+# assumes that it is being run in the ${S} directory.  A patch is
+# being submitted to fix this issue by either changing the do_deploy
+# in the kernel.bbclass to do "cd -" as the last step or to add
+# "cd ${S}" as the first line of do_deploy in linux-dtb.inc and this
+# function can be removed once that change is available.
+# If the function is not placed BEFORE the require then the change
+# directory is not appended before the linux-dtb.inc changes.
+do_deploy_append() {
+    cd ${S}
+}
+
 require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/setup-defconfig.inc
 
@@ -27,7 +43,7 @@ SRCREV = "d26595a42220789b81a9d243e2fc0837c7776360"
 PV = "3.8.2"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}"
 
 SRC_URI = "git://gitorious.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
            file://defconfig \
-- 
1.7.0.4