Hi Jeroen,
On Mon, 23 Jun 2014 22:07:04 +0200, Jeroen Hofstee
<jer...@myspectrum.nl> wrote:
> This is not only more readable but also prevents a warning
> about a missing prototype. The prototypes which are actually
> missing are added.
>
> cc: Albert Aribaud <albert.u.b...@aribaud.net>
> Signed-off-by: Jeroen Hofstee <jer...@myspectrum.nl>
> ---
> arch/arm/cpu/armv7/cache_v7.c | 45
> +++++++------------------------------------
> arch/arm/include/asm/cache.h | 3 +++
> arch/arm/lib/cache-cp15.c | 9 ++-------
> arch/arm/lib/cache.c | 13 +++----------
> 4 files changed, 15 insertions(+), 55 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c
> index bc5fc42..a2c4032 100644
> --- a/arch/arm/cpu/armv7/cache_v7.c
> +++ b/arch/arm/cpu/armv7/cache_v7.c
> @@ -354,41 +354,10 @@ void invalidate_icache_all(void)
> }
> #endif
>
> -/*
> - * Stub implementations for outer cache operations
> - */
> -void __v7_outer_cache_enable(void)
> -{
> -}
> -void v7_outer_cache_enable(void)
> - __attribute__((weak, alias("__v7_outer_cache_enable")));
> -
> -void __v7_outer_cache_disable(void)
> -{
> -}
> -void v7_outer_cache_disable(void)
> - __attribute__((weak, alias("__v7_outer_cache_disable")));
> -
> -void __v7_outer_cache_flush_all(void)
> -{
> -}
> -void v7_outer_cache_flush_all(void)
> - __attribute__((weak, alias("__v7_outer_cache_flush_all")));
> -
> -void __v7_outer_cache_inval_all(void)
> -{
> -}
> -void v7_outer_cache_inval_all(void)
> - __attribute__((weak, alias("__v7_outer_cache_inval_all")));
> -
> -void __v7_outer_cache_flush_range(u32 start, u32 end)
> -{
> -}
> -void v7_outer_cache_flush_range(u32 start, u32 end)
> - __attribute__((weak, alias("__v7_outer_cache_flush_range")));
> -
> -void __v7_outer_cache_inval_range(u32 start, u32 end)
> -{
> -}
> -void v7_outer_cache_inval_range(u32 start, u32 end)
> - __attribute__((weak, alias("__v7_outer_cache_inval_range")));
> +/* Stub implementations for outer cache operations */
> +__weak void v7_outer_cache_enable(void) {}
> +__weak void v7_outer_cache_disable(void) {}
> +__weak void v7_outer_cache_flush_all(void) {}
> +__weak void v7_outer_cache_inval_all(void) {}
> +__weak void v7_outer_cache_flush_range(u32 start, u32 end) {}
> +__weak void v7_outer_cache_inval_range(u32 start, u32 end) {}
> diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
> index ddebbc8..a836e9f 100644
> --- a/arch/arm/include/asm/cache.h
> +++ b/arch/arm/include/asm/cache.h
> @@ -29,6 +29,9 @@ void l2_cache_enable(void);
> void l2_cache_disable(void);
> void set_section_dcache(int section, enum dcache_option option);
>
> +void arm_init_before_mmu(void);
> +void arm_init_domains(void);
> +void cpu_cache_initialization(void);
> void dram_bank_mmu_setup(int bank);
>
> #endif
> diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
> index 8642010..5fdfdbf 100644
> --- a/arch/arm/lib/cache-cp15.c
> +++ b/arch/arm/lib/cache-cp15.c
> @@ -14,11 +14,9 @@
>
> DECLARE_GLOBAL_DATA_PTR;
>
> -void __arm_init_before_mmu(void)
> +__weak void arm_init_before_mmu(void)
> {
> }
> -void arm_init_before_mmu(void)
> - __attribute__((weak, alias("__arm_init_before_mmu")));
>
> __weak void arm_init_domains(void)
> {
> @@ -44,14 +42,11 @@ void set_section_dcache(int section, enum dcache_option
> option)
> page_table[section] = value;
> }
>
> -void __mmu_page_table_flush(unsigned long start, unsigned long stop)
> +__weak void mmu_page_table_flush(unsigned long start, unsigned long stop)
> {
> debug("%s: Warning: not implemented\n", __func__);
> }
>
> -void mmu_page_table_flush(unsigned long start, unsigned long stop)
> - __attribute__((weak, alias("__mmu_page_table_flush")));
> -
> void mmu_set_region_dcache_behaviour(u32 start, int size,
> enum dcache_option option)
> {
> diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
> index 4f6b9f0..4e597a4 100644
> --- a/arch/arm/lib/cache.c
> +++ b/arch/arm/lib/cache.c
> @@ -9,7 +9,7 @@
>
> #include <common.h>
>
> -void __flush_cache(unsigned long start, unsigned long size)
> +__weak void flush_cache(unsigned long start, unsigned long size)
> {
> #if defined(CONFIG_ARM1136)
>
> @@ -31,28 +31,21 @@ void __flush_cache(unsigned long start, unsigned long
> size)
> #endif /* CONFIG_ARM926EJS */
> return;
> }
> -void flush_cache(unsigned long start, unsigned long size)
> - __attribute__((weak, alias("__flush_cache")));
>
> /*
> * Default implementation:
> * do a range flush for the entire range
> */
> -void __flush_dcache_all(void)
> +__weak void flush_dcache_all(void)
> {
> flush_cache(0, ~0);
> }
> -void flush_dcache_all(void)
> - __attribute__((weak, alias("__flush_dcache_all")));
> -
>
> /*
> * Default implementation of enable_caches()
> * Real implementation should be in platform code
> */
> -void __enable_caches(void)
> +__weak void enable_caches(void)
> {
> puts("WARNING: Caches not enabled\n");
> }
> -void enable_caches(void)
> - __attribute__((weak, alias("__enable_caches")));
Applied to u-boot-arm/master, thanks!
Amicalement,
--
Albert.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
