[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[Wolfgang Denk]

From: Sergei Poselenov <sposelenov@emcraft.com>

Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 board/syscon3/syscon3.c   |   25 +++++++++++++++++++
 include/configs/syscon3.h |   58 +++++++++++++++++++-------------------------
 2 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/board/syscon3/syscon3.c b/board/syscon3/syscon3.c
index ea33f82..b814bae 100644
--- a/board/syscon3/syscon3.c
+++ b/board/syscon3/syscon3.c
@@ -33,6 +33,8 @@
 #include <asm/immap_85xx.h>
 #include <ioports.h>
 #include <flash.h>
+#include <libfdt.h>
+#include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -184,3 +186,26 @@ int board_early_init_r (void)
 	return (0);
 }
 #endif /* CONFIG_BOARD_EARLY_INIT_R */
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+void
+ft_board_setup(void *blob, bd_t *bd)
+{
+	u32 val[4];
+	int rc;
+
+	ft_cpu_setup(blob, bd);
+
+	/* Fixup NOR mapping */
+	val[0] = 0;				/* chip select number */
+	val[1] = 0;				/* always 0 */
+	val[2] = gd->bd->bi_flashstart;
+	val[3] = gd->bd->bi_flashsize;
+
+	rc = fdt_find_and_setprop(blob, "/localbus", "ranges",
+				  val, sizeof(val), 1);
+	if (rc)
+		printf("Unable to update property NOR mapping, err=%s\n",
+		       fdt_strerror(rc));
+}
+#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
diff --git a/include/configs/syscon3.h b/include/configs/syscon3.h
index 56dc363..d451a61 100644
--- a/include/configs/syscon3.h
+++ b/include/configs/syscon3.h
@@ -114,11 +114,9 @@
 #define CFG_DDR_CLK_CONTROL		0x03800000
 #define CFG_SDRAM_SIZE			256 /* in Megs */
 
-#if 1
 #define CONFIG_SPD_EEPROM	1 	/* Use SPD EEPROM for DDR setup*/
 #define SPD_EEPROM_ADDRESS	0x50		/* DDR DIMM */
 #define MPC85xx_DDR_SDRAM_CLK_CNTL	/* 85xx has clock control reg */
-#endif
 
 /*
  * Flash on the Local Bus
@@ -145,7 +143,7 @@
 #define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector	*/
 
 #define CFG_MAX_FLASH_BANKS	2		/* number of banks	*/
-#define CFG_MAX_FLASH_SECT	512		/* sectors per device	*/
+#define CFG_MAX_FLASH_SECT	256		/* sectors per device	*/
 #undef	CFG_FLASH_CHECKSUM
 #define CFG_FLASH_ERASE_TOUT	60000	/* Flash Erase Timeout (ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Flash Write Timeout (ms)	*/
@@ -205,28 +203,8 @@
 #define CFG_I2C_OFFSET		0x3000
 
 /* I2C RTC */
-#define CONFIG_RTC_DS1337		/* Use ds1337 rtc via i2c	*/
-#define CFG_I2C_RTC_ADDR	0x68	/* at address 0x68		*/
-
-#if 0
-/* I2C EEPROM */
-/*
- * EEPROM configuration for onboard EEPROM M24C32 (M24C64 should work also).
- */
-#define CFG_I2C_EEPROM_ADDR		0x50	/* 1010000x		*/
-#define CFG_I2C_EEPROM_ADDR_LEN		2
-#define CFG_EEPROM_PAGE_WRITE_BITS	5	/* =32 Bytes per write	*/
-#define CFG_EEPROM_PAGE_WRITE_ENABLE
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	20
-#define CFG_I2C_MULTI_EEPROMS		1       /* more than one eeprom */
-
-/* I2C SYSMON (LM75) */
-#define CONFIG_DTT_LM75		1		/* ON Semi's LM75	*/
-#define CONFIG_DTT_SENSORS	{0}		/* Sensor addresses	*/
-#define CFG_DTT_MAX_TEMP	70
-#define CFG_DTT_LOW_TEMP	-30
-#define CFG_DTT_HYSTERESIS	3
-#endif
+#define CONFIG_RTC_RX8025		/* Use Epson rx8025 rtc via i2c	*/
+#define CFG_I2C_RTC_ADDR	0x32	/* at address 0x32		*/
 
 /* RapidIO MMU */
 #define CFG_RIO_MEM_BASE	0xc0000000	/* base address		*/
