Skip to content

Port to Yocto scarthgap [Part1]#1538

Merged
quaresmajose merged 50 commits intofoundriesio:mainfrom
quaresmajose:scarthgap-next-p1
Nov 22, 2024
Merged

Port to Yocto scarthgap [Part1]#1538
quaresmajose merged 50 commits intofoundriesio:mainfrom
quaresmajose:scarthgap-next-p1

Conversation

@quaresmajose
Copy link
Copy Markdown
Member

@quaresmajose quaresmajose commented Nov 15, 2024

The full PR was submitted #1532 but it was very big and we decided to break it down into smaller parts to facilitate the review process.

These small parts have not been tested at all and only the complete PR has been, so it is quite possible that they will not work separately as they are submitted now.

The full list of changes that have been tested are at https://github.com/foundriesio/meta-lmp/tree/scarthgap-next

Because TI uses multiconfig we can't have this file names shared between machines in [1]

| ERROR: mc:k3r5:u-boot-ti-staging-1_2023.04+git-r0 do_deploy: Recipe u-boot-ti-staging is trying to install files into a shared area when those files already exist. The files and the manifests listing them are:
|   /build/deploy/images/am62xx-evm/u-boot-ti-staging-config
|     (matched in manifest-am62xx_evm-u-boot-ti-staging.deploy)
| Please adjust the recipes so only one recipe provides a given file.

[1] meta-lmp-base/recipes-bsp/u-boot/u-boot-lmp-common.inc

Signed-off-by: Jose Quaresma <[email protected]>
@quaresmajose quaresmajose requested a review from a team November 15, 2024 17:36
Comment thread meta-lmp-base/conf/layer.conf Outdated
Comment thread meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Comment thread meta-lmp-base/recipes-samples/images/lmp-feature-wifi.inc
@ricardosalveti
Copy link
Copy Markdown
Member

Can you please have the patches changing the same recipe done in sequence? Current flow makes it harder to review the individual changes.

@quaresmajose
Copy link
Copy Markdown
Member Author

The current order is basically chronological, I'll try to change it to be by recipe

Comment thread meta-lmp-base/conf/distro/lmp-mfgtool.conf
Comment thread meta-lmp-base/conf/distro/include/non-clangable.inc
Copy link
Copy Markdown
Contributor

@angolini angolini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the PR.
I would squash all commits for the same recipe together, but it does not hurt to leave it this way.
Thanks a lot for this!

This reverts commit 35696b6.

These patches are already included in ovmf 2022.11

Signed-off-by: Jose Quaresma <[email protected]>
Use the meta-openembedded version that is updated to b4e0673

Signed-off-by: Jose Quaresma <[email protected]>
We are facing some build erros on uz3eg-iocc-sec machine
because we don't have sufficient space.

| spl/u-boot-spl.bin exceeds file size limit:
|   limit:  0x26000 bytes
|   actual: 0x26009 bytes
|   excess: 0x9 bytes

Signed-off-by: Jose Quaresma <[email protected]>
The imx-boot-container MACHINEOVERRIDES is now SoC specific [1]
with higher prioririty than mx8-generic-bsp.
The meta-freescale layer also check for 1/0 so set it to 0.

[1] Freescale/meta-freescale#1465

Signed-off-by: Jose Quaresma <[email protected]>
The imx-boot-container [1] is now only enabled on mx8m-generic-bsp
machines.

[1] Freescale/meta-freescale#1488

Signed-off-by: Jose Quaresma <[email protected]>
…dynamic

Add boot container dynamic selection to imx-base.inc
Freescale/meta-freescale#1492

Signed-off-by: Jose Quaresma <[email protected]>
@quaresmajose quaresmajose force-pushed the scarthgap-next-p1 branch 2 times, most recently from 7d326ba to e2e20cc Compare November 19, 2024 10:26
@quaresmajose
Copy link
Copy Markdown
Member Author

I reviewed the PR. I would squash all commits for the same recipe together, but it does not hurt to leave it this way. Thanks a lot for this!

I have squashed some commits especially the ones that did not contain any changes, the others I kept because this is important if it is necessary to make any bisect.
Thank you very much for your review.

@quaresmajose
Copy link
Copy Markdown
Member Author

quaresmajose commented Nov 19, 2024

Can you please have the patches changing the same recipe done in sequence? Current flow makes it harder to review the individual changes.

@ricardosalveti I think I got it for a significant part.

The SRCREV_FORMAT variable must be set when multiple SCMs are used.

| bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: The SRCREV_FORMAT variable must be set when multiple SCMs are used.
| The SCMs are:
| git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=https;branch=main
| git://github.com/NXP/imx-firmware.git;protocol=https;branch=lf-5.15.71_2.2.0;destsuffix=imx-firmware;name=imx-firmware;
| The variable dependency chain for the failure is: SRCPV -> PV -> BP -> FILESPATH

Signed-off-by: Jose Quaresma <[email protected]>
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Rebase and refresh patches

Signed-off-by: Jose Quaresma <[email protected]>
Signed-off-by: Jose Quaresma <[email protected]>
Copy link
Copy Markdown
Member

@ricardosalveti ricardosalveti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, please announce in platform that things will be temporarily broken as we merge this.

@quaresmajose
Copy link
Copy Markdown
Member Author

I will wait for the proposed backports #1543 and foundriesio/lmp-manifest#468 so we can have a funcional tree with mostly the same content.

@quaresmajose quaresmajose merged commit 58c0f6e into foundriesio:main Nov 22, 2024
@quaresmajose quaresmajose deleted the scarthgap-next-p1 branch November 25, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants