nanopc-t6: add fit_wrapper.sh with TEE_LOAD_ADDR=0x30000000 #814
+13
−3
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
jforissier
reviewed
Jan 31, 2025
nanopc-t6.mk
Outdated
| @@ -132,12 +134,16 @@ u-boot-proper: $(TPL_BIN) $(UBOOT_PATH)/.config u-boot-config | |||
| u-boot-apply-bootcmd: | |||
| cp $(BOOT_CMD) $(UBOOT_HEADER) | |||
|
|
|||
| .PHONY: u-boot-apply-fit-args | |||
| u-boot-apply-fit-args: | |||
| cp $(FIT_ARGS) $(UBOOT_FIT_ARGS) | |||
There was a problem hiding this comment.
I see that you re using the same pattern as u-boot-apply-bootcmd, but I think it's a bad pattern. The good one would be:
$(U_BOOT_FIT_ARGS): $(FIT_ARGS)
cp $< $@
nanopc-t6.mk
Outdated
| .PHONY: u-boot-loader | ||
| u-boot-loader: u-boot-proper | ||
| $(UBOOT_PATH)/tools/mkimage -n rk3588 -T rksd -d $(UBOOT_PATH)/tpl/u-boot-tpl.bin:$(UBOOT_PATH)/spl/u-boot-spl.bin $(UBOOT_PATH)/idbloader.img | ||
|
|
||
| .PHONY: u-boot | ||
| u-boot: u-boot-apply-bootcmd $(TPL_BIN) $(UBOOT_PATH)/.config u-boot-loader | ||
| u-boot: u-boot-apply-bootcmd u-boot-apply-fit-args $(TPL_BIN) $(UBOOT_PATH)/.config u-boot-loader |
There was a problem hiding this comment.
And $(U_BOOT_FIT_ARGS) should be added instead of u-boot-apply-fit-args.
nanopc-t6/fit_args.sh
Outdated
| # | ||
| # Copyright (c) 2020 Rockchip Electronics Co., Ltd | ||
| # | ||
| # SPDX-License-Identifier: GPL-2.0 |
There was a problem hiding this comment.
The GPL license is somewhat problematic. Besides, you are copying the whole file (link) only to change TEE_OFFSET. Isn't there another way to specify the TEE load address?
Adds fit_wrapper.sh to export TEE_LOAD_ADDR=0x30000000 Updates DTB overlay to use 0x30000000 Updates u-boot_nanopc-t6.conf to reference fit_wrapper.sh Updates nanopc-t6.mk to copy and reference fit_wrapper.sh Signed-off by: Ed Tubbs <[email protected]>
edtubbs
force-pushed
the
nanopc-offset
branch
from
3c716b9 to
1ef93ad
Compare
edtubbs
changed the title
|
Thanks @jforissier! I’ve added |
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.
Switch the NanoPC-T6 TEE load address from
0x08400000to0x30000000by adding a localfit_args.shand updating the device tree overlay. This aligns with optee_os#7254, so merge this after that PR.