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
/
bfin_adi_common.h
diff --git
a/include/configs/bfin_adi_common.h
b/include/configs/bfin_adi_common.h
index
a581924
..
00bfc6e
100644
(file)
--- a/
include/configs/bfin_adi_common.h
+++ b/
include/configs/bfin_adi_common.h
@@
-12,6
+12,13
@@
# include <config_cmd_default.h>
# if ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
# include <config_cmd_default.h>
# if ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
+# define CONFIG_BOOTP_SUBNETMASK
+# define CONFIG_BOOTP_GATEWAY
+# define CONFIG_BOOTP_DNS
+# define CONFIG_BOOTP_NTPSERVER
+# define CONFIG_BOOTP_RANDOM_DELAY
+# define CONFIG_KEEP_SERVERADDR
+# define CONFIG_CMD_DNS
# define CONFIG_CMD_PING
# ifdef CONFIG_BFIN_MAC
# define CONFIG_CMD_MII
# define CONFIG_CMD_PING
# ifdef CONFIG_BFIN_MAC
# define CONFIG_CMD_MII
@@
-38,11
+45,17
@@
# define CONFIG_CMD_USB_STORAGE
# define CONFIG_DOS_PARTITION
# endif
# define CONFIG_CMD_USB_STORAGE
# define CONFIG_DOS_PARTITION
# endif
+# ifdef CONFIG_NAND_PLAT
+# define CONFIG_CMD_NAND
+# endif
# ifdef CONFIG_POST
# define CONFIG_CMD_DIAG
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
# ifdef CONFIG_POST
# define CONFIG_CMD_DIAG
# endif
# ifdef CONFIG_RTC_BFIN
# define CONFIG_CMD_DATE
+# if ADI_CMDS_NETWORK
+# define CONFIG_CMD_SNTP
+# endif
# endif
# ifdef CONFIG_SPI
# define CONFIG_CMD_EEPROM
# endif
# ifdef CONFIG_SPI
# define CONFIG_CMD_EEPROM
@@
-74,6
+87,9
@@
# define CONFIG_CMD_SPIBOOTLDR
# endif
#endif
# define CONFIG_CMD_SPIBOOTLDR
# endif
#endif
+#ifdef CONFIG_CMD_NAND
+# define CONFIG_SYS_64BIT_VSPRINTF
+#endif
/*
* Console Settings
/*
* Console Settings
@@
-103,14
+119,19
@@
#else
# define CONFIG_BOOTDELAY 5
#endif
#else
# define CONFIG_BOOTDELAY 5
#endif
-#define CONFIG_BOOTCOMMAND "run ramboot"
+#ifndef CONFIG_BOOTCOMMAND
+# define CONFIG_BOOTCOMMAND "run ramboot"
+#endif
#ifdef CONFIG_VIDEO
# define CONFIG_BOOTARGS_VIDEO "console=tty0 "
#else
# define CONFIG_BOOTARGS_VIDEO ""
#endif
#ifdef CONFIG_VIDEO
# define CONFIG_BOOTARGS_VIDEO "console=tty0 "
#else
# define CONFIG_BOOTARGS_VIDEO ""
#endif
+#ifndef CONFIG_BOOTARGS_ROOT
+# define CONFIG_BOOTARGS_ROOT "/dev/mtdblock0 rw"
+#endif
#define CONFIG_BOOTARGS \
#define CONFIG_BOOTARGS \
- "root=
/dev/mtdblock0 rw
" \
+ "root=
" CONFIG_BOOTARGS_ROOT "
" \
"clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \
"earlyprintk=" \
"serial," \
"clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \
"earlyprintk=" \
"serial," \
@@
-118,7
+139,17
@@
MK_STR(CONFIG_BAUDRATE) " " \
CONFIG_BOOTARGS_VIDEO \
"console=ttyBF0," MK_STR(CONFIG_BAUDRATE)
MK_STR(CONFIG_BAUDRATE) " " \
CONFIG_BOOTARGS_VIDEO \
"console=ttyBF0," MK_STR(CONFIG_BAUDRATE)
-
+#if defined(CONFIG_CMD_NAND)
+# define NAND_ENV_SETTINGS \
+ "nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
+ "nandboot=" \
+ "nand read $(loadaddr) 0x20000 0x100000;" \
+ "run nandargs;" \
+ "bootm" \
+ "\0"
+#else
+# define NAND_ENV_SETTINGS
+#endif
#if defined(CONFIG_CMD_NET)
# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
# define UBOOT_ENV_FILE "u-boot.bin"
#if defined(CONFIG_CMD_NET)
# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
# define UBOOT_ENV_FILE "u-boot.bin"
@@
-142,8
+173,8
@@
"nand write $(loadaddr) 0 0x40000"
# else
# define UBOOT_ENV_UPDATE \
"nand write $(loadaddr) 0 0x40000"
# else
# define UBOOT_ENV_UPDATE \
- "protect off 0x20000000
0x2003FFFF
;" \
- "erase 0x20000000
0x2003FFFF
;" \
+ "protect off 0x20000000
+$(filesize)
;" \
+ "erase 0x20000000
+$(filesize)
;" \
"cp.b $(loadaddr) 0x20000000 $(filesize)"
# endif
# define NETWORK_ENV_SETTINGS \
"cp.b $(loadaddr) 0x20000000 $(filesize)"
# endif
# define NETWORK_ENV_SETTINGS \
@@
-156,19
+187,23
@@
"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):" \
"$(hostname):eth0:off" \
"\0" \
"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):" \
"$(hostname):eth0:off" \
"\0" \
+ \
+ "ramfile=uImage\0" \
"ramargs=set bootargs " CONFIG_BOOTARGS "\0" \
"ramboot=" \
"ramargs=set bootargs " CONFIG_BOOTARGS "\0" \
"ramboot=" \
- "tftp $(loadaddr)
uImage
;" \
+ "tftp $(loadaddr)
$(ramfile)
;" \
"run ramargs;" \
"run addip;" \
"bootm" \
"\0" \
"run ramargs;" \
"run addip;" \
"bootm" \
"\0" \
+ \
+ "nfsfile=vmImage\0" \
"nfsargs=set bootargs " \
"root=/dev/nfs rw " \
"nfsroot=$(serverip):$(rootpath),tcp,nfsvers=3" \
"\0" \
"nfsboot=" \
"nfsargs=set bootargs " \
"root=/dev/nfs rw " \
"nfsroot=$(serverip):$(rootpath),tcp,nfsvers=3" \
"\0" \
"nfsboot=" \
- "tftp $(loadaddr)
vmImage
;" \
+ "tftp $(loadaddr)
$(nfsfile)
;" \
"run nfsargs;" \
"run addip;" \
"bootm" \
"run nfsargs;" \
"run addip;" \
"bootm" \
@@
-177,6
+212,7
@@
# define NETWORK_ENV_SETTINGS
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
# define NETWORK_ENV_SETTINGS
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
+ NAND_ENV_SETTINGS \
NETWORK_ENV_SETTINGS \
"flashboot=bootm 0x20100000\0"
NETWORK_ENV_SETTINGS \
"flashboot=bootm 0x20100000\0"
@@
-197,4
+233,9
@@
# define CONFIG_NET_RETRY_COUNT 20
#endif
# define CONFIG_NET_RETRY_COUNT 20
#endif
+/*
+ * Misc Settings
+ */
+#define CONFIG_LZMA
+
#endif
#endif