From 29d88c6c73e837de160917d032fa4210fbc6422a Mon Sep 17 00:00:00 2001 From: Ioannis Glaropoulos Date: Mon, 13 Jan 2020 23:02:43 +0100 Subject: [PATCH] arch: arm: cortex-m: linker.ld: do not indent preprocessor directives We should not use indentation for pre-processor directives. This commit fixes the indentation in the ARM Cortex-M linker script. Signed-off-by: Ioannis Glaropoulos --- .../arm/aarch32/cortex_m/scripts/linker.ld | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld index aed5bee1e20..9c1f08490b1 100644 --- a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld +++ b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld @@ -20,17 +20,17 @@ /* physical address of RAM */ #ifdef CONFIG_XIP - #define ROMABLE_REGION FLASH - #define RAMABLE_REGION SRAM +#define ROMABLE_REGION FLASH +#define RAMABLE_REGION SRAM #else - #define ROMABLE_REGION SRAM - #define RAMABLE_REGION SRAM +#define ROMABLE_REGION SRAM +#define RAMABLE_REGION SRAM #endif #if defined(CONFIG_XIP) - #define _DATA_IN_ROM __data_rom_start +#define _DATA_IN_ROM __data_rom_start #else - #define _DATA_IN_ROM +#define _DATA_IN_ROM #endif #if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0) @@ -40,30 +40,30 @@ #endif #ifdef CONFIG_TI_CCFG_PRESENT - #define CCFG_SIZE 88 - #define ROM_SIZE (CONFIG_FLASH_SIZE*1K - CONFIG_FLASH_LOAD_OFFSET - \ - CCFG_SIZE) - #define CCFG_ADDR (ROM_ADDR + ROM_SIZE) +#define CCFG_SIZE 88 +#define ROM_SIZE (CONFIG_FLASH_SIZE*1K - CONFIG_FLASH_LOAD_OFFSET - \ + CCFG_SIZE) +#define CCFG_ADDR (ROM_ADDR + ROM_SIZE) #else #if CONFIG_FLASH_LOAD_SIZE > 0 - #define ROM_SIZE CONFIG_FLASH_LOAD_SIZE +#define ROM_SIZE CONFIG_FLASH_LOAD_SIZE #else - #define ROM_SIZE (CONFIG_FLASH_SIZE*1K - CONFIG_FLASH_LOAD_OFFSET) +#define ROM_SIZE (CONFIG_FLASH_SIZE*1K - CONFIG_FLASH_LOAD_OFFSET) #endif #endif #if defined(CONFIG_XIP) - #if defined(CONFIG_IS_BOOTLOADER) - #define RAM_SIZE (CONFIG_BOOTLOADER_SRAM_SIZE * 1K) - #define RAM_ADDR (CONFIG_SRAM_BASE_ADDRESS + \ - (CONFIG_SRAM_SIZE * 1K - RAM_SIZE)) - #else - #define RAM_SIZE (CONFIG_SRAM_SIZE * 1K) - #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS - #endif +#if defined(CONFIG_IS_BOOTLOADER) +#define RAM_SIZE (CONFIG_BOOTLOADER_SRAM_SIZE * 1K) +#define RAM_ADDR (CONFIG_SRAM_BASE_ADDRESS + \ + (CONFIG_SRAM_SIZE * 1K - RAM_SIZE)) #else - #define RAM_SIZE (CONFIG_SRAM_SIZE * 1K - CONFIG_BOOTLOADER_SRAM_SIZE * 1K) - #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS +#define RAM_SIZE (CONFIG_SRAM_SIZE * 1K) +#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS +#endif +#else +#define RAM_SIZE (CONFIG_SRAM_SIZE * 1K - CONFIG_BOOTLOADER_SRAM_SIZE * 1K) +#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS #endif #if defined(CONFIG_CUSTOM_SECTION_ALIGN)