[U-Boot-Users] [PATCH 0/6] Update sbc8560; enable fdt/powerpc support

[U-Boot-Users] [PATCH 0/6] Update sbc8560; enable fdt/powerpc support

[Paul Gortmaker]

[Resending with Ben's network setting removal done in patch #3; there were
no other request for changes, so this should be good to go...]

The following six patches update the sbc8560 support to fix a memsize
bug + some bitrot (1st three), and then add/enable the powerpc/fdt support
(the second three).  One additional patch required for using the sbc8560
on 1.3.x; the setting of the UART clk in mpc85xx/fdt.c isn't included
here, as that wasn't a fix in a board specific file, and so it is being
reviewed/submitted separately.

Thanks,
Paul.


0001-sbc8560-proper-definitions-for-TSEC.patch
 b/include/configs/sbc8560.h |   32 ++++++++++++++++++++++----------

0002-sbc8560-properly-set-cs0_bnds-for-512MB.patch
 b/board/sbc8560/sbc8560.c |    4 ++++

0003-sbc8560-define-eth0-and-eth1-instead-of-eth1-and-eth2.patch
 b/include/configs/sbc8560.h |   22 +++++++++++++---------

0004-sbc8560-add-in-ft_board_setup.patch
 b/board/sbc8560/sbc8560.c |   28 ++++++++++++++++++++++++++++

0005-sbc8560-add-default-fdt-values.patch
 b/include/configs/sbc8560.h |   34 +++++++++++++++++++++++++++++++---

0006-sbc8560-enable-CONFIG_OF_LIBFDT-by-default.patch
 b/include/configs/sbc8560.h |    5 +++++

[U-Boot-Users] [PATCH 1/7] sbc8560: proper definitions for TSEC.

[Paul Gortmaker]

The definitions for the TSEC have become out of date.  There is no
longer any such options like "CONFIG_MPC85xx_TSEC1" or similar.
Update to match those of other boards, like the MPC8560ADS.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
---
 include/configs/sbc8560.h |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 146eafe..f07fbc0 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -215,16 +215,28 @@
 #define CFG_PCI_MEM_PHYS	0xC0000000
 #define CFG_PCI_MEM_SIZE	0x10000000
 
-#if defined(CONFIG_TSEC_ENET)		/* TSEC Ethernet port */
-
-#  define CONFIG_NET_MULTI	1
-#  define CONFIG_MII		1	/* MII PHY management		*/
-#  define CONFIG_MPC85xx_TSEC1
-#  define CONFIG_MPC85xx_TSEC1_NAME	"TSEC0"
-#  define TSEC1_PHY_ADDR	25
-#  define TSEC1_PHYIDX		0
-/* Options are: TSEC0 */
-#  define CONFIG_ETHPRIME		"TSEC0"
+#ifdef CONFIG_TSEC_ENET
+
+#ifndef CONFIG_NET_MULTI
+#define CONFIG_NET_MULTI 	1
+#endif
+
+#ifndef CONFIG_MII
+#define CONFIG_MII		1	/* MII PHY management */
+#endif
+#define CONFIG_TSEC1	1
+#define CONFIG_TSEC1_NAME	"TSEC0"
+#define CONFIG_TSEC2	1
+#define CONFIG_TSEC2_NAME	"TSEC1"
+#define TSEC1_PHY_ADDR		0x19
+#define TSEC2_PHY_ADDR		0x1a
+#define TSEC1_PHYIDX		0
+#define TSEC2_PHYIDX		0
+#define TSEC1_FLAGS		TSEC_GIGABIT
+#define TSEC2_FLAGS		TSEC_GIGABIT
+
+/* Options are: TSEC[0-1] */
+#define CONFIG_ETHPRIME		"TSEC0"
 
 #elif defined(CONFIG_ETHER_ON_FCC)	/* CPM FCC Ethernet */
 
-- 
1.5.6.2

[U-Boot-Users] [PATCH 2/7] sbc8560: properly set cs0_bnds for 512MB

[Paul Gortmaker]

