projects
/
oweals
/
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-nand-flash
[oweals/u-boot.git]
/
include
/
configs
/
PM828.h
diff --git
a/include/configs/PM828.h
b/include/configs/PM828.h
index 5095a050ac56d552fc8044fc0df7ade02cc4b89c..f437d21c69b1128551d343f71e18485daf411c9f 100644
(file)
--- a/
include/configs/PM828.h
+++ b/
include/configs/PM828.h
@@
-43,7
+43,7
@@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#define CONFIG_PREBOOT "echo;echo Type \
"run flash_nfs
\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \
\\"run flash_nfs\\
\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
@@
-103,8
+103,7
@@
* - CONFIG_NET_MULTI must be defined
*
* if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
* - CONFIG_NET_MULTI must be defined
*
* if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
- * defined elsewhere (as for the console), or CFG_CMD_NET must be removed
- * from CONFIG_COMMANDS to remove support for networking.
+ * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.
*/
#define CONFIG_NET_MULTI
#undef CONFIG_ETHER_NONE /* define if ether on something else */
*/
#define CONFIG_NET_MULTI
#undef CONFIG_ETHER_NONE /* define if ether on something else */
@@
-152,7
+151,14
@@
#undef CONFIG_WATCHDOG /* watchdog disabled */
#undef CONFIG_WATCHDOG /* watchdog disabled */
-#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
/*
/*
@@
-177,7
+183,7
@@
/*
* Disk-On-Chip configuration
*/
/*
* Disk-On-Chip configuration
*/
-#define C
F
G_NAND_LEGACY
+#define C
ONFI
G_NAND_LEGACY
#define CFG_DOC_SHORT_TIMEOUT
#define CFG_MAX_DOC_DEVICE 1 /* Max number of DOC devices */
#define CFG_DOC_SHORT_TIMEOUT
#define CFG_MAX_DOC_DEVICE 1 /* Max number of DOC devices */
@@
-244,19
+250,19
@@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#if 0
/* Start port with environment in flash; switch to EEPROM later */
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
/* Final version: environment in EEPROM */
#else
/* Final version: environment in EEPROM */
-#define C
FG_ENV_IS_IN_EEPROM
1
+#define C
ONFIG_ENV_IS_IN_EEPROM
1
#define CFG_I2C_EEPROM_ADDR 0x58
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CFG_I2C_EEPROM_ADDR 0x58
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE
(2048 - 512)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE
(2048 - 512)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------