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;

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

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 */

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

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