sparc: Initial ground work for generic board initialization

Initial ground work in preperation for generic board initialization
code for the SPARC architecture.

Signed-off-by: Francois Retief <fgretief@spaceteq.co.za>

diff --git a/arch/Kconfig b/arch/Kconfig
index 25dcf4a1a3b1a131104887020a58a8f8069c8132..6489cc9406bcd771b03b29d6f480eb73d6271d17 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -97,6 +97,7 @@ config SH
 
 config SPARC
        bool "SPARC architecture"
+       select HAVE_GENERIC_BOARD
        select CREATE_ARCH_SYMLINK
 
 config X86

diff --git a/arch/sparc/cpu/leon2/cpu.c b/arch/sparc/cpu/leon2/cpu.c
index 380c397be04224d4034a69a5dc07ba6cf5dc9183..22e63e386978f4c37101a34101b26e56af5ebb4c 100644 (file)
--- a/arch/sparc/cpu/leon2/cpu.c
+++ b/arch/sparc/cpu/leon2/cpu.c
@@ -1,7 +1,7 @@
 /* CPU specific code for the LEON2 CPU
  *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */

diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c
index 695ee028b36e1539c9e4e9c50c3520179d45de19..581f05726996dd4f1a8515b5ddf75106e1fcfa56 100644 (file)
--- a/arch/sparc/cpu/leon2/cpu_init.c
+++ b/arch/sparc/cpu/leon2/cpu_init.c
@@ -1,8 +1,8 @@
 /* Initializes CPU and basic hardware such as memory
  * controllers, IRQ controller and system timer 0.
  *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -18,14 +18,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* reset CPU (jump to 0, without reset) */
-void start(void);
-
-struct {
-       gd_t gd_area;
-       bd_t bd;
-} global_data;
-
 /*
  * Breath some life into the CPU...
  *
@@ -69,6 +61,15 @@ void cpu_init_f2(void)
 
 }
 
+int arch_cpu_init(void)
+{
+       gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
+       gd->bus_clk = CONFIG_SYS_CLK_FREQ;
+       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+
+       return 0;
+}
+
 /*
  * initialize higher level parts of CPU like time base and timers
  */

diff --git a/arch/sparc/cpu/leon3/cpu.c b/arch/sparc/cpu/leon3/cpu.c
index 8ab315016b689e44f1d539016790af94214fd218..d57bf2fc8710955c73484abb039ec04306031cb5 100644 (file)
--- a/arch/sparc/cpu/leon3/cpu.c
+++ b/arch/sparc/cpu/leon3/cpu.c
@@ -1,7 +1,7 @@
 /* CPU specific code for the LEON3 CPU
  *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */

diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
index b140da31b13bfe6077464190a514eb0a3e81ecae..a0526cd36c5bf0a9b8aea64fcbb2bf0a424e5c42 100644 (file)
--- a/arch/sparc/cpu/leon3/cpu_init.c
+++ b/arch/sparc/cpu/leon3/cpu_init.c
@@ -27,19 +27,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* reset CPU (jump to 0, without reset) */
-void start(void);
-
 ambapp_dev_irqmp *irqmp = NULL;
 ambapp_dev_gptimer *gptimer = NULL;
 unsigned int gptimer_irq = 0;
 int leon3_snooping_avail = 0;
 
-struct {
-       gd_t gd_area;
-       bd_t bd;
-} global_data;
-
 /*
  * Breath some life into the CPU...
  *
@@ -71,6 +63,15 @@ void cpu_init_f2(void)
        ambapp_bus_init(CONFIG_AMBAPP_IOAREA, CONFIG_SYS_CLK_FREQ, &ambapp_plb);
 }
 
+int arch_cpu_init(void)
+{
+       gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
+       gd->bus_clk = CONFIG_SYS_CLK_FREQ;
+       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
+
+       return 0;
+}
+
 /*
  * initialize higher level parts of CPU like time base and timers
  */

diff --git a/arch/sparc/include/asm/config.h b/arch/sparc/include/asm/config.h
index fd0b5513ee8fa69fe656191f970c529d8ea18904..c884b250fe61586748f8770d7052a7de66359656 100644 (file)
--- a/arch/sparc/include/asm/config.h
+++ b/arch/sparc/include/asm/config.h
@@ -1,5 +1,6 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc.
+ * Copyright 2015,
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -7,6 +8,7 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+#define CONFIG_SYS_GENERIC_GLOBAL_DATA
 #define CONFIG_NEEDS_MANUAL_RELOC
 
 #define CONFIG_LMB

diff --git a/arch/sparc/include/asm/u-boot.h b/arch/sparc/include/asm/u-boot.h
index 5f12e581316b2a7316592e83e4e7341b46dd446f..4c4b5f218a15ffc7ba815b4498fc965cf10d6d0a 100644 (file)
--- a/arch/sparc/include/asm/u-boot.h
+++ b/arch/sparc/include/asm/u-boot.h
@@ -17,6 +17,11 @@
 #ifndef __U_BOOT_H__
 #define __U_BOOT_H__
 
+#ifdef CONFIG_SYS_GENERIC_BOARD
+/* Use the generic board which requires a unified bd_info */
+#include <asm-generic/u-boot.h>
+#else
+
 /*
  * Currently, this Board information is not passed to
  * Linux kernel from U-Boot, but may be passed to other
@@ -44,6 +49,8 @@ typedef struct bd_info {
 
 #endif                         /* __ASSEMBLY__ */
 
+#endif /* !CONFIG_SYS_GENERIC_BOARD */
+
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_SPARC
 

diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index e69b9ba4262010cf634eb4a952e57ff4fa7e3a77..6bddd4c8a1cae0e4f55456bcf48eef2217ad2efe 100644 (file)
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -1,9 +1,13 @@
 #
-# (C) Copyright 2000-2006
+# (C) Copyright 2000-2015
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y  = board.o cache.o interrupts.o time.o
+obj-y = cache.o interrupts.o time.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
+
+ifndef CONFIG_SYS_GENERIC_BOARD
+obj-y += board.o
+endif

diff --git a/common/board_r.c b/common/board_r.c
index a41fb547a3c95d6d4e3182716846e6407fd21ff0..f1dfa68fd55f84198be61e31c2cad19f9f6c2461 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -813,7 +813,8 @@ init_fnc_t init_sequence_r[] = {
        initr_flash,
 #endif
        INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86) || \
+       defined(CONFIG_SPARC)
        /* initialize higher level parts of CPU like time base and timers */
        cpu_init_r,
 #endif