@@ -280,6 +258,9 @@
 #define CONFIG_ETHPRIME		"TSEC0"
 #define CONFIG_PHY_GIGE		1	/* Include GbE speed/duplex detection */
 
+#define CONFIG_HAS_ETH0
+#define CONFIG_HAS_ETH1
+
 /*
  * Environment
  */
@@ -379,7 +360,7 @@
 #undef	CONFIG_BOOTARGS		/* the boot command will set bootargs	*/
 
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"bootfile=/tftpboot/syscon3\0"				\
+	"bootfile=/tftpboot/syscon3/uImage\0"				\
 	"netdev=eth0\0"							\
 	"consdev=ttyS0\0"						\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
@@ -390,15 +371,22 @@
 		":$hostname:$netdev:off panic=1\0"			\
 	"addcons=setenv bootargs $bootargs "				\
 		"console=$consdev,$baudrate\0"				\
-	"flash_nfs=run nfsargs addip addcons;"				\
-		"bootm $kernel_addr\0"					\
 	"flash_self=run ramargs addip addcons;"				\
-		"bootm $kernel_addr $ramdisk_addr\0"			\
-	"net_nfs=tftp $loadaddr $bootfile;"				\
-		"run nfsargs addip addcons;bootm\0"			\
+		"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"	\
+	"flash_nfs=run nfsargs addip addcons;"				\
+		"bootm ${kernel_addr} - ${fdt_addr}\0"			\
+	"net_nfs=tftp ${kernel_addr_r} ${bootfile}; "			\
+		"tftp ${fdt_addr_r} ${fdt_file}; "			\
+		"run nfsargs addip addcons;"				\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
+	"fdt_file=syscon3/syscon3.dtb\0"					\
+	"fdt_addr_r=B00000\0"						\
+	"fdt_addr=FC1E0000\0"						\
 	"rootpath=/opt/eldk/ppc_85xx\0"					\
-	"kernel_addr=FE000000\0"					\
-	"ramdisk_addr=FE180000\0"					\
+	"kernel_addr=FC000000\0"					\
+	"kernel_addr_r=200000\0"					\
+	"ramdisk_addr=FC200000\0"					\
+	"ramdisk_addr_r=400000\0"					\
 	"load=tftp 100000 /tftpboot/$hostname/u-boot.bin\0"		\
 	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\
 		"cp.b 100000 fffc0000 40000;"			        \
@@ -407,4 +395,8 @@
 	""
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT	1
+#define CONFIG_OF_BOARD_SETUP	1
+
 #endif	/* __CONFIG_H */
-- 
1.5.4.2

[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[Stefan Roese]

On Friday 09 May 2008, Wolfgang Denk wrote:
> From: Sergei Poselenov <sposelenov@emcraft.com>
>
> Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  board/syscon3/syscon3.c   |   25 +++++++++++++++++++
>  include/configs/syscon3.h |   58
> +++++++++++++++++++------------------------- 2 files changed, 50
> insertions(+), 33 deletions(-)

I can't find this board support. And also no patches for it.

Please find some further comments below.

> diff --git a/board/syscon3/syscon3.c b/board/syscon3/syscon3.c
> index ea33f82..b814bae 100644
> --- a/board/syscon3/syscon3.c
> +++ b/board/syscon3/syscon3.c
> @@ -33,6 +33,8 @@
>  #include <asm/immap_85xx.h>
>  #include <ioports.h>
>  #include <flash.h>
> +#include <libfdt.h>
> +#include <fdt_support.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> @@ -184,3 +186,26 @@ int board_early_init_r (void)
>  	return (0);
>  }
>  #endif /* CONFIG_BOARD_EARLY_INIT_R */
> +
> +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> +void
> +ft_board_setup(void *blob, bd_t *bd)
> +{
> +	u32 val[4];
> +	int rc;
> +
> +	ft_cpu_setup(blob, bd);
> +
> +	/* Fixup NOR mapping */
> +	val[0] = 0;				/* chip select number */
> +	val[1] = 0;				/* always 0 */
> +	val[2] = gd->bd->bi_flashstart;
> +	val[3] = gd->bd->bi_flashsize;
> +
> +	rc = fdt_find_and_setprop(blob, "/localbus", "ranges",
> +				  val, sizeof(val), 1);
> +	if (rc)
> +		printf("Unable to update property NOR mapping, err=%s\n",
> +		       fdt_strerror(rc));
> +}
> +#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */

This is not needed anymore. With my latest patch (available in the 
u-boot-ppc4xx repository, master branch for pulling):

[PATCH 2/3] ppc4xx: Add weak default  ft_board_setup() routine

this board specific code is not needed in this case, since it is an exact copy 
of the weak default routine. Please remove it in the next version of this 
patch.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[Wolfgang Denk]

Deare Stefan,

in message <200805091438.56226.sr@denx.de> you wrote:
>
> >  board/syscon3/syscon3.c   |   25 +++++++++++++++++++
> >  include/configs/syscon3.h |   58
> > +++++++++++++++++++------------------------- 2 files changed, 50
> > insertions(+), 33 deletions(-)
> 
> I can't find this board support. And also no patches for it.

Hm... either Alzheimer or SF dropped my mails :-(

I just resent the patches. You can find the stuff also in the syscon3
branch of the u-boot-testing repo.

> > +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> > +void
> > +ft_board_setup(void *blob, bd_t *bd)
...
> This is not needed anymore. With my latest patch (available in the 
> u-boot-ppc4xx repository, master branch for pulling):
> 
> [PATCH 2/3] ppc4xx: Add weak default  ft_board_setup() routine

Oops... seems this is available for 4xx only, right?

But the syscon3 board has a MPC8548 processor...

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

[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[Stefan Roese]

Hi Wolfgang,

On Friday 09 May 2008, Wolfgang Denk wrote:
> > >  board/syscon3/syscon3.c   |   25 +++++++++++++++++++
> > >  include/configs/syscon3.h |   58
> > > +++++++++++++++++++------------------------- 2 files changed, 50
> > > insertions(+), 33 deletions(-)
> >
> > I can't find this board support. And also no patches for it.
>
> Hm... either Alzheimer

I know that I have problems remembering things (:)), but...

> or SF dropped my mails :-( 

this seems more likely for me. I couldn't find anything about "syscon3" 
searching the internet (google and mailing list archives). And I'm not 
totally sure, but I think some of the messages/patches I sent lately to the 
list were not received via the mailing-list account. I will watch more 
closely in the future.

> I just resent the patches. You can find the stuff also in the syscon3
> branch of the u-boot-testing repo.
>
> > > +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
> > > +void
> > > +ft_board_setup(void *blob, bd_t *bd)
>
> ...
>
> > This is not needed anymore. With my latest patch (available in the
> > u-boot-ppc4xx repository, master branch for pulling):
> >
> > [PATCH 2/3] ppc4xx: Add weak default  ft_board_setup() routine
>
> Oops... seems this is available for 4xx only, right?

Right.

> But the syscon3 board has a MPC8548 processor...

Ah, ok. Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot-Users] [PATCH] syscon3: changes to support FDT

[Wolfgang Denk]

In message <200805092121.23118.sr@denx.de> you wrote:
>
> > Hm... either Alzheimer
> 
> I know that I have problems remembering things (:)), but...

I meant: on my side (i. e. that I forgot to send them).

But it seems SF dropped some other mails, too.

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
How many Unix hacks does it take to change a light bulb?  Let's  see,
   can you use a shell script for that or does it need a C program?