projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
board
/
bmw
/
bmw.c
diff --git
a/board/bmw/bmw.c
b/board/bmw/bmw.c
index
41ce14f
..
4039145
100644
(file)
--- a/
board/bmw/bmw.c
+++ b/
board/bmw/bmw.c
@@
-26,7
+26,7
@@
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
#include <net.h>
#include <timestamp.h>
#include <dtt.h>
#include <net.h>
#include <timestamp.h>
#include <dtt.h>
@@
-117,6
+117,7
@@
sys_led_msg(char* msg)
LED_REG(3) = msg[0];
}
LED_REG(3) = msg[0];
}
+#ifdef CONFIG_CMD_DOC
/*
* Map onboard TSOP-16MB DOC FLASH chip.
*/
/*
* Map onboard TSOP-16MB DOC FLASH chip.
*/
@@
-124,6
+125,7
@@
void doc_init (void)
{
doc_probe(DOC_BASE_ADDR);
}
{
doc_probe(DOC_BASE_ADDR);
}
+#endif
#define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR)
#define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR)