hwmv2: Fix problems with common board functionality, alternative. #71149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tejlmand
force-pushed
the
issues/70445_revert_merge_functionality
branch
from
5cad558
to
f6d0d7b
Compare
tejlmand
changed the title
zephyrbot
requested review from
abrodkin,
aescolar,
anangl,
danieldegrasse,
decsny,
DerekSnell,
dleach02,
EmilioCBen,
evgeniy-paltsev,
fkokosinski,
kartben,
mmahadevan108,
nashif,
ruuddw and
yvanderv
tejlmand
removed request for
kartben,
nashif,
abrodkin,
ruuddw,
yvanderv,
mmahadevan108,
anangl,
fkokosinski,
dleach02,
aescolar,
danieldegrasse and
DerekSnell
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit f664cff) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: f664cff Change-Id: I934e38dd694f3e85387c794b975a672455012ada Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465912 Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Tested-by: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 6d8f0f5) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 6d8f0f5 Change-Id: Iba944c4b9366369910355e8710596efe50a754bd Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465913 Tested-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 2da2028) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 2da2028 Change-Id: Iabe0fdfd0767456c8d9b7dace8119430a01d09ce Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465914 Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 2b68f22) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 2b68f22 Change-Id: I26dc02597926102b60975a977fda5194726f1c77 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465915 Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 8ce6a53) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 8ce6a53 Change-Id: I0c9cbd0a9f67c42a06c32f46fbafb206626c9719 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465916 Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 35c90a5) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 35c90a5 Change-Id: I60636bbb73e1c7d5c989732a89bea72d7870f8d4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465917 Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit cf533cc) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: cf533cc Change-Id: I0ef73d67d20ea4a0fbba46808a9bf31713eddfcc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465918 Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org>
coreboot-org-bot
pushed a commit
to coreboot/zephyr-cros
that referenced
this pull request
Apr 18, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos/zephyr#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. (cherry picked from commit 1c3edca) Original-Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no> GitOrigin-RevId: 1c3edca Change-Id: I560b2d50900c795cf7bea4593025604ba1616d61 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5465919 Tested-by: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Jeremy Bettis <jbettis@chromium.org> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
jman168
pushed a commit
to Gator-Motorsports/zephyr
that referenced
this pull request
Apr 25, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Lahyllas
pushed a commit
to tsnlab/zephyr
that referenced
this pull request
May 16, 2024
During the hwmv1->v2 transition, overlays from a base board were made to be shared with the variants. So at that time all overlays for variants which were just copies of the base overlay were removed. After that in zephyrproject-rtos#71149 this shared/merged overlay behaviour was reverted, but not all tests were fixed. This is one of those. Let's fix it. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alternative to #70548
This PR accomplishes the same as #70548 but is less intrusive.
The issues: #70445 and #70283 was caused by merging of files, not because of shortened file names.
Instead of enforcing full normalized board target names for files, then this PR allows for shortened normalized board target names without the SoC name. This is allowed for boards which defines a single SoC.
Some file rename is still required, namely files which relied on the merge feature, but for files which solely used the merge feature to allow a shortened file name, then no changes are required.
This significantly reduces number of changes required to fix the referenced issues.
To minimize user mistakes, then a build error is raised in following situations:
rpi_pico.overlay together with rpi_pico_rp2040.overlay
nrf52840.overlay, because this file is now ambiguous because the nrf52840dk defines two SoCs.