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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC832XEMDS.h
diff --git
a/include/configs/MPC832XEMDS.h
b/include/configs/MPC832XEMDS.h
index
fd48260
..
3bc10aa
100644
(file)
--- a/
include/configs/MPC832XEMDS.h
+++ b/
include/configs/MPC832XEMDS.h
@@
-7,8
+7,6
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_DISPLAY_BOARDINFO
-
/*
* High Level Configuration Options
*/
/*
* High Level Configuration Options
*/
@@
-74,7
+72,6
@@
*/
#define CONFIG_SYS_SICRL 0x00000000
*/
#define CONFIG_SYS_SICRL 0x00000000
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */
#define CONFIG_BOARD_EARLY_INIT_R
/*
#define CONFIG_BOARD_EARLY_INIT_R
/*
@@
-168,7
+165,7
@@
#endif
/* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
#endif
/* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
-#define CONFIG_SYS_MONITOR_LEN (
384 * 1024) /* Reserve 384
kB for Mon */
+#define CONFIG_SYS_MONITOR_LEN (
512 * 1024) /* Reserve 512
kB for Mon */
#define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserved for malloc */
/*
#define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserved for malloc */
/*
@@
-340,7
+337,6
@@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
@@
-441,6
+437,7
@@
*/
/* Initial Memory map for Linux */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
*/
/* Initial Memory map for Linux */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
+#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
/*
* Core HID Setup
/*
* Core HID Setup