On Wednesday 07 March 2012 13:03:56 Amit Virdi wrote:
From: Vipin KUMAR vipin.kumar@st.com
Earlier, architecture specific init code was mixed with board initialization code in board/spear/... This patch updates architecture support for SPEAr in latest u-boot.
It defines the following two flags for SPEAr3xx and SPEAr6xx SoCs
- CONFIG_DISPLAY_CPUINFO: Used to print the SoC information
- CONFIG_ARCH_CPU_INIT: compiles the architecture specific initialization
code with arch/arm/spear/cpu.c
Signed-off-by: Vipin Kumar vipin.kumar@st.com Signed-off-by: Amit Virdi amit.virdi@st.com
arch/arm/cpu/arm926ejs/spear/Makefile | 3 +- arch/arm/cpu/arm926ejs/spear/cpu.c | 84 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-spear/spr_misc.h | 7 ++ include/configs/spear-common.h | 2 + 4 files changed, 95 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/spear/cpu.c
diff --git a/arch/arm/cpu/arm926ejs/spear/Makefile b/arch/arm/cpu/arm926ejs/spear/Makefile index f32ec4c..46923a4 100644 --- a/arch/arm/cpu/arm926ejs/spear/Makefile +++ b/arch/arm/cpu/arm926ejs/spear/Makefile @@ -25,7 +25,8 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS := reset.o \ +COBJS := cpu.o \
reset.o \ timer.oSOBJS :=
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c new file mode 100644 index 0000000..4dc7d69 --- /dev/null +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c @@ -0,0 +1,84 @@ +/*
- (C) Copyright 2010
- Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
- 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> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/arch/spr_misc.h>
+#ifdef CONFIG_ARCH_CPU_INIT
Why not remove this #ifdef here and make compile it in unconditionally? It is needed for each SPEAr board, right?
+int arch_cpu_init(void) +{
- struct misc_regs *const misc_p =
(struct misc_regs *)CONFIG_SPEAR_MISCBASE;- u32 periph1_clken;
- periph1_clken = readl(&misc_p->periph1_clken);
+#if defined(CONFIG_SPEAR3XX)
- periph1_clken |= MISC_GPT2ENB;
+#elif defined(CONFIG_SPEAR600)
- periph1_clken |= MISC_GPT3ENB;
+#endif
+#if defined(CONFIG_PL011_SERIAL)
- periph1_clken |= MISC_UART0ENB;
+#endif +#if defined(CONFIG_DESIGNWARE_ETH)
- periph1_clken |= MISC_ETHENB;
+#endif +#if defined(CONFIG_DW_UDC)
- periph1_clken |= MISC_USBDENB;
+#endif +#if defined(CONFIG_DW_I2C)
- periph1_clken |= MISC_I2CENB;
+#endif +#if defined(CONFIG_ST_SMI)
- periph1_clken |= MISC_SMIENB;
+#endif +#if defined(CONFIG_NAND_FSMC)
- periph1_clken |= MISC_FSMCENB;
+#endif
- writel(periph1_clken, &misc_p->periph1_clken);
- return 0;
+} +#endif
+#ifdef CONFIG_DISPLAY_CPUINFO
Again, I would remove this #ifdef here. Make it unconditionally for all SPEAr boards. We have enough #ifdef's already. :)
+int print_cpuinfo(void) +{ +#ifdef CONFIG_SPEAR300
- printf("CPU: SPEAr300\n");
+#elif defined(CONFIG_SPEAR310)
- printf("CPU: SPEAr310\n");
+#elif defined(CONFIG_SPEAR320)
- printf("CPU: SPEAr320\n");
+#elif defined(CONFIG_SPEAR600)
- printf("CPU: SPEAr600\n");
+#else +#error CPU not supported in spear platform +#endif
- return 0;
+} +#endif diff --git a/arch/arm/include/asm/arch-spear/spr_misc.h b/arch/arm/include/asm/arch-spear/spr_misc.h index 8b96d9b..b10c726 100644 --- a/arch/arm/include/asm/arch-spear/spr_misc.h +++ b/arch/arm/include/asm/arch-spear/spr_misc.h @@ -126,5 +126,12 @@ struct misc_regs {
/* PERIPH1_CLKEN, PERIPH1_RST value */ #define MISC_USBDENB 0x01000000 +#define MISC_ETHENB 0x00800000 +#define MISC_SMIENB 0x00200000 +#define MISC_GPT3ENB 0x00010000 +#define MISC_GPT2ENB 0x00000800 +#define MISC_FSMCENB 0x00000200 +#define MISC_I2CENB 0x00000080 +#define MISC_UART0ENB 0x00000008
#endif diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 3f52442..5540630 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -182,6 +182,8 @@ #define CONFIG_ENV_SIZE 0x02000
/* Miscellaneous configurable options */ +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_DISPLAY_CPUINFO
Other than my comment above:
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de