summaryrefslogtreecommitdiff
path: root/arch/sparc/include
diff options
context:
space:
mode:
authorFrancois Retief <fgretief@spaceteq.co.za>2015-10-28 14:29:32 +0200
committerFrancois Retief <fgretief@spaceteq.co.za>2015-12-03 13:15:48 +0200
commite17c5200c7e9a802783a53d4f4457fa68f7fa074 (patch)
tree3d6c2fe4a6deb1c4b1f1dfac50482b15e710b726 /arch/sparc/include
parenta5b629a33e717e794db8db5b0fedbd3aa254e711 (diff)
downloadu-boot-imx-e17c5200c7e9a802783a53d4f4457fa68f7fa074.zip
u-boot-imx-e17c5200c7e9a802783a53d4f4457fa68f7fa074.tar.gz
u-boot-imx-e17c5200c7e9a802783a53d4f4457fa68f7fa074.tar.bz2
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>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r--arch/sparc/include/asm/config.h4
-rw-r--r--arch/sparc/include/asm/u-boot.h7
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/config.h b/arch/sparc/include/asm/config.h
index fd0b551..c884b25 100644
--- 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 5f12e58..4c4b5f2 100644
--- 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