The sbc8560 board ships with 512MB of memory installed,
but the current cs0_bnds is hard coded for 256MB.  Set the
value based on CFG_SDRAM_SIZE.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 board/sbc8560/sbc8560.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c
index 2946ca1..3b6b541 100644
--- a/board/sbc8560/sbc8560.c
+++ b/board/sbc8560/sbc8560.c
@@ -421,7 +421,11 @@ long int fixed_sdram (void)
   #ifndef CFG_RAMBOOT
 	volatile ccsr_ddr_t *ddr= (void *)(CFG_MPC85xx_DDR_ADDR);
 
+#if (CFG_SDRAM_SIZE == 512)
+	ddr->cs0_bnds		= 0x0000000f;
+#else
 	ddr->cs0_bnds		= 0x00000007;
+#endif
 	ddr->cs1_bnds		= 0x0010001f;
 	ddr->cs2_bnds		= 0x00000000;
 	ddr->cs3_bnds		= 0x00000000;
-- 
1.5.6.2

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Paul Gortmaker]

The existing config doesn't define CONFIG_HAS_ETH0, and so the
fdt support doesn't update the zeros in the dtb local-mac with
real data from the u-boot env.  Since the existing config is
tailored to just two interfaces, get rid of the ETH2 definitions
at the same time.

Also don't include any end user specific data into the environment
by default -- things like MAC address, network parameters etc. need
to come from the end user.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 include/configs/sbc8560.h |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index f07fbc0..f4408ad 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -327,9 +327,8 @@
   #define CFG_ENV_SIZE		0x2000
 #endif
 
-#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
+#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
 /*#define CONFIG_BOOTARGS      "root=/dev/ram rw console=ttyS0,115200"*/
-#define CONFIG_BOOTCOMMAND	"bootm 0xff800000 0xffa00000"
 #define CONFIG_BOOTDELAY	5	/* -1 disable autoboot */
 
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
@@ -405,19 +404,24 @@
   #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
 #endif
 
-/*Note: change below for your network setting!!! */
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
-#  define CONFIG_ETHADDR	00:01:af:07:9b:8a
-#  define CONFIG_HAS_ETH1
-#  define CONFIG_ETH1ADDR	00:01:af:07:9b:8b
-#  define CONFIG_HAS_ETH2
-#  define CONFIG_ETH2ADDR	00:01:af:07:9b:8c
+#define CONFIG_HAS_ETH0
+#define CONFIG_HAS_ETH1
 #endif
 
+/* You can compile in a MAC address and your custom net settings by using
+ * the * following syntax.  Your board should be marked with the assigned
+ * MAC addresses directly on it.
+ */
+#if 0
+#define CONFIG_ETHADDR		00:01:af:07:9b:8a
+#define CONFIG_ETH1ADDR		00:01:af:07:9b:8b
 #define CONFIG_SERVERIP		192.168.0.131
 #define CONFIG_IPADDR		192.168.0.105
-#define CONFIG_GATEWAYIP	0.0.0.0
+#define CONFIG_GATEWAYIP	192.168.0.1
 #define CONFIG_NETMASK		255.255.255.0
+#endif
+
 #define CONFIG_HOSTNAME		SBC8560
 #define CONFIG_ROOTPATH		/home/ppc
 #define CONFIG_BOOTFILE		pImage
-- 
1.5.6.2

[U-Boot-Users] [PATCH 4/7] sbc8560: add in ft_board_setup()

[Paul Gortmaker]

Add in for the sbc8560, the ft_board_setup() routine, based on what is
in use for the Freescale MPC8560ADS board.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 board/sbc8560/sbc8560.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c
index 3b6b541..d9e598c 100644
--- a/board/sbc8560/sbc8560.c
+++ b/board/sbc8560/sbc8560.c
@@ -33,6 +33,8 @@
 #include <ioports.h>
 #include <spd_sdram.h>
 #include <miiphy.h>
+#include <libfdt.h>
+#include <fdt_support.h>
 
 long int fixed_sdram (void);
 
@@ -456,3 +458,29 @@ long int fixed_sdram (void)
 	return CFG_SDRAM_SIZE * 1024 * 1024;
 }
 #endif	/* !defined(CONFIG_SPD_EEPROM) */
