From: Wolfgang Denk <wd@denx.de>
Date: Tue, 15 Jan 2008 16:21:28 +0000 (+0100)
Subject: TK885D: fixes for bigger flash sector sizes on new modules;
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2b4f778fe9d1de61d7445bae7b325340aba6968d;p=project%2Fbcm63xx%2Fu-boot.git

TK885D: fixes for bigger flash sector sizes on new modules;
adjust default environment;
disable SCC ethernet (not used on this board).

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/include/commproc.h b/include/commproc.h
index 6b1b4e8fff..32a3e1c82a 100644
--- a/include/commproc.h
+++ b/include/commproc.h
@@ -1448,7 +1448,9 @@ typedef struct scc_enet {
  */
 #define	PROFF_ENET	PROFF_SCC2
 #define	CPM_CR_ENET	CPM_CR_CH_SCC2
+#if (!defined(CONFIG_TK885D))	/* TK885D does not use SCC Ethernet */
 #define	SCC_ENET	1
+#endif
 #define PA_ENET_RXD	((ushort)0x0004)	/* PA 13 */
 #define PA_ENET_TXD	((ushort)0x0008)	/* PA 12 */
 #define PA_ENET_RCLK	((ushort)0x0100)	/* PA  7 */
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 761a35276b..c43fef68d4 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -64,6 +64,8 @@
 #undef	CONFIG_BOOTARGS
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
+	"ethprime=FEC ETHERNET\0"					\
+	"ethact=FEC ETHERNET\0"						\
 	"netdev=eth0\0"							\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=${serverip}:${rootpath}\0"			\
@@ -77,7 +79,8 @@
 		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\
 	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\
 	"rootpath=/opt/eldk/ppc_8xx\0"					\
-	"bootfile=/tftpboot/TQM885D/uImage\0"				\
+	"bootfile=/tftpboot/tk885d/uImage\0"				\
+	"u-boot=/tftpboot/tk885d/u-boot.bin\0"				\
 	"kernel_addr=40080000\0"					\
 	"ramdisk_addr=40180000\0"					\
 	"load=tftp 200000 ${u-boot}\0"					\
@@ -254,7 +257,7 @@
 #define CFG_ENV_IS_IN_FLASH	1
 #define CFG_ENV_OFFSET		0x40000 /*   Offset   of Environment Sector	*/
 #define CFG_ENV_SIZE		0x08000 /* Total Size of Environment		*/
-#define CFG_ENV_SECT_SIZE	0x20000 /* Total Size of Environment Sector	*/
+#define CFG_ENV_SECT_SIZE	0x40000 /* Total Size of Environment Sector	*/
 
 /* Address and size of Redundant Environment Sector	*/
 #define CFG_ENV_OFFSET_REDUND	(CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)