summaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2007-08-10 19:19:50 -0400
committerGerald Van Baren <vanbaren@cideas.com>2007-08-10 19:19:50 -0400
commit29eaae953476f2bba4d5c7ac097b96cd827c1dff (patch)
tree537faa4c04db58ee7b070b56bd7de7bd116092d3 /include/common.h
parented8e5f362a2fc572eb9c1854f6c76c291b0f9a0f (diff)
parentfb56579ffe7ef3275b7036bb7b924e5a0d32bd70 (diff)
downloadu-boot-imx-29eaae953476f2bba4d5c7ac097b96cd827c1dff.zip
u-boot-imx-29eaae953476f2bba4d5c7ac097b96cd827c1dff.tar.gz
u-boot-imx-29eaae953476f2bba4d5c7ac097b96cd827c1dff.tar.bz2
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index ac29d3a..27a660a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -241,6 +241,9 @@ int saveenv (void);
void inline setenv (char *, char *);
#else
void setenv (char *, char *);
+#ifdef CONFIG_HAS_UID
+void forceenv (char *, char *);
+#endif
#endif /* CONFIG_PPC */
#ifdef CONFIG_ARM
# include <asm/mach-types.h>
@@ -526,6 +529,8 @@ void cpu_init_f (void);
int cpu_init_r (void);
#if defined(CONFIG_8260)
int prt_8260_rsr (void);
+#elif defined(CONFIG_MPC83XX)
+int prt_83xx_rsr (void);
#endif
/* $(CPU)/interrupts.c */