+
+
+#if defined(CONFIG_OF_BOARD_SETUP)
+void
+ft_board_setup(void *blob, bd_t *bd)
+{
+	int node, tmp[2];
+#ifdef CONFIG_PCI
+	const char *path;
+#endif
+
+	ft_cpu_setup(blob, bd);
+
+	node = fdt_path_offset(blob, "/aliases");
+	tmp[0] = 0;
+	if (node >= 0) {
+#ifdef CONFIG_PCI
+		path = fdt_getprop(blob, node, "pci0", NULL);
+		if (path) {
+			tmp[1] = hose.last_busno - hose.first_busno;
+			do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1);
+		}
+#endif
+	}
+}
+#endif
-- 
1.5.6.2

[U-Boot-Users] [PATCH 5/7] sbc8560: add default fdt values

[Paul Gortmaker]

Add in the default fdt settings and the typical EXTRA_ENV
settings as borrowed from the mpc8560ads.  Fix a couple
of stale references to the mpc8560ads dating back to the
original clone/fork.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 include/configs/sbc8560.h |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index f4408ad..324120e 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -24,8 +24,8 @@
  * MA 02111-1307 USA
  */
 
-/* mpc8560ads board configuration file */
-/* please refer to doc/README.mpc85xx for more info */
+/* sbc8560 board configuration file */
+/* please refer to doc/README.sbc8560 for more info */
 /* make sure you change the MAC address and other network params first,
  * search for CONFIG_ETHADDR,CONFIG_SERVERIP,etc in this file
  */
@@ -424,6 +424,34 @@
 
 #define CONFIG_HOSTNAME		SBC8560
 #define CONFIG_ROOTPATH		/home/ppc
-#define CONFIG_BOOTFILE		pImage
+#define CONFIG_BOOTFILE		uImage
+
+#define	CONFIG_EXTRA_ENV_SETTINGS		\
+ "netdev=eth0\0"				\
+ "consoledev=ttyS0\0"				\
+ "ramdiskaddr=2000000\0"			\
+ "ramdiskfile=ramdisk.uboot\0"			\
+ "fdtaddr=c00000\0"				\
+ "fdtfile=sbc8560.dtb\0"
+
+#define CONFIG_NFSBOOTCOMMAND						\
+   "setenv bootargs root=/dev/nfs rw "					\
+      "nfsroot=$serverip:$rootpath "					\
+      "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
+      "console=$consoledev,$baudrate $othbootargs;"			\
+   "tftp $loadaddr $bootfile;"						\
+   "tftp $fdtaddr $fdtfile;"						\
+   "bootm $loadaddr - $fdtaddr"
+
+
+#define CONFIG_RAMBOOTCOMMAND \
+   "setenv bootargs root=/dev/ram rw "					\
+      "console=$consoledev,$baudrate $othbootargs;"			\
+   "tftp $ramdiskaddr $ramdiskfile;"					\
+   "tftp $loadaddr $bootfile;"						\
+   "tftp $fdtaddr $fdtfile;"						\
+   "bootm $loadaddr $ramdiskaddr $fdtaddr"
+
+#define CONFIG_BOOTCOMMAND	CONFIG_NFSBOOTCOMMAND
 
 #endif	/* __CONFIG_H */
-- 
1.5.6.2

[U-Boot-Users] [PATCH 6/7] sbc8560: enable CONFIG_OF_LIBFDT by default

[Paul Gortmaker]

Make the default build for the sbc8560 board be powerpc
capable with libfdt support.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 include/configs/sbc8560.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 324120e..cf2f41c 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -200,6 +200,11 @@
 #define CFG_PROMPT_HUSH_PS2 "> "
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT                1
+#define CONFIG_OF_BOARD_SETUP           1
+#define CONFIG_OF_STDOUT_VIA_ALIAS      1
+
 /*
  * I2C
  */
-- 
1.5.6.2

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Ben Warren]

