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 ssh://10.10.0.7/home/wd/git/u-boot/master
[oweals/u-boot.git]
/
include
/
configs
/
xaeniax.h
diff --git
a/include/configs/xaeniax.h
b/include/configs/xaeniax.h
index 1149542bbe242b5e721413e21b1f64f65ad4b6a3..ec73224fb1116778f9df8b4a3b65bce235d2787c 100644
(file)
--- a/
include/configs/xaeniax.h
+++ b/
include/configs/xaeniax.h
@@
-65,6
+65,15
@@
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
@@
-88,7
+97,7
@@
#define CONFIG_BOOTCOMMAND "bootm 0x00100000"
#define CONFIG_BOOTARGS "console=ttyS1,115200"
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_BOOTCOMMAND "bootm 0x00100000"
#define CONFIG_BOOTARGS "console=ttyS1,115200"
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
+#define CONFIG_SETUP_MEMORY_TAGS 1
#define CONFIG_INITRD_TAG 1
#if defined(CONFIG_CMD_KGDB)
#define CONFIG_INITRD_TAG 1
#if defined(CONFIG_CMD_KGDB)
@@
-100,7
+109,7
@@
* Size of malloc() pool; this lives below the uppermost 128 KiB which are
* used for the RAM copy of the uboot code
*/
* Size of malloc() pool; this lives below the uppermost 128 KiB which are
* used for the RAM copy of the uboot code
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-167,9
+176,9
@@
#define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */
/* FIXME */
#define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */
/* FIXME */
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
/*
* Stack sizes
/*
* Stack sizes