[U-Boot] [PATCH 2/3] ARM: ARM1136 - Remove flush_cache from arch/arm/lib/cache.c

[Marek Vasut <marek.vasut@gmail.com>]

On Monday, August 15, 2011 09:04:40 AM Hong Xu wrote:
> On 08/11/2011 12:40 PM, Marek Vasut wrote:
> > On Thursday, August 11, 2011 04:19:47 AM Hong Xu wrote:
> >> arch/arm/lib/cache.c is cleaned and no real cache operation will be
> >> defined in this file. So a new file arch/arm/cpu/arm1136/cache.c is
> >> created. This file will define the real cache operations.
> >> 
> >> Signed-off-by: Hong Xu<hong.xu@atmel.com>
> >> Tested-by: Elen Song<elen.song@atmel.com>
> >> CC: Albert Aribaud<albert.u.boot@aribaud.net>
> >> CC: Aneesh V<aneesh@ti.com>
> >> CC: Marek Vasut<marek.vasut@gmail.com>
> >> CC: Reinhard Meyer<u-boot@emk-elektronik.de>
> >> CC: Heiko Schocher<hs@denx.de>
> >> ---
> >> 
> >>   arch/arm/cpu/arm1136/Makefile |    2 +-
> >>   arch/arm/cpu/arm1136/cache.c  |   33 +++++++++++++++++++++++++++++++++
> >>   2 files changed, 34 insertions(+), 1 deletions(-)
> >>   create mode 100644 arch/arm/cpu/arm1136/cache.c
> >> 
> >> diff --git a/arch/arm/cpu/arm1136/Makefile
> >> b/arch/arm/cpu/arm1136/Makefile index 930e0d1..5b5f330 100644
> >> --- a/arch/arm/cpu/arm1136/Makefile
> >> +++ b/arch/arm/cpu/arm1136/Makefile
> >> @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
> >> 
> >>   LIB	= $(obj)lib$(CPU).o
> >>   
> >>   START	= start.o
> >> 
> >> -COBJS	= cpu.o
> >> +COBJS	= cpu.o cache.o
> >> 
> >>   SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
> >>   OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
> >> 
> >> diff --git a/arch/arm/cpu/arm1136/cache.c b/arch/arm/cpu/arm1136/cache.c
> >> new file mode 100644
> >> index 0000000..02aa266
> >> --- /dev/null
> >> +++ b/arch/arm/cpu/arm1136/cache.c
> >> @@ -0,0 +1,33 @@
> >> +/*
> >> + * (C) Copyright 2002
> >> + * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
> > 
> > Really ?
> 
> not sure...
> Maybe add a copyright line on top of it?

I guess replacing it altogether would be a way to go. It's your code afterall, 
right?

> 
> >> + *
> >> + * See file CREDITS for list of people who contributed to this
> >> + * project.
> >> + *
> >> + * This program is free software; you can redistribute it and/or
> >> + * modify it under the terms of the GNU General Public License as
> >> + * published by the Free Software Foundation; either version 2 of
> >> + * the License, or (at your option) any later version.
> >> + *
> >> + * This program is distributed in the hope that it will be useful,
> >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> >> + * GNU General Public License for more details.
> >> + *
> >> + * You should have received a copy of the GNU General Public License
> >> + * along with this program; if not, write to the Free Software
> >> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> >> + * MA 02111-1307 USA
> >> + */
> >> +
> >> +#include<common.h>
> >> +
> >> +void flush_cache(unsigned long start, unsigned long size)
> >> +{
> >> +#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
> > 
> > Hm, this is in cpu/arm1136/cache.c ... do we need the macro ?
> > 
> > You can test if this breaks anything by MAKEALL script in uboot tree.
> 
> Thanks, I'll have a close look at it.

Thanks :)

> 
> BR,
> Eric
> 
> >> +	void arm1136_cache_flush(void);
> >> +
> >> +	arm1136_cache_flush();
> >> +#endif
> >> +}