Paul Gortmaker wrote:
> The existing config doesn't define CONFIG_HAS_ETH0, and so the
> fdt support doesn't update the zeros in the dtb local-mac with
> real data from the u-boot env.  Since the existing config is
> tailored to just two interfaces, get rid of the ETH2 definitions
> at the same time.
>
> Also don't include any end user specific data into the environment
> by default -- things like MAC address, network parameters etc. need
> to come from the end user.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>   
Acked-by: Ben Warren <biggerbadderben@gmail.com>
> ---
>  include/configs/sbc8560.h |   22 +++++++++++++---------
>  1 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
> index f07fbc0..f4408ad 100644
> --- a/include/configs/sbc8560.h
> +++ b/include/configs/sbc8560.h
> @@ -327,9 +327,8 @@
>    #define CFG_ENV_SIZE		0x2000
>  #endif
>  
> -#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
> +#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
>  /*#define CONFIG_BOOTARGS      "root=/dev/ram rw console=ttyS0,115200"*/
> -#define CONFIG_BOOTCOMMAND	"bootm 0xff800000 0xffa00000"
>  #define CONFIG_BOOTDELAY	5	/* -1 disable autoboot */
>  
>  #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
> @@ -405,19 +404,24 @@
>    #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
>  #endif
>  
> -/*Note: change below for your network setting!!! */
>  #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
> -#  define CONFIG_ETHADDR	00:01:af:07:9b:8a
> -#  define CONFIG_HAS_ETH1
> -#  define CONFIG_ETH1ADDR	00:01:af:07:9b:8b
> -#  define CONFIG_HAS_ETH2
> -#  define CONFIG_ETH2ADDR	00:01:af:07:9b:8c
> +#define CONFIG_HAS_ETH0
> +#define CONFIG_HAS_ETH1
>  #endif
>  
> +/* You can compile in a MAC address and your custom net settings by using
> + * the * following syntax.  Your board should be marked with the assigned
> + * MAC addresses directly on it.
> + */
> +#if 0
> +#define CONFIG_ETHADDR		00:01:af:07:9b:8a
> +#define CONFIG_ETH1ADDR		00:01:af:07:9b:8b
>  #define CONFIG_SERVERIP		192.168.0.131
>  #define CONFIG_IPADDR		192.168.0.105
> -#define CONFIG_GATEWAYIP	0.0.0.0
> +#define CONFIG_GATEWAYIP	192.168.0.1
>  #define CONFIG_NETMASK		255.255.255.0
> +#endif
> +
>   
That's a good way of doing it.  I know people generally don't like #if 
0, but you're conveying useful information.
>  #define CONFIG_HOSTNAME		SBC8560
>  #define CONFIG_ROOTPATH		/home/ppc
>  #define CONFIG_BOOTFILE		pImage
>   
regards,
Ben

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Wolfgang Denk]

In message <8dee444198e3c87ef471198cbd2e25c4e1b558fb.1215803423.git.paul.gortmaker@windriver.com> you wrote:
>
> +/* You can compile in a MAC address and your custom net settings by using
> + * the * following syntax.  Your board should be marked with the assigned
----------^

Bogus '*' here?

> + * MAC addresses directly on it.
> + */
> +#if 0
> +#define CONFIG_ETHADDR		00:01:af:07:9b:8a
> +#define CONFIG_ETH1ADDR		00:01:af:07:9b:8b
>  #define CONFIG_SERVERIP		192.168.0.131
>  #define CONFIG_IPADDR		192.168.0.105
> -#define CONFIG_GATEWAYIP	0.0.0.0
> +#define CONFIG_GATEWAYIP	192.168.0.1
>  #define CONFIG_NETMASK		255.255.255.0
> +#endif
> +

I think this should be removed. There is really no good reason to add
network configuration at all to  the  board  config  file  (with  the
exception of the 2 or 3 boards which actually boot from real ROM).



Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If in any problem you find yourself doing an immense amount of  work,
the answer can be obtained by simple inspection.

[U-Boot-Users] [PATCH 5/7] sbc8560: add default fdt values

[Wolfgang Denk]

