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 with /home/wd/git/u-boot/custodian/u-boot-testing
[platform/kernel/u-boot.git]
/
include
/
configs
/
NSCU.h
diff --git
a/include/configs/NSCU.h
b/include/configs/NSCU.h
index
f13cb34
..
4cd4472
100644
(file)
--- a/
include/configs/NSCU.h
+++ b/
include/configs/NSCU.h
@@
-1,5
+1,5
@@
/*
/*
- * (C) Copyright 2000-200
3
+ * (C) Copyright 2000-200
5
* 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
@@
-56,16
+56,16
@@
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
- "nfsroot=$
(serverip):$(rootpath)
\0" \
+ "nfsroot=$
{serverip}:${rootpath}
\0" \
"ramargs=setenv bootargs root=/dev/ram rw\0" \
"ramargs=setenv bootargs root=/dev/ram rw\0" \
- "addip=setenv bootargs $
(bootargs)
" \
- "ip=$
(ipaddr):$(serverip):$(gatewayip):$(netmask)
" \
- ":$
(hostname):$(netdev)
:off panic=1\0" \
+ "addip=setenv bootargs $
{bootargs}
" \
+ "ip=$
{ipaddr}:${serverip}:${gatewayip}:${netmask}
" \
+ ":$
{hostname}:${netdev}
:off panic=1\0" \
"flash_nfs=run nfsargs addip;" \
"flash_nfs=run nfsargs addip;" \
- "bootm $
(kernel_addr)
\0" \
+ "bootm $
{kernel_addr}
\0" \
"flash_self=run ramargs addip;" \
"flash_self=run ramargs addip;" \
- "bootm $
(kernel_addr) $(ramdisk_addr)
\0" \
- "net_nfs=tftp 200000 $
(bootfile)
;run nfsargs addip;bootm\0" \
+ "bootm $
{kernel_addr} ${ramdisk_addr}
\0" \
+ "net_nfs=tftp 200000 $
{bootfile}
;run nfsargs addip;bootm\0" \
"rootpath=/opt/eldk/ppc_8xx\0" \
"bootfile=/tftpboot/NSCU/uImage\0" \
"kernel_addr=40080000\0" \
"rootpath=/opt/eldk/ppc_8xx\0" \
"bootfile=/tftpboot/NSCU/uImage\0" \
"kernel_addr=40080000\0" \
@@
-84,7
+84,15
@@
#undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */
#undef CONFIG_CAN_DRIVER /* CAN Driver support 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
+
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
@@
-93,14
+101,19
@@
#define CONFIG_ISP1362_USB /* ISP1362 USB OTG controller */
#define CONFIG_ISP1362_USB /* ISP1362 USB OTG controller */
-#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
- CFG_CMD_ASKENV | \
- CFG_CMD_DHCP | \
- CFG_CMD_IDE | \
- CFG_CMD_DATE )
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_SNTP
+
/*
* Miscellaneous configurable options
/*
* Miscellaneous configurable options
@@
-115,7
+128,7
@@
#define CFG_PROMPT_HUSH_PS2 "> "
#endif
#define CFG_PROMPT_HUSH_PS2 "> "
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@@
-199,7
+212,7
@@
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
* Cache Configuration
*/
#define CFG_CACHELINE_SIZE 16 /* For all MPC8xx CPUs */
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif
#define CFG_CACHELINE_SHIFT 4 /* log base 2 of the above value */
#endif
@@
-284,7
+297,7
@@
#define CFG_PCMCIA_IO_SIZE ( 64 << 20 )
#define PCMCIA_MEM_WIN_NO 8 /* override default 4 in pcmcia.h */
#define PCMCIA_SOCKETS_NO 2 /* we have two sockets */
#define CFG_PCMCIA_IO_SIZE ( 64 << 20 )
#define PCMCIA_MEM_WIN_NO 8 /* override default 4 in pcmcia.h */
#define PCMCIA_SOCKETS_NO 2 /* we have two sockets */
-#
define NSCU_OE_INV 1 /* PCMCIA_GCRX_CXOE i
s inverted on early boards */
+#
undef NSCU_OE_INV /* PCMCIA_GCRX_CXOE wa
s inverted on early boards */
/*-----------------------------------------------------------------------
* IDE/ATA stuff (Supports IDE harddisk on PCMCIA Adapter)
/*-----------------------------------------------------------------------
* IDE/ATA stuff (Supports IDE harddisk on PCMCIA Adapter)