michaelh/zephyr
1
0
Fork 0
Code Releases Activity

core: z_data_copy does not depend on CONFIG_XIP

Browse source 
When XIP is not enabled, z_data_copy() already falls back to an empty
function. No need to ifdef it.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2022-02-15 12:41:25 +01:00 • committed by Carles Cufí
commit 240c975ad4
4 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/nios2/core/prep_c.c
View file

@ -31,11 +31,11 @@
void _PrepC(void) void _PrepC(void)
{ {
z_bss_zero(); z_bss_zero();
#ifdef CONFIG_XIP
z_data_copy(); z_data_copy();
/* In most XIP scenarios we copy the exception code into RAM, so need /* In most XIP scenarios we copy the exception code into RAM, so need
* to flush instruction cache. * to flush instruction cache.
*/ */
#ifdef CONFIG_XIP
z_nios2_icache_flush_all(); z_nios2_icache_flush_all();
#if ALT_CPU_ICACHE_SIZE > 0 #if ALT_CPU_ICACHE_SIZE > 0
/* Only need to flush the data cache here if there actually is an /* Only need to flush the data cache here if there actually is an

2
arch/riscv/core/prep_c.c
View file

@ -30,9 +30,7 @@
void _PrepC(void) void _PrepC(void)
{ {
z_bss_zero(); z_bss_zero();
#ifdef CONFIG_XIP
z_data_copy(); z_data_copy();
#endif
#if defined(CONFIG_RISCV_SOC_INTERRUPT_INIT) #if defined(CONFIG_RISCV_SOC_INTERRUPT_INIT)
soc_interrupt_init(); soc_interrupt_init();
#endif #endif

2
arch/sparc/core/prep_c.c
View file

@ -19,9 +19,7 @@
void _PrepC(void) void _PrepC(void)
{ {
#ifdef CONFIG_XIP
z_data_copy(); z_data_copy();
#endif
z_cstart(); z_cstart();
CODE_UNREACHABLE; CODE_UNREACHABLE;
} }

2
arch/x86/core/intel64/cpu.c
View file

@ -169,9 +169,7 @@ FUNC_NORETURN void z_x86_cpu_init(struct x86_cpuboot *cpuboot)
if (cpu_num == 0U) { if (cpu_num == 0U) {
/* Only need to do these once per boot */ /* Only need to do these once per boot */
z_bss_zero(); z_bss_zero();
#ifdef CONFIG_XIP
z_data_copy(); z_data_copy();
#endif
} }
z_loapic_enable(cpu_num); z_loapic_enable(cpu_num);