In message <2390b6bccc0e647f1fd12e2512fb6095a0355ec5.1215803423.git.paul.gortmaker@windriver.com> you wrote:
>
> @@ -424,6 +424,34 @@
>  
>  #define CONFIG_HOSTNAME		SBC8560
>  #define CONFIG_ROOTPATH		/home/ppc
> -#define CONFIG_BOOTFILE		pImage
> +#define CONFIG_BOOTFILE		uImage
> +
> +#define	CONFIG_EXTRA_ENV_SETTINGS		\
> + "netdev=eth0\0"				\
> + "consoledev=ttyS0\0"				\
> + "ramdiskaddr=2000000\0"			\
> + "ramdiskfile=ramdisk.uboot\0"			\
> + "fdtaddr=c00000\0"				\
> + "fdtfile=sbc8560.dtb\0"
> +
> +#define CONFIG_NFSBOOTCOMMAND						\
> +   "setenv bootargs root=/dev/nfs rw "					\
> +      "nfsroot=$serverip:$rootpath "					\
> +      "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
> +      "console=$consoledev,$baudrate $othbootargs;"			\
> +   "tftp $loadaddr $bootfile;"						\
> +   "tftp $fdtaddr $fdtfile;"						\
> +   "bootm $loadaddr - $fdtaddr"
> +
> +
> +#define CONFIG_RAMBOOTCOMMAND \
> +   "setenv bootargs root=/dev/ram rw "					\
> +      "console=$consoledev,$baudrate $othbootargs;"			\
> +   "tftp $ramdiskaddr $ramdiskfile;"					\
> +   "tftp $loadaddr $bootfile;"						\
> +   "tftp $fdtaddr $fdtfile;"						\
> +   "bootm $loadaddr $ramdiskaddr $fdtaddr"
> +
> +#define CONFIG_BOOTCOMMAND	CONFIG_NFSBOOTCOMMAND

Indentation by TAB, please.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You have the capacity to learn from  mistakes.  You'll  learn  a  lot
today.

[U-Boot-Users] [PATCH 5/7] sbc8560: add default fdt values

[Paul Gortmaker]

Wolfgang Denk wrote:
>> +#define CONFIG_RAMBOOTCOMMAND \
>> +   "setenv bootargs root=/dev/ram rw "					\
>> +      "console=$consoledev,$baudrate $othbootargs;"			\
>> +   "tftp $ramdiskaddr $ramdiskfile;"					\
>> +   "tftp $loadaddr $bootfile;"						\
>> +   "tftp $fdtaddr $fdtfile;"						\
>> +   "bootm $loadaddr $ramdiskaddr $fdtaddr"
>> +
>> +#define CONFIG_BOOTCOMMAND	CONFIG_NFSBOOTCOMMAND
>>     
>
> Indentation by TAB, please.
>   

Ah, sorry -- I inherited that verbatim from MPC8560ADS.h -- I'll
respin and send an independent fix for MPC8560ADS as well.

P.

> Best regards,
>
> Wolfgang Denk
>
>   

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Paul Gortmaker]

Wolfgang Denk wrote:
>
>   
>> + * MAC addresses directly on it.
>> + */
>> +#if 0
>> +#define CONFIG_ETHADDR		00:01:af:07:9b:8a
>> +#define CONFIG_ETH1ADDR		00:01:af:07:9b:8b
>>  #define CONFIG_SERVERIP		192.168.0.131
>>  #define CONFIG_IPADDR		192.168.0.105
>> -#define CONFIG_GATEWAYIP	0.0.0.0
>> +#define CONFIG_GATEWAYIP	192.168.0.1
>>  #define CONFIG_NETMASK		255.255.255.0
>> +#endif
>> +
>>     
>
> I think this should be removed. There is really no good reason to add
> network configuration at all to  the  board  config  file  (with  the
> exception of the 2 or 3 boards which actually boot from real ROM).
>   

No problem.  I'll remove and resend.

Thanks,
Paul.

>
>
> Best regards,
>
> Wolfgang Denk
>
>   

[U-Boot-Users] [PATCH 1/7] sbc8560: proper definitions for TSEC.

[Andy Fleming]

On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> The definitions for the TSEC have become out of date.  There is no
> longer any such options like "CONFIG_MPC85xx_TSEC1" or similar.
> Update to match those of other boards, like the MPC8560ADS.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> Acked-by: Ben Warren <biggerbadderben@gmail.com>

Applied, thanks!

Andy

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Andy Fleming]

