| Message ID | 20230602092932.2576466-1-p-bhagat@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [kirkstone] meta-ti-bsp: Add recipe for u-boot-ti-jailhouse and linux-ti-jailhouse | expand |
On Fri, Jun 02, 2023 at 02:59:32PM +0530, Paresh Bhagat via lists.yoctoproject.org wrote: > Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains > patches used for jailhouse. These will be used to build jailhouse image. > > Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> > --- > .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ > .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + > .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + > .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + > .../linux/linux-ti-jailhouse_6.1.bb | 37 +++++++++++++++++++ > 5 files changed, 53 insertions(+) > create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb > create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig > create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig > create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig > create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb > > diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb > new file mode 100644 > index 00000000..be374108 > --- /dev/null > +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb > @@ -0,0 +1,11 @@ > +require u-boot-ti.inc > + > +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" > + > +PR = "r0" > + > +BRANCH = "ti-u-boot-2023.04-jailhouse" > + > +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" > + > +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig > new file mode 100644 > index 00000000..24b53cf7 > --- /dev/null > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig > @@ -0,0 +1,2 @@ > +use-kernel-config=multi_v7_defconfig > +config-fragment=kernel/configs/ti_multi_v7_prune.config > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig > new file mode 100644 > index 00000000..ef1d3efd > --- /dev/null > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig > @@ -0,0 +1,2 @@ > +use-kernel-config=defconfig > +config-fragment=kernel/configs/ti_arm64_prune.config > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig > new file mode 100644 > index 00000000..099493af > --- /dev/null > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig > @@ -0,0 +1 @@ > +use-kernel-config=davinci_all_defconfig > diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb > new file mode 100644 > index 00000000..85eaba25 > --- /dev/null > +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb > @@ -0,0 +1,37 @@ Can you do it similarly to linux-ti-staging-rt recipe by not duplicating the entire base recipe? > +SECTION = "kernel" > +SUMMARY = "Linux kernel for jailhouse for TI devices" > +LICENSE = "GPL-2.0-only" > +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" > + > +COMPATIBLE_MACHINE = "am62xx-evm" > + > +inherit kernel_vendor_dtb > + > +require recipes-kernel/linux/setup-defconfig.inc > +require recipes-kernel/linux/kernel-rdepends.inc > +require recipes-kernel/linux/ti-kernel.inc > +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} > + > +DEPENDS += "gmp-native libmpc-native" > + > +# Look in the generic major.minor directory for files > +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" > + > +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ > + ${EXTRA_DTC_ARGS}" > + > +S = "${WORKDIR}/git" > + > +BRANCH = "ti-linux-6.1.y-jailhouse" > + > +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" > +PV = "6.1.26+git${SRCPV}" > + > +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild > +MACHINE_KERNEL_PR:append = "b" > +PR = "${MACHINE_KERNEL_PR}" > + > +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" > +KERNEL_GIT_PROTOCOL = "https" > +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ > + file://defconfig" > -- > 2.34.1
On 6/2/2023 7:21, Denys Dmytriyenko wrote: > On Fri, Jun 02, 2023 at 02:59:32PM +0530, Paresh Bhagat via lists.yoctoproject.org wrote: >> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains >> patches used for jailhouse. These will be used to build jailhouse image. >> >> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> >> --- >> .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ >> .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + >> .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + >> .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + >> .../linux/linux-ti-jailhouse_6.1.bb | 37 +++++++++++++++++++ >> 5 files changed, 53 insertions(+) >> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> >> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> new file mode 100644 >> index 00000000..be374108 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> @@ -0,0 +1,11 @@ >> +require u-boot-ti.inc >> + >> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" >> + >> +PR = "r0" >> + >> +BRANCH = "ti-u-boot-2023.04-jailhouse" >> + >> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" >> + >> +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> new file mode 100644 >> index 00000000..24b53cf7 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> @@ -0,0 +1,2 @@ >> +use-kernel-config=multi_v7_defconfig >> +config-fragment=kernel/configs/ti_multi_v7_prune.config >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> new file mode 100644 >> index 00000000..ef1d3efd >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> @@ -0,0 +1,2 @@ >> +use-kernel-config=defconfig >> +config-fragment=kernel/configs/ti_arm64_prune.config >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> new file mode 100644 >> index 00000000..099493af >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> @@ -0,0 +1 @@ >> +use-kernel-config=davinci_all_defconfig >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> new file mode 100644 >> index 00000000..85eaba25 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> @@ -0,0 +1,37 @@ > > Can you do it similarly to linux-ti-staging-rt recipe by not duplicating the > entire base recipe? I was going to ask the same question. > >> +SECTION = "kernel" >> +SUMMARY = "Linux kernel for jailhouse for TI devices" >> +LICENSE = "GPL-2.0-only" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> + >> +COMPATIBLE_MACHINE = "am62xx-evm" >> + >> +inherit kernel_vendor_dtb >> + >> +require recipes-kernel/linux/setup-defconfig.inc >> +require recipes-kernel/linux/kernel-rdepends.inc >> +require recipes-kernel/linux/ti-kernel.inc >> +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} >> + >> +DEPENDS += "gmp-native libmpc-native" >> + >> +# Look in the generic major.minor directory for files >> +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" >> + >> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ >> + ${EXTRA_DTC_ARGS}" >> + >> +S = "${WORKDIR}/git" >> + >> +BRANCH = "ti-linux-6.1.y-jailhouse" >> + >> +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" >> +PV = "6.1.26+git${SRCPV}" >> + >> +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild >> +MACHINE_KERNEL_PR:append = "b" >> +PR = "${MACHINE_KERNEL_PR}" >> + >> +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" >> +KERNEL_GIT_PROTOCOL = "https" >> +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ >> + file://defconfig" >> -- >> 2.34.1
On Fri, Jun 2, 2023 at 6:29 AM Paresh Bhagat via lists.yoctoproject.org <p-bhagat=ti.com@lists.yoctoproject.org> wrote: > > Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains > patches used for jailhouse. These will be used to build jailhouse image. Should a new u-boot recipe be created for just one patch?
On 02/06/23 17:51, Denys Dmytriyenko wrote: > On Fri, Jun 02, 2023 at 02:59:32PM +0530, Paresh Bhagat via lists.yoctoproject.org wrote: >> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains >> patches used for jailhouse. These will be used to build jailhouse image. >> >> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> >> --- >> .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ >> .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + >> .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + >> .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + >> .../linux/linux-ti-jailhouse_6.1.bb | 37 +++++++++++++++++++ >> 5 files changed, 53 insertions(+) >> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> >> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> new file mode 100644 >> index 00000000..be374108 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >> @@ -0,0 +1,11 @@ >> +require u-boot-ti.inc >> + >> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" >> + >> +PR = "r0" >> + >> +BRANCH = "ti-u-boot-2023.04-jailhouse" >> + >> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" >> + >> +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> new file mode 100644 >> index 00000000..24b53cf7 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >> @@ -0,0 +1,2 @@ >> +use-kernel-config=multi_v7_defconfig >> +config-fragment=kernel/configs/ti_multi_v7_prune.config >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> new file mode 100644 >> index 00000000..ef1d3efd >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >> @@ -0,0 +1,2 @@ >> +use-kernel-config=defconfig >> +config-fragment=kernel/configs/ti_arm64_prune.config >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> new file mode 100644 >> index 00000000..099493af >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >> @@ -0,0 +1 @@ >> +use-kernel-config=davinci_all_defconfig >> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> new file mode 100644 >> index 00000000..85eaba25 >> --- /dev/null >> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >> @@ -0,0 +1,37 @@ > Can you do it similarly to linux-ti-staging-rt recipe by not duplicating the > entire base recipe? > > I will send v2 patch in sometime. Thanks >> +SECTION = "kernel" >> +SUMMARY = "Linux kernel for jailhouse for TI devices" >> +LICENSE = "GPL-2.0-only" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >> + >> +COMPATIBLE_MACHINE = "am62xx-evm" >> + >> +inherit kernel_vendor_dtb >> + >> +require recipes-kernel/linux/setup-defconfig.inc >> +require recipes-kernel/linux/kernel-rdepends.inc >> +require recipes-kernel/linux/ti-kernel.inc >> +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} >> + >> +DEPENDS += "gmp-native libmpc-native" >> + >> +# Look in the generic major.minor directory for files >> +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" >> + >> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ >> + ${EXTRA_DTC_ARGS}" >> + >> +S = "${WORKDIR}/git" >> + >> +BRANCH = "ti-linux-6.1.y-jailhouse" >> + >> +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" >> +PV = "6.1.26+git${SRCPV}" >> + >> +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild >> +MACHINE_KERNEL_PR:append = "b" >> +PR = "${MACHINE_KERNEL_PR}" >> + >> +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" >> +KERNEL_GIT_PROTOCOL = "https" >> +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ >> + file://defconfig" >> -- >> 2.34.1
Hi, On 02/06/23 22:45, Ricardo Salveti wrote: > On Fri, Jun 2, 2023 at 6:29 AM Paresh Bhagat via > lists.yoctoproject.org <p-bhagat=ti.com@lists.yoctoproject.org> wrote: >> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains >> patches used for jailhouse. These will be used to build jailhouse image. > Should a new u-boot recipe be created for just one patch? The patch in u-boot is used for jailhouse on am62xx-evm. It fixes the "reserving fdt memory region failed" error while reserving memory for jailhouse using device tree overlay. patch is kept it in a separate repository(processor-sdk/u-boot) and only the jailhouse image build will use this u-boot recipe.
On Mon, Jun 5, 2023 at 8:22 AM Paresh Bhagat <p-bhagat@ti.com> wrote: > > Hi, > > On 02/06/23 22:45, Ricardo Salveti wrote: > > On Fri, Jun 2, 2023 at 6:29 AM Paresh Bhagat via > > lists.yoctoproject.org <p-bhagat=ti.com@lists.yoctoproject.org> wrote: > >> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains > >> patches used for jailhouse. These will be used to build jailhouse image. > > Should a new u-boot recipe be created for just one patch? > The patch in u-boot is used for jailhouse on am62xx-evm. It fixes the > "reserving fdt memory region failed" error while reserving memory for > jailhouse using device tree overlay. patch is kept it in a separate > repository(processor-sdk/u-boot) and only the jailhouse image build will > use this u-boot recipe. As Ryan said in the v2 thread, this will cause more maintenance issues as we move forward, and for just one extra patch why not have it applied as part of this layer? Just make it depend on a jailhouse MACHINE_FEATURES, then you can control that more easily during build time. Cheers,
On 6/2/2023 12:08 PM, Ryan Eatmon wrote: > > > On 6/2/2023 7:21, Denys Dmytriyenko wrote: >> On Fri, Jun 02, 2023 at 02:59:32PM +0530, Paresh Bhagat via >> lists.yoctoproject.org wrote: >>> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which >>> contains >>> patches used for jailhouse. These will be used to build jailhouse image. >>> >>> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> >>> --- >>> .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ >>> .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + >>> .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + >>> .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + >>> .../linux/linux-ti-jailhouse_6.1.bb | 37 +++++++++++++++++++ 1. Can you clarify what is the upstream path for the uboot and kernel changes that is carried in this forked branches? 2. Are you sure that these forked branches and repo will have only jailhouse and no other future product focused branches for other demo/produce-enhancement projects? 2.1 My recommendation is to name the .bb recipes as generic product names In anticipation of similar future branches for specific product features if exists. Example on how beagleboard.org u-boot recipe for ai64 vs play is maintained at https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb?h=kirkstone >>> 5 files changed, 53 insertions(+) >>> create mode 100644 >>> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>> create mode 100644 >>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>> create mode 100644 >>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>> create mode 100644 >>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>> create mode 100644 >>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>> >>> diff --git >>> a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>> b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>> new file mode 100644 >>> index 00000000..be374108 >>> --- /dev/null >>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>> @@ -0,0 +1,11 @@ >>> +require u-boot-ti.inc >>> + >>> +LIC_FILES_CHKSUM = >>> "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" >>> + >>> +PR = "r0" >>> + >>> +BRANCH = "ti-u-boot-2023.04-jailhouse" >>> + >>> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" >>> + >>> +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" >>> diff --git >>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>> new file mode 100644 >>> index 00000000..24b53cf7 >>> --- /dev/null >>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>> @@ -0,0 +1,2 @@ >>> +use-kernel-config=multi_v7_defconfig >>> +config-fragment=kernel/configs/ti_multi_v7_prune.config >>> diff --git >>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>> new file mode 100644 >>> index 00000000..ef1d3efd >>> --- /dev/null >>> +++ >>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>> @@ -0,0 +1,2 @@ >>> +use-kernel-config=defconfig >>> +config-fragment=kernel/configs/ti_arm64_prune.config >>> diff --git >>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>> new file mode 100644 >>> index 00000000..099493af >>> --- /dev/null >>> +++ >>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>> @@ -0,0 +1 @@ >>> +use-kernel-config=davinci_all_defconfig >>> diff --git >>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>> new file mode 100644 >>> index 00000000..85eaba25 >>> --- /dev/null >>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>> @@ -0,0 +1,37 @@ >> >> Can you do it similarly to linux-ti-staging-rt recipe by not >> duplicating the >> entire base recipe? > > I was going to ask the same question. > >> >>> +SECTION = "kernel" >>> +SUMMARY = "Linux kernel for jailhouse for TI devices" >>> +LICENSE = "GPL-2.0-only" >>> +LIC_FILES_CHKSUM = >>> "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >>> + >>> +COMPATIBLE_MACHINE = "am62xx-evm" >>> + >>> +inherit kernel_vendor_dtb >>> + >>> +require recipes-kernel/linux/setup-defconfig.inc >>> +require recipes-kernel/linux/kernel-rdepends.inc >>> +require recipes-kernel/linux/ti-kernel.inc >>> +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' >>> if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} >>> + >>> +DEPENDS += "gmp-native libmpc-native" >>> + >>> +# Look in the generic major.minor directory for files >>> +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" >>> + >>> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ >>> + ${EXTRA_DTC_ARGS}" >>> + >>> +S = "${WORKDIR}/git" >>> + >>> +BRANCH = "ti-linux-6.1.y-jailhouse" >>> + >>> +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" >>> +PV = "6.1.26+git${SRCPV}" >>> + >>> +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a >>> rebuild >>> +MACHINE_KERNEL_PR:append = "b" >>> +PR = "${MACHINE_KERNEL_PR}" >>> + >>> +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" >>> +KERNEL_GIT_PROTOCOL = "https" >>> +SRC_URI += >>> "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ >>> + file://defconfig" >>> -- >>> 2.34.1 >
Hi, On 06/06/23 00:49, Bajjuri, Praneeth wrote: > > > On 6/2/2023 12:08 PM, Ryan Eatmon wrote: >> >> >> On 6/2/2023 7:21, Denys Dmytriyenko wrote: >>> On Fri, Jun 02, 2023 at 02:59:32PM +0530, Paresh Bhagat via >>> lists.yoctoproject.org wrote: >>>> Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which >>>> contains >>>> patches used for jailhouse. These will be used to build jailhouse >>>> image. >>>> >>>> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> >>>> --- >>>> .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ >>>> .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + >>>> .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + >>>> .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + >>>> .../linux/linux-ti-jailhouse_6.1.bb | 37 >>>> +++++++++++++++++++ > > 1. Can you clarify what is the upstream path for the uboot and kernel > changes that is carried in this forked branches? There are patches to core kernel memory manager which cannot go upstream easily unless Siemens takes it. > > 2. Are you sure that these forked branches and repo will have only > jailhouse and no other future product focused branches for other > demo/produce-enhancement projects? We will modify the recipe to have generic name so later any new feature can be hosted in separate branch in linux/u-boot repos. With the help of MACHINE_FEATURE same recipe with feature specific branch can be used. Branches: ti-linux-6.1.y-jailhouse & ti-u-boot-2023.04-jailhouse - these will have only have jailhouse. > > 2.1 My recommendation is to name the .bb recipes as generic product > names In anticipation of similar future branches for specific product > features if exists. > > Example on how beagleboard.org u-boot recipe for ai64 vs play is > maintained at > https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb?h=kirkstone > we will name the recipes as linux-ti-extras and u-boot-ti-extras. i will send a v3 some time today to include jailhouse via machine feature and also with updated recipe names. Thanks all > > >>>> 5 files changed, 53 insertions(+) >>>> create mode 100644 >>>> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>>> create mode 100644 >>>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>>> create mode 100644 >>>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>>> create mode 100644 >>>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>>> create mode 100644 >>>> meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>>> >>>> diff --git >>>> a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>>> b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>>> new file mode 100644 >>>> index 00000000..be374108 >>>> --- /dev/null >>>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb >>>> @@ -0,0 +1,11 @@ >>>> +require u-boot-ti.inc >>>> + >>>> +LIC_FILES_CHKSUM = >>>> "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" >>>> + >>>> +PR = "r0" >>>> + >>>> +BRANCH = "ti-u-boot-2023.04-jailhouse" >>>> + >>>> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" >>>> + >>>> +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" >>>> diff --git >>>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>>> new file mode 100644 >>>> index 00000000..24b53cf7 >>>> --- /dev/null >>>> +++ >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig >>>> @@ -0,0 +1,2 @@ >>>> +use-kernel-config=multi_v7_defconfig >>>> +config-fragment=kernel/configs/ti_multi_v7_prune.config >>>> diff --git >>>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>>> new file mode 100644 >>>> index 00000000..ef1d3efd >>>> --- /dev/null >>>> +++ >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig >>>> @@ -0,0 +1,2 @@ >>>> +use-kernel-config=defconfig >>>> +config-fragment=kernel/configs/ti_arm64_prune.config >>>> diff --git >>>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>>> >>>> new file mode 100644 >>>> index 00000000..099493af >>>> --- /dev/null >>>> +++ >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig >>>> @@ -0,0 +1 @@ >>>> +use-kernel-config=davinci_all_defconfig >>>> diff --git >>>> a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>>> b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>>> new file mode 100644 >>>> index 00000000..85eaba25 >>>> --- /dev/null >>>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb >>>> @@ -0,0 +1,37 @@ >>> >>> Can you do it similarly to linux-ti-staging-rt recipe by not >>> duplicating the >>> entire base recipe? >> >> I was going to ask the same question. >> >>> >>>> +SECTION = "kernel" >>>> +SUMMARY = "Linux kernel for jailhouse for TI devices" >>>> +LICENSE = "GPL-2.0-only" >>>> +LIC_FILES_CHKSUM = >>>> "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" >>>> + >>>> +COMPATIBLE_MACHINE = "am62xx-evm" >>>> + >>>> +inherit kernel_vendor_dtb >>>> + >>>> +require recipes-kernel/linux/setup-defconfig.inc >>>> +require recipes-kernel/linux/kernel-rdepends.inc >>>> +require recipes-kernel/linux/ti-kernel.inc >>>> +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' >>>> if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} >>>> + >>>> +DEPENDS += "gmp-native libmpc-native" >>>> + >>>> +# Look in the generic major.minor directory for files >>>> +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" >>>> + >>>> +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ >>>> + ${EXTRA_DTC_ARGS}" >>>> + >>>> +S = "${WORKDIR}/git" >>>> + >>>> +BRANCH = "ti-linux-6.1.y-jailhouse" >>>> + >>>> +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" >>>> +PV = "6.1.26+git${SRCPV}" >>>> + >>>> +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause >>>> a rebuild >>>> +MACHINE_KERNEL_PR:append = "b" >>>> +PR = "${MACHINE_KERNEL_PR}" >>>> + >>>> +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" >>>> +KERNEL_GIT_PROTOCOL = "https" >>>> +SRC_URI += >>>> "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ >>>> + file://defconfig" >>>> -- >>>> 2.34.1 >>
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb new file mode 100644 index 00000000..be374108 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb @@ -0,0 +1,11 @@ +require u-boot-ti.inc + +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" + +PR = "r0" + +BRANCH = "ti-u-boot-2023.04-jailhouse" + +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" + +SRCREV = "79615e1c99b9aa73948f811f5f866cff2e34dc37" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb new file mode 100644 index 00000000..85eaba25 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb @@ -0,0 +1,37 @@ +SECTION = "kernel" +SUMMARY = "Linux kernel for jailhouse for TI devices" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +COMPATIBLE_MACHINE = "am62xx-evm" + +inherit kernel_vendor_dtb + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/kernel-rdepends.inc +require recipes-kernel/linux/ti-kernel.inc +include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} + +DEPENDS += "gmp-native libmpc-native" + +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ + ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +BRANCH = "ti-linux-6.1.y-jailhouse" + +SRCREV = "0ed0dec2462b805b0188fe080895adc437871549" +PV = "6.1.26+git${SRCPV}" + +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild +MACHINE_KERNEL_PR:append = "b" +PR = "${MACHINE_KERNEL_PR}" + +KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" +KERNEL_GIT_PROTOCOL = "https" +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ + file://defconfig"
Add a recipe for u-boot-ti-jailhouse and linux-ti-jailhouse which contains patches used for jailhouse. These will be used to build jailhouse image. Signed-off-by: Paresh Bhagat <p-bhagat@ti.com> --- .../u-boot/u-boot-ti-jailhouse_2023.04.bb | 11 ++++++ .../linux/linux-ti-jailhouse-6.1/defconfig | 2 + .../linux/linux-ti-jailhouse-6.1/k3/defconfig | 2 + .../linux-ti-jailhouse-6.1/omapl138/defconfig | 1 + .../linux/linux-ti-jailhouse_6.1.bb | 37 +++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-jailhouse_2023.04.bb create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse-6.1/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-jailhouse_6.1.bb