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-video
[platform/kernel/u-boot.git]
/
include
/
configs
/
integratorcp.h
diff --git
a/include/configs/integratorcp.h
b/include/configs/integratorcp.h
index
b0486df
..
7ae34b7
100644
(file)
--- a/
include/configs/integratorcp.h
+++ b/
include/configs/integratorcp.h
@@
-31,6
+31,8
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
+#define CONFIG_INTEGRATOR
+#define CONFIG_ARCH_INTEGRATOR
/*
* High Level Configuration Options
* (easy to change)
/*
* High Level Configuration Options
* (easy to change)
@@
-52,7
+54,6
@@
/*
* Hardware drivers
*/
/*
* Hardware drivers
*/
-#define CONFIG_NET_MULTI
#define CONFIG_SMC91111
#define CONFIG_SMC_USE_32_BIT
#define CONFIG_SMC91111_BASE 0xC8000000
#define CONFIG_SMC91111
#define CONFIG_SMC_USE_32_BIT
#define CONFIG_SMC91111_BASE 0xC8000000