Skip to content

Commit 32cdafd

Browse files
mattia-moffamattia-moffa
committed
Remove RAM_KV partition from TZEN targets
1 parent 968e5bf commit 32cdafd

File tree

7 files changed

+7
-35
lines changed

7 files changed

+7
-35
lines changed

‎hal/lpc55s69.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = 0x10000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x10000 /* 64K */
5-
RAM_HEAP (rwx) : ORIGIN = 0x30010000, LENGTH = 0xC000 /* 48K */
6-
RAM_KV (rwx) : ORIGIN = 0x3001C000, LENGTH = 0x2000 /* 8K */
5+
RAM_HEAP (rwx) : ORIGIN = 0x30010000, LENGTH = 0xE000 /* 56K */
76
FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC (rx) : ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -65,9 +64,6 @@ SECTIONS
6564

6665
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6766

68-
_keyvault_origin = ORIGIN(RAM_KV);
69-
_keyvault_size = LENGTH(RAM_KV);
70-
7167
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
7268
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
7369

‎hal/mcxn.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x10000 /* 64K */
5-
RAM_HEAP (rwx) : ORIGIN = 0x30010000, LENGTH = 0xC000 /* 48K */
6-
RAM_KV (rwx) : ORIGIN = 0x3001C000, LENGTH = 0x2000 /* 8K */
5+
RAM_HEAP (rwx) : ORIGIN = 0x30010000, LENGTH = 0xE000 /* 56K */
76
FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC (rx) : ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -65,9 +64,6 @@ SECTIONS
6564

6665
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6766

68-
_keyvault_origin = ORIGIN(RAM_KV);
69-
_keyvault_size = LENGTH(RAM_KV);
70-
7167
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
7268
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
7369

‎hal/mcxw.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x6000 /* 24K */
5-
RAM_HEAP (rwx) : ORIGIN = 0x30006000, LENGTH = 0x6000 /* 24K */
6-
RAM_KV (rwx) : ORIGIN = 0x3000C000, LENGTH = 0x2000 /* 8K */
5+
RAM_HEAP (rwx) : ORIGIN = 0x30006000, LENGTH = 0x8000 /* 32K */
76
FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC (rx) : ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -65,9 +64,6 @@ SECTIONS
6564

6665
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6766

68-
_keyvault_origin = ORIGIN(RAM_KV);
69-
_keyvault_size = LENGTH(RAM_KV);
70-
7167
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
7268
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
7369

‎hal/nrf5340.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ MEMORY
33
FLASH (rx) : ORIGIN = @ARCH_FLASH_OFFSET@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
FLASH_NET (rx) : ORIGIN = 0x01000000, LENGTH = 0x40000 /* 256K */
55
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000 /* 64K */
6-
RAM_HEAP (rw) : ORIGIN = 0x20010000, LENGTH = 0xc000 /* 48K */
7-
RAM_KV (rw) : ORIGIN = 0x2001c000, LENGTH = 0x2000 /* 8K */
6+
RAM_HEAP (rw) : ORIGIN = 0x20010000, LENGTH = 0xe000 /* 56K */
87
FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
98
FLASH_NSC(rx) : ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
109
}
@@ -64,9 +63,6 @@ SECTIONS
6463

6564
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6665

67-
_keyvault_origin = ORIGIN(RAM_KV);
68-
_keyvault_size = LENGTH(RAM_KV);
69-
7066
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
7167
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
7268

‎hal/stm32h5.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x20000
5-
RAM_KV (rw): ORIGIN = 0x30020000, LENGTH = 0x10000
6-
RAM_HEAP (rw): ORIGIN = 0x30030000, LENGTH = 0x10000 /* 64KB Heap for wolfcrypt/PKCS11 */
5+
RAM_HEAP (rw): ORIGIN = 0x30020000, LENGTH = 0x20000 /* 128KB Heap for wolfcrypt/PKCS11 */
76
FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC(rx): ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -60,9 +59,6 @@ SECTIONS
6059

6160
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6261

63-
_keyvault_origin = ORIGIN(RAM_KV);
64-
_keyvault_size = LENGTH(RAM_KV);
65-
6662
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
6763
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
6864

‎hal/stm32l5.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x00012000
5-
RAM_HEAP (rw): ORIGIN = 0x30012000, LENGTH = 0xc000 /* 49152 B Heap for wolfcrypt/PKCS11 */
6-
RAM_KV (rw): ORIGIN = 0x3001e000, LENGTH = 0x2000
5+
RAM_HEAP (rw): ORIGIN = 0x30012000, LENGTH = 0xe000 /* 56KB Heap for wolfcrypt/PKCS11 */
76
FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC(rx): ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -61,9 +60,6 @@ SECTIONS
6160

6261
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6362

64-
_keyvault_origin = ORIGIN(RAM_KV);
65-
_keyvault_size = LENGTH(RAM_KV);
66-
6763
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
6864
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
6965

‎hal/stm32u5.ld‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ MEMORY
22
{
33
FLASH (rx) : ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
44
RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 0x00012000
5-
RAM_HEAP (rw): ORIGIN = 0x30012000, LENGTH = 0xc000 /* 49152 B Heap for wolfcrypt/PKCS11 */
6-
RAM_KV (rw): ORIGIN = 0x3001e000, LENGTH = 0x2000
5+
RAM_HEAP (rw): ORIGIN = 0x30012000, LENGTH = 0xe000 /* 56KB Heap for wolfcrypt/PKCS11 */
76
FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
87
FLASH_NSC(rx): ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
98
}
@@ -61,9 +60,6 @@ SECTIONS
6160

6261
END_STACK = ORIGIN(RAM) + LENGTH(RAM);
6362

64-
_keyvault_origin = ORIGIN(RAM_KV);
65-
_keyvault_size = LENGTH(RAM_KV);
66-
6763
_flash_keyvault = ORIGIN(FLASH_KEYVAULT);
6864
_flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
6965

0 commit comments

Comments
 (0)