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 'next' branch
[oweals/u-boot.git]
/
cpu
/
nios
/
asmi.c
diff --git
a/cpu/nios/asmi.c
b/cpu/nios/asmi.c
index c2cd8fead0ebe7c4cfdf342093f2bc0b674f19bf..2c2e838de84c22f7e394107592ad1fae82231a85 100644
(file)
--- a/
cpu/nios/asmi.c
+++ b/
cpu/nios/asmi.c
@@
-27,8
+27,8
@@
#include <command.h>
#include <nios-io.h>
#include <command.h>
#include <nios-io.h>
-#if !defined(C
FG
_NIOS_ASMIBASE)
-#error "*** C
FG
_NIOS_ASMIBASE not defined ***"
+#if !defined(C
ONFIG_SYS
_NIOS_ASMIBASE)
+#error "*** C
ONFIG_SYS
_NIOS_ASMIBASE not defined ***"
#endif
/*-----------------------------------------------------------------------*/
#endif
/*-----------------------------------------------------------------------*/
@@
-69,7
+69,7
@@
#define ASMI_STATUS_WIP (1<<0) /* Write in progress */
#define ASMI_STATUS_WEL (1<<1) /* Write enable latch */
#define ASMI_STATUS_WIP (1<<0) /* Write in progress */
#define ASMI_STATUS_WEL (1<<1) /* Write enable latch */
-static nios_asmi_t *asmi = (nios_asmi_t *)C
FG
_NIOS_ASMIBASE;
+static nios_asmi_t *asmi = (nios_asmi_t *)C
ONFIG_SYS
_NIOS_ASMIBASE;
/***********************************************************************
* Device access
/***********************************************************************
* Device access