michaelh/zephyr
1
0
Fork 0
Code Releases Activity

k64: Rename security_frdm_k64f section

Browse source 
Renames the flash security section so it makes sense for other Kinetis
devices, not just k64. In Kinetis reference manuals, this section is
referred to as the 'flash configuration field'.

Change-Id: I2b7c7cc1ec2541419d77878d367d96c9ceb7a0cf
Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2017-01-21 11:17:59 -06:00 • committed by Kumar Gala
commit 8d5833ffaa
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/soc/nxp_kinetis/k6x/linker.ld
View file

@ -25,7 +25,7 @@
* security feature resides in ROM.
*/
#if defined(CONFIG_XIP)
#define SKIP_TO_SECURITY_FRDM_K64F . = 0x400;
#define SKIP_TO_KINETIS_FLASH_CONFIG . = 0x400;
#endif
#include <arch/arm/cortex_m/scripts/linker.ld>

2
arch/arm/soc/nxp_kinetis/k6x/soc.c
View file

@ -48,7 +48,7 @@
* -Reserved, 1 byte, (EEPROM protection byte for FlexNVM)
*
*/
uint8_t __security_frdm_k64f_section __security_frdm_k64f[] = {
uint8_t __kinetis_flash_config_section __kinetis_flash_config[] = {
/* Backdoor Comparison Key (unused) */
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
/* Program flash protection; 1 bit/region - 0=protected, 1=unprotected

12
include/arch/arm/cortex_m/scripts/linker.ld
View file

@ -35,8 +35,8 @@
#define _DATA_IN_ROM
#endif
#if !defined(SKIP_TO_SECURITY_FRDM_K64F)
#define SKIP_TO_SECURITY_FRDM_K64F
#if !defined(SKIP_TO_KINETIS_FLASH_CONFIG)
#define SKIP_TO_KINETIS_FLASH_CONFIG
#endif
#define ROM_ADDR CONFIG_FLASH_BASE_ADDRESS
@ -79,10 +79,10 @@ SECTIONS
KEEP(*(.irq_vector_table))
KEEP(*(".irq_vector_table.*"))
/* FRDM_K64F has to write 16 bytes at 0x400 */
SKIP_TO_SECURITY_FRDM_K64F
KEEP(*(.security_frdm_k64f))
KEEP(*(".security_frdm_k64f.*"))
/* Kinetis has to write 16 bytes at 0x400 */
SKIP_TO_KINETIS_FLASH_CONFIG
KEEP(*(.kinetis_flash_config))
KEEP(*(".kinetis_flash_config.*"))
KEEP(*(.isr_irq*))

2
include/section_tags.h
View file

@ -25,7 +25,7 @@
#define __irq_vector_table __in_section(IRQ_VECTOR_TABLE, _FILE_PATH_HASH, \
__COUNTER__)
#define __security_frdm_k64f_section __in_section(SECURITY_FRDM_K64F, \
#define __kinetis_flash_config_section __in_section(KINETIS_FLASH_CONFIG, \
_FILE_PATH_HASH, __COUNTER__)
#elif defined(CONFIG_ARC)
#define __irq_vector_table \

2
include/sections.h
View file

@ -43,7 +43,7 @@
#define SCS_SECTION scs
#define SCP_SECTION scp
#define SECURITY_FRDM_K64F security_frdm_k64f
#define KINETIS_FLASH_CONFIG kinetis_flash_config
#define IRQ_VECTOR_TABLE irq_vector_table
#elif defined(CONFIG_ARC)