-
Notifications
You must be signed in to change notification settings - Fork 5
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
Rockchip fixes + add rock5a radxa board support #41
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Every file needs to contain a header, that provides kas with information | ||
# about the context of this file. | ||
header: | ||
# The `version` entry in the header describes for which configuration | ||
# format version this file was created for. It is used by kas to figure | ||
# out if it is compatible with this file. The version is an integer that | ||
# is increased on every format change. | ||
version: 16 | ||
includes: | ||
- kas/platforms/radxa.yaml | ||
|
||
# The machine as it is written into the `local.conf` of bitbake. | ||
machine: rock-5a | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Every file needs to contain a header, that provides kas with information | ||
# about the context of this file. | ||
header: | ||
# The `version` entry in the header describes for which configuration | ||
# format version this file was created for. It is used by kas to figure | ||
# out if it is compatible with this file. The version is an integer that | ||
# is increased on every format change. | ||
version: 16 | ||
|
||
# The machine as it is written into the `local.conf` of bitbake. | ||
repos: | ||
meta-rockchip: | ||
url: "https://github.com/radxa/meta-rockchip.git" | ||
path: layers/meta-rockchip-radxa | ||
patches: | ||
wks-root-label: | ||
repo: meta-pantavisor | ||
path: patches/meta-rockchip-radxa/0001-wic-Fix-root-label.patch | ||
|
||
meta-arm: | ||
url: git://git.yoctoproject.org/meta-arm | ||
path: layers/meta-arm | ||
layers: | ||
meta-arm: | ||
meta-arm-toolchain: | ||
|
||
local_conf_header: | ||
platform-rockchip: | | ||
PV_UBOOT_AUTOFDT = "1" | ||
# keep rockchip prefix in dtb | ||
# otherwise fit configuration doesn't fit | ||
# with fdtfile varible and board won't boot | ||
KERNEL_DTBVENDORED = "1" | ||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 44cf6391261a521b3813464fe473ab65761cb102 Mon Sep 17 00:00:00 2001 | ||
From: Marek Belisko <[email protected]> | ||
Date: Wed, 16 Oct 2024 11:38:20 +0200 | ||
Subject: [PATCH] wic: Fix root label | ||
|
||
Signed-off-by: Marek Belisko <[email protected]> | ||
--- | ||
wic/rockchip.wks | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/wic/rockchip.wks b/wic/rockchip.wks | ||
index cabdb65..0b939ad 100644 | ||
--- a/wic/rockchip.wks | ||
+++ b/wic/rockchip.wks | ||
@@ -26,6 +26,6 @@ part uboot_env --offset 8128s --fixed-size 32K --fstype=none --part-name uboo | ||
part reserved2 --offset 8192s --fixed-size 4096K --fstype=none --part-name reserved2 | ||
part loader2 --offset 16384s --fixed-size 4096K --fstype=none --part-name loader2 --source rawcopy --sourceparams="file=u-boot.${UBOOT_SUFFIX}" | ||
part atf --offset 24576s --fixed-size 4096K --fstype=none --part-name atf | ||
-part / --label rootfsA --active --fstype=ext4 --part-name rootfsA --source rootfs --part-type ${ROOT_DPS} | ||
+part / --label root --active --fstype=ext4 --part-name root --source rootfs --part-type ${ROOT_DPS} | ||
|
||
bootloader --ptable gpt | ||
-- | ||
2.25.1 | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# drop this support for rockchip | ||
PACKAGECONFIG:class-target:rockchip:remove = "libmount-mountfd-support" | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe this could be upstreamable if this was a variable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nandra have you opened the upstreaming threat on this? I think first choice would be to use 'root' everywhere or if not use ${RK_ROOT_LABEL} or something....