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 tag 'u-boot-imx-20190101' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
emif.h
diff --git
a/arch/arm/include/asm/emif.h
b/arch/arm/include/asm/emif.h
index 1924f041d292e99d5d0e90ec70cf02f29d234c29..dc398efd32cf236d5eeac72ffcad3f26bf685fe5 100644
(file)
--- a/
arch/arm/include/asm/emif.h
+++ b/
arch/arm/include/asm/emif.h
@@
-17,7
+17,9
@@
#include <asm/io.h>
/* Base address */
+#ifndef EMIF1_BASE
#define EMIF1_BASE 0x4c000000
+#endif
#define EMIF2_BASE 0x4d000000
#define EMIF_4D 0x4