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
ppc: Clean up calling of misc_init_r() during init
[platform/kernel/u-boot.git]
/
include
/
configs
/
CPCI4052.h
diff --git
a/include/configs/CPCI4052.h
b/include/configs/CPCI4052.h
index
2677cfb
..
07c4e35
100644
(file)
--- a/
include/configs/CPCI4052.h
+++ b/
include/configs/CPCI4052.h
@@
-40,6
+40,7
@@
#undef CONFIG_CPCI405_6U /* enable this for 6U boards */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#undef CONFIG_CPCI405_6U /* enable this for 6U boards */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
+#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
#define CONFIG_SYS_CLK_FREQ 33330000 /* external frequency to pll */
@@
-154,6
+155,12
@@
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
+#define CONFIG_AUTOBOOT_KEYED 1
+#define CONFIG_AUTOBOOT_PROMPT \
+ "Press SPACE to abort autoboot in %d seconds\n", bootdelay
+#undef CONFIG_AUTOBOOT_DELAY_STR
+#define CONFIG_AUTOBOOT_STOP_STR " "
+
#define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */
/*-----------------------------------------------------------------------
#define CONFIG_SYS_RX_ETH_BUFFER 16 /* use 16 rx buffer on 405 emac */
/*-----------------------------------------------------------------------
@@
-186,6
+193,8
@@
#define CONFIG_SYS_PCI_PTM2MS 0xffc00001 /* 4MB, enable */
#define CONFIG_SYS_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */
#define CONFIG_SYS_PCI_PTM2MS 0xffc00001 /* 4MB, enable */
#define CONFIG_SYS_PCI_PTM2PCI 0x04000000 /* Host: use this pci address */
+#define CONFIG_PCI_4xx_PTM_OVERWRITE 1 /* overwrite PTMx settings by env */
+
/*-----------------------------------------------------------------------
* IDE/ATA stuff
*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
* IDE/ATA stuff
*-----------------------------------------------------------------------