Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta-lxatac-bsp: barebox: update to 2024.09.0 #174

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

hnez
Copy link
Member

@hnez hnez commented Aug 30, 2024

Just a routine update.

TODO before merging:

  • Test on hardware

@hnez hnez self-assigned this Aug 30, 2024
@hnez hnez force-pushed the barebox-2024-08 branch from 6c7919e to 088b33c Compare August 30, 2024 13:18
@hnez hnez marked this pull request as ready for review August 30, 2024 13:41
@hnez hnez requested a review from a3f August 30, 2024 13:41
@hnez hnez assigned a3f and unassigned hnez Aug 30, 2024
+ * Instead drivers are called with the device tree node in action and
+ * instructed to apply it.
+ *
+ * We can add support for this binding for STM32 only as first step, but
Copy link
Member

Choose a reason for hiding this comment

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

Why is this being removed? v2024.08.0 doesn't support the new binding either. I added support recently, but it is slated for inclusion in v2024.10.0.

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like the respective fixup! commits did not make it to the v2024.03.0/customers/lxa/tac branch or got force pushed away (sounds like something I would do by accident tbh).
I've made sure to push them to v2024.03.0/customers/lxa/tac again and have also included them in the last update of this PR.


+pblb-$(CONFIG_MACH_LXA_TAC) += start_stm32mp15xc_lxa_tac
Copy link
Member

Choose a reason for hiding this comment

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

This reverts e285dad which is likely not intended.

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like the respective fixup! commit did not make it to the v2024.03.0/customers/lxa/tac branch or got force pushed away (sounds like something I would do by accident tbh).
I've made sure to push it to v2024.03.0/customers/lxa/tac again and have also included it in the last update of this PR.

@@ -18,7 +18,7 @@ image @IMAGE@fip {
fip {
fw-config = "stm32mp157c-lxa-tac-fw-config.dtb"
hw-config = "stm32mp157c-lxa-tac-fw-config.dtb"
nt-fw = "barebox-stm32mp15xc-lxa-tac.img"
nt-fw = "barebox-stm32mp15xc-lxa-tac.stm32"
Copy link
Member

Choose a reason for hiding this comment

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

The .stm32 image contains at 256 byte header that I suspect will be executed as code. The .img omitted that header.

Copy link
Member Author

Choose a reason for hiding this comment

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

My bad. This was a result of me missing the fixup that did the stm32 --> img transition.
The fixup from e285dad is now back in and this change no longer required.

@hnez
Copy link
Member Author

hnez commented Sep 9, 2024

It looks like I screwed up somewhere while rebasing the changes on top of 2024.08.0. I will have to investigate that a bit.

Since we do not need this update in the next stable release, I will change this to a draft PR and investigate once the release is out.

@hnez hnez marked this pull request as draft September 9, 2024 11:47
@hnez hnez changed the title meta-lxatac-bsp: barebox: update to 2024.08.0 meta-lxatac-bsp: barebox: update to 2024.09.0 Sep 18, 2024
@hnez
Copy link
Member Author

hnez commented Sep 18, 2024

I've revisited this PR now and did indeed find a mistake while rebasing - I was missing two fixup commits that changed the image file type and added pull-ups to the button inputs.
This should be fixed now.

While at it I also updated to 2024.09 instead of 2024.08.

@hnez hnez marked this pull request as ready for review September 18, 2024 13:59
Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
@hnez
Copy link
Member Author

hnez commented Oct 1, 2024

Hi @a3f, could you have a second look at this PR?
And maybe #183 as well.

@hnez hnez merged commit 41a76e4 into linux-automation:scarthgap Oct 1, 2024
4 checks passed
@hnez hnez deleted the barebox-2024-08 branch October 1, 2024 14:28
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.

2 participants