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

LPC55S69_S: reduce ITS size to 32KB #10101

Merged
merged 2 commits into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/storage/kvstore/conf/tdb_internal/mbed_lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"internal_base_address": "0x10038000"
},
"LPC55S69_S": {
"internal_size": "0x10000",
"internal_size": "0x8000",
"internal_base_address": "0x00028000"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
** ###################################################################
*/

define symbol NS_CODE_START = 0x00038000;
define symbol NS_CODE_SIZE = 0x00060000;
define symbol NS_CODE_START = 0x00030000;
define symbol NS_CODE_SIZE = 0x00068000;
define symbol NS_DATA_START = 0x20022000;
define symbol NS_DATA_SIZE = 0x00022000;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
/* Flash layout on LPC55S69 without BL2:
*
* 0x0000_0000 Secure image primary
* 0x0003_0000 SST / ITS
* 0x0004_0000 Non-secure
* 0x0002_8000 SST / ITS
* 0x0003_0000 Non-secure
*/

/* This header file is included from linker scatter file as well, where only a
Expand Down Expand Up @@ -63,12 +63,12 @@

#define FLASH_SST_AREA_OFFSET (FLASH_AREA_IMAGE_0_OFFSET + \
FLASH_AREA_IMAGE_0_SIZE) // 0x00028000
#define FLASH_SST_AREA_SIZE (0x00010000) /* 64 KB */
#define FLASH_SST_AREA_SIZE (0x00008000) /* 32 KB */

/* Non-secure image */
#define FLASH_AREA_IMAGE_1_OFFSET (FLASH_SST_AREA_OFFSET +\
FLASH_SST_AREA_SIZE) // 0x00038000
#define FLASH_AREA_IMAGE_1_SIZE (0x00060000)
FLASH_SST_AREA_SIZE) // 0x00030000
#define FLASH_AREA_IMAGE_1_SIZE (0x00068000)

#define FLASH_AREA_IMAGE_SCRATCH_OFFSET (FLASH_AREA_IMAGE_1_OFFSET +\
FLASH_AREA_IMAGE_1_SIZE)
Expand All @@ -78,8 +78,8 @@
#define SECURE_IMAGE_OFFSET 0x0
#define SECURE_IMAGE_MAX_SIZE 0x00028000

#define NON_SECURE_IMAGE_OFFSET 0x00038000
#define NON_SECURE_IMAGE_MAX_SIZE 0x00060000
#define NON_SECURE_IMAGE_OFFSET 0x00030000
#define NON_SECURE_IMAGE_MAX_SIZE 0x00068000

/* Flash device name used by BL2 and SST
* Name is defined in flash driver file: Driver_Flash.c
Expand Down
8 changes: 4 additions & 4 deletions targets/targets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2092,8 +2092,8 @@
"post_binary_hook": {"function": "LPC55S69Code.binary_hook"},
"secure_image_filename": "tfm.bin",
"overrides": {
"non-secure-rom-start": "0x00038000",
"non-secure-rom-size": "0x60000",
"non-secure-rom-start": "0x00030000",
"non-secure-rom-size": "0x68000",
"non-secure-ram-start": "0x20022000",
"non-secure-ram-size": "0x22000",
"secure-rom-start": "0x10000000",
Expand Down Expand Up @@ -2128,8 +2128,8 @@
"deliver_to_target": "LPC55S69_NS",
"delivery_dir": "TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC55S69/TARGET_M33_NS/prebuilt",
"overrides": {
"non-secure-rom-start": "0x00038000",
"non-secure-rom-size": "0x60000",
"non-secure-rom-start": "0x00030000",
"non-secure-rom-size": "0x68000",
"non-secure-ram-start": "0x20022000",
"non-secure-ram-size": "0x22000",
"secure-rom-start": "0x10000000",
Expand Down