On Fri, Jul 11, 2008 at 5:03 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> Wolfgang Denk wrote:
>>
>>
>>> + * MAC addresses directly on it.
>>> + */
>>> +#if 0
>>> +#define CONFIG_ETHADDR              00:01:af:07:9b:8a
>>> +#define CONFIG_ETH1ADDR             00:01:af:07:9b:8b
>>>  #define CONFIG_SERVERIP             192.168.0.131
>>>  #define CONFIG_IPADDR               192.168.0.105
>>> -#define CONFIG_GATEWAYIP    0.0.0.0
>>> +#define CONFIG_GATEWAYIP    192.168.0.1
>>>  #define CONFIG_NETMASK              255.255.255.0
>>> +#endif
>>> +
>>>
>>
>> I think this should be removed. There is really no good reason to add
>> network configuration at all to  the  board  config  file  (with  the
>> exception of the 2 or 3 boards which actually boot from real ROM).
>>
>
> No problem.  I'll remove and resend.

As a compromise between removal and keeping the useful information for
developers who are doing early bringup on similar boards, I have
applied this patch, and replaced the above with:

/* You can compile in a MAC address and your custom net settings by using
 * the following syntax.  Your board should be marked with the assigned
 * MAC addresses directly on it.
 *
 * #define CONFIG_ETHADDR		de:ad:be:ef:00:00
 * #define CONFIG_ETH1ADDR		fa:ke:ad:dr:es:s!
 * #define CONFIG_SERVERIP		<server ip>
 * #define CONFIG_IPADDR		<board ip>
 * #define CONFIG_GATEWAYIP		<gateway ip>
 * #define CONFIG_NETMASK		<your netmask>
 */

Wolfgang, if you still object, I can totally remove it before you pull
(git rebase --interactive is a wonderful thing).

I also corrected some whitespace issues where comments trailed off the
end of the line for no good reason.

Thanks,
Andy

[U-Boot-Users] [PATCH 5/7] sbc8560: add default fdt values

[Andy Fleming]

On Fri, Jul 11, 2008 at 5:02 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> Wolfgang Denk wrote:
>>> +#define CONFIG_RAMBOOTCOMMAND \
>>> +   "setenv bootargs root=/dev/ram rw "                                      \
>>> +      "console=$consoledev,$baudrate $othbootargs;"                 \
>>> +   "tftp $ramdiskaddr $ramdiskfile;"                                        \
>>> +   "tftp $loadaddr $bootfile;"                                              \
>>> +   "tftp $fdtaddr $fdtfile;"                                                \
>>> +   "bootm $loadaddr $ramdiskaddr $fdtaddr"
>>> +
>>> +#define CONFIG_BOOTCOMMAND  CONFIG_NFSBOOTCOMMAND
>>>
>>
>> Indentation by TAB, please.
>>
>
> Ah, sorry -- I inherited that verbatim from MPC8560ADS.h -- I'll
> respin and send an independent fix for MPC8560ADS as well.


I made the changes for you, and added the change for the 8560 as a
separate patch.

Andy

[U-Boot-Users] [PATCH 2/7] sbc8560: properly set cs0_bnds for 512MB

[Andy Fleming]

On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> The sbc8560 board ships with 512MB of memory installed,
> but the current cs0_bnds is hard coded for 256MB.  Set the
> value based on CFG_SDRAM_SIZE.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Applied, thanks
Andy

[U-Boot-Users] [PATCH 4/7] sbc8560: add in ft_board_setup()

[Andy Fleming]

On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> Add in for the sbc8560, the ft_board_setup() routine, based on what is
> in use for the Freescale MPC8560ADS board.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Applied, thanks

Andy

[U-Boot-Users] [PATCH 6/7] sbc8560: enable CONFIG_OF_LIBFDT by default

[Andy Fleming]

On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> Make the default build for the sbc8560 board be powerpc
> capable with libfdt support.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Applied, thanks

Andy

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Wolfgang Denk]

In message <2acbd3e40807141751i39bd23a4v304dd03a65905a93@mail.gmail.com> you wrote:
>
> As a compromise between removal and keeping the useful information for
> developers who are doing early bringup on similar boards, I have
> applied this patch, and replaced the above with:
> 
> /* You can compile in a MAC address and your custom net settings by using
>  * the following syntax.  Your board should be marked with the assigned
>  * MAC addresses directly on it.
>  *
>  * #define CONFIG_ETHADDR		de:ad:be:ef:00:00
>  * #define CONFIG_ETH1ADDR		fa:ke:ad:dr:es:s!
>  * #define CONFIG_SERVERIP		<server ip>
>  * #define CONFIG_IPADDR		<board ip>
>  * #define CONFIG_GATEWAYIP		<gateway ip>
>  * #define CONFIG_NETMASK		<your netmask>
>  */
> 
> Wolfgang, if you still object, I can totally remove it before you pull

