projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mimc200' into next
[oweals/u-boot.git]
/
cpu
/
nios2
/
cpu.c
diff --git
a/cpu/nios2/cpu.c
b/cpu/nios2/cpu.c
index f4217a88cf16652ed687e707f78c920170def312..6379534a0b5c59175332a11b317fbd5f35fec39d 100644
(file)
--- a/
cpu/nios2/cpu.c
+++ b/
cpu/nios2/cpu.c
@@
-25,14
+25,14
@@
#include <nios2.h>
#include <nios2-io.h>
#include <nios2.h>
#include <nios2-io.h>
-#if defined (C
FG
_NIOS_SYSID_BASE)
+#if defined (C
ONFIG_SYS
_NIOS_SYSID_BASE)
extern void display_sysid (void);
extern void display_sysid (void);
-#endif /* C
FG
_NIOS_SYSID_BASE */
+#endif /* C
ONFIG_SYS
_NIOS_SYSID_BASE */
int checkcpu (void)
{
printf ("CPU : Nios-II\n");
int checkcpu (void)
{
printf ("CPU : Nios-II\n");
-#if !defined(C
FG
_NIOS_SYSID_BASE)
+#if !defined(C
ONFIG_SYS
_NIOS_SYSID_BASE)
printf ("SYSID : <unknown>\n");
#else
display_sysid ();
printf ("SYSID : <unknown>\n");
#else
display_sysid ();
@@
-43,7
+43,7
@@
int checkcpu (void)
int do_reset (void)
{
int do_reset (void)
{
- void (*rst)(void) = (void(*)(void))C
FG
_RESET_ADDR;
+ void (*rst)(void) = (void(*)(void))C
ONFIG_SYS
_RESET_ADDR;
disable_interrupts ();
rst();
return(0);
disable_interrupts ();
rst();
return(0);