[U-Boot] [PATCH 1/2] ARM Cortex8 Rename and move v7_flush_dcache_all to flush_dcache

Wolfgang Denk
2009-08-08T09:47:46Z

Dear Tom Rix,

In message <1246898879-6567-2-git-send-email-Tom.Rix@windriver.com> you wrote:
> --===============0808050101==
>
> Since there is only one version of flushing the dcache for
> arm_cortex8, rename v7_flush_dcache_all to the the generic
> name flush_dcache. Because the function is intended for
> only omap3 boards, move the function to the new file
> cache_flush.S.
>
> This change fixes the compiler warning all OMAP3 targets have
>
> cpu.c: In function 'cleanup_before_linux':
> cpu.c:64: warning: implicit declaration of function 'v7_flush_dcache_all'
>
> Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
> ---
> cpu/arm_cortexa8/cpu.c | 2 +-
> cpu/arm_cortexa8/omap3/Makefile | 1 +
> cpu/arm_cortexa8/omap3/board.c | 2 +-
> cpu/arm_cortexa8/omap3/cache_flush.S | 118 ++++++++++++++++++++++++++++++++
> cpu/arm_cortexa8/start.S | 87 -----------------------
> include/asm-arm/arch-omap3/sys_proto.h | 1 -
> include/asm-arm/cache.h | 1 +
> 7 files changed, 122 insertions(+), 90 deletions(-)
> create mode 100644 cpu/arm_cortexa8/omap3/cache_flush.S

Sorry, this patch does not apply any more:

Applying: ARM Cortex8 Rename and move v7_flush_dcache_all to flush_dcache
error: patch failed: cpu/arm_cortexa8/omap3/Makefile:26
error: cpu/arm_cortexa8/omap3/Makefile: patch does not apply
error: patch failed: cpu/arm_cortexa8/start.S:415
error: cpu/arm_cortexa8/start.S: patch does not apply
fatal: sha1 information is lacking or useless (cpu/arm_cortexa8/omap3/board.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase and resubmit (also patch 2/2).

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Another megabytes the dust.