That's OK with me.

> (git rebase --interactive is a wonderful thing).

Indeed, isn't it? I still remember times when we had to use CVS - or
even ClearCase...

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When it is incorrect, it is, at least *authoritatively* incorrect.
                                    - Hitchiker's Guide To The Galaxy

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Ben Warren]

On Mon, Jul 14, 2008 at 11:25 PM, Wolfgang Denk <wd@denx.de> wrote:
> In message <2acbd3e40807141751i39bd23a4v304dd03a65905a93@mail.gmail.com> you wrote:
>>
>> As a compromise between removal and keeping the useful information for
>> developers who are doing early bringup on similar boards, I have
>> applied this patch, and replaced the above with:
>>
>> /* You can compile in a MAC address and your custom net settings by using
>>  * the following syntax.  Your board should be marked with the assigned
>>  * MAC addresses directly on it.
>>  *
>>  * #define CONFIG_ETHADDR             de:ad:be:ef:00:00
>>  * #define CONFIG_ETH1ADDR            fa:ke:ad:dr:es:s!
>>  * #define CONFIG_SERVERIP            <server ip>
>>  * #define CONFIG_IPADDR              <board ip>
>>  * #define CONFIG_GATEWAYIP           <gateway ip>
>>  * #define CONFIG_NETMASK             <your netmask>
>>  */
>>
>> Wolfgang, if you still object, I can totally remove it before you pull
>
> That's OK with me.
>
>> (git rebase --interactive is a wonderful thing).
>
> Indeed, isn't it? I still remember times when we had to use CVS - or
> even ClearCase...
>
Why did you have to bring up ClearCase?  Today was just starting to
show some promise :-)

[U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2

[Paul Gortmaker]

Andy Fleming wrote:
> On Fri, Jul 11, 2008 at 5:03 PM, Paul Gortmaker
> <paul.gortmaker@windriver.com> wrote:
>   
>> Wolfgang Denk wrote:
>>     
>>>       
>>>> + * MAC addresses directly on it.
>>>> + */
>>>> +#if 0
>>>> +#define CONFIG_ETHADDR              00:01:af:07:9b:8a
>>>> +#define CONFIG_ETH1ADDR             00:01:af:07:9b:8b
>>>>  #define CONFIG_SERVERIP             192.168.0.131
>>>>  #define CONFIG_IPADDR               192.168.0.105
>>>> -#define CONFIG_GATEWAYIP    0.0.0.0
>>>> +#define CONFIG_GATEWAYIP    192.168.0.1
>>>>  #define CONFIG_NETMASK              255.255.255.0
>>>> +#endif
>>>> +
>>>>
>>>>         
>>> I think this should be removed. There is really no good reason to add
>>> network configuration at all to  the  board  config  file  (with  the
>>> exception of the 2 or 3 boards which actually boot from real ROM).
>>>
>>>       
>> No problem.  I'll remove and resend.
>>     
>
> As a compromise between removal and keeping the useful information for
> developers who are doing early bringup on similar boards, I have
> applied this patch, and replaced the above with:
>
> /* You can compile in a MAC address and your custom net settings by using
>  * the following syntax.  Your board should be marked with the assigned
>  * MAC addresses directly on it.
>  *
>  * #define CONFIG_ETHADDR		de:ad:be:ef:00:00
>  * #define CONFIG_ETH1ADDR		fa:ke:ad:dr:es:s!
>   

That seems like a reasonable compromise to me.  Thanks for doing
this and merging the rest of the patches.

Paul.

>  * #define CONFIG_SERVERIP		<server ip>
>  * #define CONFIG_IPADDR		<board ip>
>  * #define CONFIG_GATEWAYIP		<gateway ip>
>  * #define CONFIG_NETMASK		<your netmask>
>  */
>
> Wolfgang, if you still object, I can totally remove it before you pull
> (git rebase --interactive is a wonderful thing).
>
> I also corrected some whitespace issues where comments trailed off the
> end of the line for no good reason.
>
> Thanks,
> Andy
>