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 git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
origen.h
diff --git
a/include/configs/origen.h
b/include/configs/origen.h
index
fb1536c
..
da9d6a1
100644
(file)
--- a/
include/configs/origen.h
+++ b/
include/configs/origen.h
@@
-9,7
+9,7
@@
#ifndef __CONFIG_ORIGEN_H
#define __CONFIG_ORIGEN_H
#ifndef __CONFIG_ORIGEN_H
#define __CONFIG_ORIGEN_H
-#include <configs/exynos4-
dt
.h>
+#include <configs/exynos4-
common
.h>
#define CONFIG_SYS_PROMPT "ORIGEN # "
#define CONFIG_SYS_PROMPT "ORIGEN # "
@@
-35,9
+35,6
@@
#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200