arch: arm: cortex_r: linker.ld: Fix ROM section names

[stephanosio]

This commit fixes the improper naming of the ROM sections.

1. Rename the first ROM section, which was previously named using the
   _TEXT_SECTION_NAME definition, to rom_start, as this section does
   not actually represent the text section.

2. Rename the second ROM section, which was previously named
   _TEXT_SECTION_NAME_2 which supposedly refers to the definition of
   the same name that does not exist, to _TEXT_SECTION_NAME. Note that
   this is indeed the section that contains the text section from the
   source image.

Signed-off-by: Stephanos Ioannidis [email protected]

Addresses #21650 for Cortex-R.

[ioannisg]

Second patch looks good.
The clean up stuff in the first patch is also fine, but I 'd like to see zero indentation for preprocessor directives, as this seems to be the rule (rather than the exception) in Zephyr. We did the same for cortex-m linker script :)

[stephanosio]

The clean up stuff in the first patch is also fine, but I 'd like to see zero indentation for preprocessor directives, as this seems to be the rule (rather than the exception) in Zephyr.

@ioannisg While I also tend to follow the "zero indentation for preprocessor directives" rule most of the time, in this case, the significantly improved readability from proper indentation was simply too good to pass.

Given that the indented portion is not part of any "code," this does not create the infamous readability issue involving preprocessor directives identification among the "code."

Is there a formal guideline/rule about this?

[stephanosio]

To elaborate, I would take the former over the latter any day despite the former generally being something to avoid (in some cases with a good reason; in other cases, not so much).

#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
#else
  #define RAM_SIZE (CONFIG_SRAM_SIZE * 1K - CONFIG_BOOTLOADER_SRAM_SIZE * 1K)
  #define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
#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
#else
#define RAM_SIZE (CONFIG_SRAM_SIZE * 1K - CONFIG_BOOTLOADER_SRAM_SIZE * 1K)
#define RAM_ADDR CONFIG_SRAM_BASE_ADDRESS
#endif

[ioannisg]

@stephanosio the situation is taht 95% of Zephyr code does not use indentation in pre-processor directives. Although there is no formal requirement in the coding style guidelines, I am in favor of consistency here. It's easier to change the remaining 5% to look similar to the rest of the code :)