mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-08-19 03:36:19 -04:00
ARM: arm1176: Define arch_cpu_init() at the SoC level
Commit 86c6326 "ARM: arm1176: enable instruction cache in arch_cpu_init()" defined arch_cpu_init() in a file that is shared across all arm1176 SoCs. tnetv107x already implemented this function, which caused linking to break. Move the new conflicting arch_cpu_init() into arm1176/bcm2835/init.c so that it doesn't conflict; grep indicates this function is usually defined at the SoC-level, not the CPU-level, at least for ARM. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
parent
5675b50916
commit
59d63f7d2c
@ -17,7 +17,7 @@ include $(TOPDIR)/config.mk
|
|||||||
LIB = $(obj)lib$(SOC).o
|
LIB = $(obj)lib$(SOC).o
|
||||||
|
|
||||||
SOBJS := lowlevel_init.o
|
SOBJS := lowlevel_init.o
|
||||||
COBJS := reset.o timer.o
|
COBJS := init.o reset.o timer.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.c) $(COBJS:.o=.c)
|
SRCS := $(SOBJS:.o=.c) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
||||||
|
24
arch/arm/cpu/arm1176/bcm2835/init.c
Normal file
24
arch/arm/cpu/arm1176/bcm2835/init.c
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* (C) Copyright 2012 Stephen Warren
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* version 2 as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
|
||||||
|
int arch_cpu_init(void)
|
||||||
|
{
|
||||||
|
icache_enable();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
@ -65,10 +65,3 @@ static void cache_flush (void)
|
|||||||
/* mem barrier to sync things */
|
/* mem barrier to sync things */
|
||||||
asm ("mcr p15, 0, %0, c7, c10, 4": :"r" (0));
|
asm ("mcr p15, 0, %0, c7, c10, 4": :"r" (0));
|
||||||
}
|
}
|
||||||
|
|
||||||
int arch_cpu_init(void)
|
|
||||||
{
|
|
||||||
icache_enable();
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user