Skip to content

Commit fff35f3

Browse files
LiBinSHAnoglitch
authored andcommitted
config: fix compile failure with CONFIG_JUMP_TO_SW option
When using sama7d65_curiosity_bkptnone_defconfig and "Launch externally loaded software" to select CONFIG_JUMP_TO_SW, the compilation fails because image.jump_add was undefined. In main.c, it directly returns JUMP_ADD for CONFIG_DIRECT_JUMP. Add default addresses for CONFIG_JUMP_ADDR for SAMA7G5 and SAMA7D65. Signed-off-by: Li Bin <[email protected]> Acked-by: Nicolas Ferre <[email protected]>
1 parent 9465c65 commit fff35f3

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

Config.in.app-image

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ config IMG_SIZE
2323

2424
config JUMP_ADDR
2525
string "The External Ram Address to Load Demo-App Image"
26+
default "0x60000000" if SAMA7G5 || SAMA7D65
2627
default "0x20000000"
2728
help
2829
The entry point to which the bootstrap will pass control.

Config.in.kernel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ config IMG_ADDRESS
9696

9797
config JUMP_ADDR
9898
string "The External Ram Address to Load Kernel Image"
99-
default "0x62000000" if SAMA7G5
99+
default "0x62000000" if SAMA7G5 || SAMA7D65
100100
default "0x22000000"
101101
help
102102
The entry point to which the bootstrap will pass control.

Config.in.optee

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ config OPTEE_IMG_SIZE
3030

3131
config OPTEE_JUMP_ADDR
3232
hex "External Ram Address For OP-TEE Image"
33+
default "0x60000000" if SAMA7G5 || SAMA7D65
3334
default "0x20000000"
3435
help
3536
This address is the entry point to which the bootstrap will pass

Config.in.u-boot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ config IMG_SIZE
2424
config JUMP_ADDR
2525
string "The External Ram Address to Load U-Boot Image"
2626
default "0x26F00000" if SAMA5D3X || SAMA5D4 || SAMA5D2
27+
default "0x66f00000" if SAMA7G5 || SAMA7D65
2728
default "0x23F00000"
2829
help
2930
The entry point to which the bootstrap will pass control.

main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ int main(void)
166166
#endif
167167

168168
#ifdef CONFIG_JUMP_TO_SW
169+
#ifdef CONFIG_LOAD_SW
169170
return image.jump_addr;
171+
#else
172+
return JUMP_ADDR;
173+
#endif
170174
#else
171175
return 0;
172176
#endif

0 commit comments

Comments
 (0)