[U-Boot] [PATCH v2 06/17] SPEAr : Basic arch related support added for SPEAr SoCs

[Tom Rix <tom@bumblecow.com>]

Vipin KUMAR wrote:
> Adding CONFIG_DISPLAY_CPUINFO and CONFIG_ARCH_CPU_INIT support for SPEAr3xx and
> SPEAr6xx SoCs

Add more complete description of these CONFIG_* variables in the commit log

> 
> Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
> ---
>  arch/arm/cpu/arm926ejs/spear/Makefile      |    3 +-
>  arch/arm/cpu/arm926ejs/spear/cpu.c         |   76 ++++++++++++++++++++++++++++
>  arch/arm/include/asm/arch-spear/spr_misc.h |    5 ++
>  include/configs/spear-common.h             |    3 +-
>  4 files changed, 85 insertions(+), 2 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 bf8dfa8..2814526 100644
> --- a/arch/arm/cpu/arm926ejs/spear/Makefile
> +++ b/arch/arm/cpu/arm926ejs/spear/Makefile
> @@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk
>  LIB	= $(obj)lib$(SOC).a
>  
>  COBJS	:= reset.o \
> -	   timer.o
> +	   timer.o \
> +	   cpu.o

Order the objects is alphabetical.
Move cpu.o to first position

>  SOBJS	:=
>  
>  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
> diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
> new file mode 100644
> index 0000000..e935fec
> --- /dev/null
> +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
> @@ -0,0 +1,76 @@
> +/*
> + * (C) Copyright 2009
> + * Vipin Kumar, ST Micoelectronics, vipin.kumar at 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
> +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_PL011_SERIAL)
> +	periph1_clken |= MISC_UART0ENB;
> +#endif
> +#if defined(CONFIG_DW_ETH)
> +	periph1_clken |= MISC_ETHENB;

This config is not defined.
This is dead code
Remove

or maybe this should be

CONFIG_DESIGNWARE_ETH

> +#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
> +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");

Add an
#else
#error "Unknown cpu .. "
To future proof this logic.

> +#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..045d2bb 100644
> --- a/arch/arm/include/asm/arch-spear/spr_misc.h
> +++ b/arch/arm/include/asm/arch-spear/spr_misc.h
> @@ -126,5 +126,10 @@ struct misc_regs {
>  
>  /* PERIPH1_CLKEN, PERIPH1_RST value */
>  #define MISC_USBDENB			0x01000000
> +#define MISC_ETHENB			0x00800000
> +#define MISC_SMIENB			0x00200000
> +#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 b526558..68ba293 100644
> --- a/include/configs/spear-common.h
> +++ b/include/configs/spear-common.h
> @@ -47,7 +47,6 @@
>  
>  /* Timer, HZ specific defines */
>  #define CONFIG_SYS_HZ				(1000)
> -#define CONFIG_SYS_HZ_CLOCK			(8300000)

Why is CONFIG_SYS_HZ_CLOCK being removed ?
This should likely be its own patch.

Tom

>  
>  /* Flash configuration */
>  #if defined(CONFIG_FLASH_PNOR)
> @@ -168,6 +167,8 @@
>  #define CONFIG_ENV_SIZE				0x02000
>  
>  /* Miscellaneous configurable options */
> +#define CONFIG_ARCH_CPU_INIT			1
> +#define CONFIG_DISPLAY_CPUINFO			1
>  #define CONFIG_BOOT_PARAMS_ADDR			0x00000100
>  #define CONFIG_CMDLINE_TAG			1
>  #define CONFIG_SETUP_MEMORY_TAGS		1