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

Update to kirkstone #638

Merged
merged 20 commits into from
Jun 20, 2024
Merged

Update to kirkstone #638

merged 20 commits into from
Jun 20, 2024

Conversation

floion
Copy link
Contributor

@floion floion commented May 30, 2024

No description provided.

Changelog-entry: Update to kirkstone-4.0.17
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
@flowzone-app flowzone-app bot enabled auto-merge May 30, 2024 09:12
@acostach
Copy link
Contributor

acostach commented Jun 6, 2024

@resin-jenkins retest this please

Signed-off-by: Florin Sarbu <florin@balena.io>
Signed-off-by: Florin Sarbu <florin@balena.io>
This fixes the warning:
+= is not a recommended operator combination, please replace it.

Signed-off-by: Florin Sarbu <florin@balena.io>
With the move to kirkstone, the kernel was updated and
this patch needs to be redone because in the new kernel
the imx8mmn-nitrogen8mm.dtsi file has been moved to
imx8mmn-nitrogen8mm_rev2.dtsi

Signed-off-by: Florin Sarbu <florin@balena.io>
With the switch to kirkstone, the upstream BSP changed the u-boot config
used by the machine we include in emgw3.conf
Also let's use an append style for MACHINEOVERRIDES which makes it clearer

Signed-off-by: Florin Sarbu <florin@balena.io>
@floion floion force-pushed the update_to_kirkstone branch 3 times, most recently from 6fa15d6 to 8bfc002 Compare June 17, 2024 21:09
With the move to kirkstone we need further fixes related to upstream BSP
u-boot config changes. We disable CONFIG_ENV_IS_IN_MMC as we do not use it
and it also throws a compile error.
Additionaly, we remove the disabling of CONFIG_CMD_SAVEENV from here as it
is already disabled globally from meta-balena.
And last, we update the bootscript by increasing the fdt load address in order
to account for increased kernel size.

Signed-off-by: Florin Sarbu <florin@balena.io>
The upstream BSP now uses imx-boot-container for mx8mm boards amongst others.

Signed-off-by: Florin Sarbu <florin@balena.io>
In balenaOS we bind mount /etc/udev/rules.d for os-udevrules so
we need to have OS level udev rules under /lib/udev/rules.d instead.

Signed-off-by: Florin Sarbu <florin@balena.io>
…INEOVERRIDES

With the switch to kirkstone, the upstream BSP changed the u-boot config
used by the machine we include in nitrogen8mm-dwe.conf
Also let's use an append style for MACHINEOVERRIDES which makes it clearer

Signed-off-by: Florin Sarbu <florin@balena.io>
…gen8mm

We need to make more space in the rootfs for this machine.

Signed-off-by: Florin Sarbu <florin@balena.io>
With the move to kirkstone the initramfs size has increased. This increase
should not reduce too much the available space in the rootfs partition
where the initramfs bundled kernel is located.

Signed-off-by: Florin Sarbu <florin@balena.io>
Reworked 0002-fixup-imx8mm-evk-fdt-addr.patch, 0003-add-imx8mm-resin-hooks.patch
and bundled these 2 patches into 0001-imx8mm-lpddr4-evk-Integrate-with-BalenaOS.patch
Reworked 0002-fix-return-vaue-propagatin-out-of-environ.patch

Signed-off-by: Florin Sarbu <florin@balena.io>
With the update to kirkstone, this patch does not apply anymore.
And also the original intent of this patch was to remove runtime
warnings on the older kernel so we can live with just warnings if
that's also the case with the kirkstone kernel.

Signed-off-by: Florin Sarbu <florin@balena.io>
@floion
Copy link
Contributor Author

floion commented Jun 18, 2024

@balena-ci I self-certify!

@floion floion disabled auto-merge June 20, 2024 06:37
@floion floion enabled auto-merge June 20, 2024 06:38
@floion floion disabled auto-merge June 20, 2024 06:41
@floion floion merged commit d7b0698 into master Jun 20, 2024
44 of 45 checks passed
@floion floion deleted the update_to_kirkstone branch June 20, 2024 06:41
@floion floion mentioned this pull request Jun 20, 2024
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