From 8d5833ffaaaae0481bf65a91837562a1788ea336 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sat, 21 Jan 2017 11:17:59 -0600 Subject: [PATCH] k64: Rename security_frdm_k64f section 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 --- arch/arm/soc/nxp_kinetis/k6x/linker.ld | 2 +- arch/arm/soc/nxp_kinetis/k6x/soc.c | 2 +- include/arch/arm/cortex_m/scripts/linker.ld | 12 ++++++------ include/section_tags.h | 2 +- include/sections.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/soc/nxp_kinetis/k6x/linker.ld b/arch/arm/soc/nxp_kinetis/k6x/linker.ld index a7fbabf8157..1c956e8fb64 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/linker.ld +++ b/arch/arm/soc/nxp_kinetis/k6x/linker.ld @@ -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 diff --git a/arch/arm/soc/nxp_kinetis/k6x/soc.c b/arch/arm/soc/nxp_kinetis/k6x/soc.c index b404f6cbf04..65a5518c113 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/soc.c +++ b/arch/arm/soc/nxp_kinetis/k6x/soc.c @@ -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 diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/cortex_m/scripts/linker.ld index f97a8534a6e..f80934059e2 100644 --- a/include/arch/arm/cortex_m/scripts/linker.ld +++ b/include/arch/arm/cortex_m/scripts/linker.ld @@ -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*)) diff --git a/include/section_tags.h b/include/section_tags.h index d4cc5d6495d..afc7ae4faa2 100644 --- a/include/section_tags.h +++ b/include/section_tags.h @@ -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 \ diff --git a/include/sections.h b/include/sections.h index cfa51c7d9cf..862041150d3 100644 --- a/include/sections.h +++ b/include/sections.h @@ -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)