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 /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
include
/
configs
/
PCIPPC6.h
diff --git
a/include/configs/PCIPPC6.h
b/include/configs/PCIPPC6.h
index
f4a5dd8
..
acaab7f
100644
(file)
--- a/
include/configs/PCIPPC6.h
+++ b/
include/configs/PCIPPC6.h
@@
-1,5
+1,5
@@
/*
/*
- * (C) Copyright 2002
+ * (C) Copyright 2002
-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@
-50,35
+50,43
@@
#define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passed to Linux in MHz */
-
#define CONFIG_PREBOOT ""
#define CONFIG_BOOTDELAY 5
#define CONFIG_PREBOOT ""
#define CONFIG_BOOTDELAY 5
-#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \
- CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_BSP | \
- CFG_CMD_DATE | \
- CFG_CMD_DHCP | \
- CFG_CMD_DOC | \
- CFG_CMD_ELF | \
- CFG_CMD_PCI | \
- CFG_CMD_SCSI )
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DOC
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_SCSI
+#define CONFIG_CMD_SNTP
#define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1 /* PCI plug-and-play */
#define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1 /* PCI plug-and-play */
-/* This must be included AFTER the definition of CONFIG_COMMANDS (if any)
- */
-#include <cmd_confdefs.h>
-
+#define CONFIG_NAND_LEGACY
/*
* Miscellaneous configurable options
/*
* Miscellaneous configurable options
@@
-215,16
+223,16
@@
* Note: environment is not EMBEDDED in the U-Boot code.
* It's stored in flash separately.
*/
* Note: environment is not EMBEDDED in the U-Boot code.
* It's stored in flash separately.
*/
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_SIZE
0x1000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 32
/*-----------------------------------------------------------------------
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 32
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif