[U-Boot-Users] [GIT PULL] AVR32 fixes

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

Hi Wolfgang,

The following changes since commit 527c80f012030fa0b51f8594847ec56c9317e9b1:
  Stefan Roese (1):
        Merge with git://www.denx.de/git/u-boot.git

are available in the git repository at:

  git://www.denx.de/git/u-boot-avr32.git master

Eirik Aanonsen (2):
      Add some comments to clocks in atstk1002.h
      Update atstk1002 bootargs.

Haavard Skinnemoen (3):
      Merge commit 'origin/master'
      Fix memtest breakage
      AVR32: Initialize bi_flash* in board_init_r

Hans-Christian Egtvedt (2):
      Remove double quotation marks around MAC address for STK1002
      Reduce BOOTDELAY variable to 1 second by default for STK1002

Semih Hazar (1):
      AVR32: Change prototype of memset

 board/atmel/atstk1000/flash.c |    4 ----
 include/asm-avr32/string.h    |    2 +-
 include/configs/atstk1002.h   |   38 ++++++++++++++++++++++++++------------
 lib_avr32/board.c             |   12 +++++++++++-
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
index 958f4dc..93d790f 100644
--- a/board/atmel/atstk1000/flash.c
+++ b/board/atmel/atstk1000/flash.c
@@ -55,10 +55,6 @@ unsigned long flash_init(void)
 	unsigned long addr;
 	unsigned int i;
 
-	gd->bd->bi_flashstart = CFG_FLASH_BASE;
-	gd->bd->bi_flashsize = CFG_FLASH_SIZE;
-	gd->bd->bi_flashoffset = _edata - _text;
-
 	flash_info[0].size = CFG_FLASH_SIZE;
 	flash_info[0].sector_count = 135;
 
diff --git a/include/asm-avr32/string.h b/include/asm-avr32/string.h
index 8b05d1a..58582a3 100644
--- a/include/asm-avr32/string.h
+++ b/include/asm-avr32/string.h
@@ -23,6 +23,6 @@
 #define __ASM_AVR32_STRING_H
 
 #define __HAVE_ARCH_MEMSET
-extern void *memset(void *s, int c, size_t n);
+extern void *memset(void *s, int c, __kernel_size_t n);
 
 #endif /* __ASM_AVR32_STRING_H */
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 75b153e..1809fc5 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -39,8 +39,10 @@
 #define CFG_HZ				1000
 
 /*
- * Set up the PLL to run at 199.5 MHz, the CPU to run at 1/2 the PLL
- * frequency and the peripherals to run at 1/4 the PLL frequency.
+ * Set up the PLL to run at 140 MHz, the CPU to run at the PLL
+ * frequency, the HSB and PBB at 1/2, and the PBA to run at 1/4 the
+ * PLL frequency.
+ * (CFG_OSC0_HZ * CFG_PLL0_MUL) / CFG_PLL0_DIV = PLL MHz
  */
 #define CONFIG_PLL			1
 #define CFG_POWER_MANAGER		1
@@ -48,9 +50,25 @@
 #define CFG_PLL0_DIV			1
 #define CFG_PLL0_MUL			7
 #define CFG_PLL0_SUPPRESS_CYCLES	16
+/*
+ * Set the CPU running at:
+ * PLL / (2^CFG_CLKDIV_CPU) = CPU MHz
+ */
 #define CFG_CLKDIV_CPU			0
+/*
+ * Set the HSB running at:
+ * PLL / (2^CFG_CLKDIV_HSB) = HSB MHz
+ */
 #define CFG_CLKDIV_HSB			1
+/*
+ * Set the PBA running at:
+ * PLL / (2^CFG_CLKDIV_PBA) = PBA MHz
+ */
 #define CFG_CLKDIV_PBA			2
+/*
+ * Set the PBB running at:
+ * PLL / (2^CFG_CLKDIV_PBB) = PBB MHz
+ */
 #define CFG_CLKDIV_PBB			1
 
 /*
@@ -78,7 +96,7 @@
 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_BOOTARGS							\
-	"console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2 fbmem=600k"
+	"console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k rootwait=1"
 
 #define CONFIG_BOOTCOMMAND						\
 	"fsload; bootm $(fileaddr)"
@@ -87,7 +105,7 @@
  * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
  * data on the serial line may interrupt the boot sequence.
  */
-#define CONFIG_BOOTDELAY		2
+#define CONFIG_BOOTDELAY		1
 #define CONFIG_AUTOBOOT			1
 #define CONFIG_AUTOBOOT_KEYED		1
 #define CONFIG_AUTOBOOT_PROMPT				\
@@ -103,8 +121,8 @@
  * generated and assigned to the environment variables "ethaddr" and
  * "eth1addr".
  */
-#define CONFIG_ETHADDR			"6a:87:71:14:cd:cb"
-#define CONFIG_ETH1ADDR			"ca:f8:15:e6:3e:e6"
+#define CONFIG_ETHADDR			6a:87:71:14:cd:cb
+#define CONFIG_ETH1ADDR			ca:f8:15:e6:3e:e6
 #define CONFIG_OVERWRITE_ETHADDR_ONCE	1
 #define CONFIG_NET_MULTI		1
 
@@ -182,12 +200,8 @@
 #define CFG_PBSIZE			(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
 #define CFG_LONGHELP			1
 
-#define CFG_MEMTEST_START						\
-	({ gd->bd->bi_dram[0].start; })
-#define CFG_MEMTEST_END							\
-	({								\
-		gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;	\
-	})
+#define CFG_MEMTEST_START		CFG_SDRAM_BASE
+#define CFG_MEMTEST_END			(CFG_MEMTEST_START + 0x700000)
 #define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
 
 #endif /* __CONFIG_H */
diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index 8b9ca38..11d864f 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -310,10 +310,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 	malloc_bin_reloc();
 	dma_alloc_init();
 	board_init_info();
-	flash_init();
+
+	bd->bi_flashstart = 0;
+	bd->bi_flashsize = 0;
+	bd->bi_flashoffset = 0;
+
+#ifndef CFG_NO_FLASH
+	bd->bi_flashstart = CFG_FLASH_BASE;
+	bd->bi_flashsize = flash_init();
+	bd->bi_flashoffset = (unsigned long)_edata - (unsigned long)_text;
 
 	if (bd->bi_flashsize)
 		display_flash_config();
+#endif
+
 	if (bd->bi_dram[0].size)
 		display_dram_config();
 

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Wolfgang Denk]

In message <20071007140612.5b1734ab@siona> you wrote:
> Hi Wolfgang,
> 
> The following changes since commit 527c80f012030fa0b51f8594847ec56c9317e9b1:
>   Stefan Roese (1):
>         Merge with git://www.denx.de/git/u-boot.git
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-avr32.git master
> 
> Eirik Aanonsen (2):
>       Add some comments to clocks in atstk1002.h
>       Update atstk1002 bootargs.
> 
> Haavard Skinnemoen (3):
>       Merge commit 'origin/master'
>       Fix memtest breakage
>       AVR32: Initialize bi_flash* in board_init_r
> 
> Hans-Christian Egtvedt (2):
>       Remove double quotation marks around MAC address for STK1002
>       Reduce BOOTDELAY variable to 1 second by default for STK1002
> 
> Semih Hazar (1):
>       AVR32: Change prototype of memset

Umm... have these patches really gone over the mailing list? I can't
find such subjects in the archive?


Merged...

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
Well, the way I see it, logic is only a way of being ignorant by num-
bers.                                 - Terry Pratchett, _Small Gods_

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

On Sat, 13 Oct 2007 23:11:14 +0200
Wolfgang Denk <wd@denx.de> wrote:

> Umm... have these patches really gone over the mailing list? I can't
> find such subjects in the archive?

No, most of them probably haven't. Some of them came through the
u-boot at avr32linux.org mailing list, while others are just trivial fixes
that I didn't bother posting anywhere. They're all rather trivial,
actually; otherwise I would have held them until the next merge window.

I can start forwarding such patches to the main u-boot list if you want.

> Merged...

Thanks.

H?vard

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Wolfgang Denk]

In message <20071014011642.6b656ec5@siona> you wrote:
> 
> No, most of them probably haven't. Some of them came through the
> u-boot at avr32linux.org mailing list, while others are just trivial fixes
> that I didn't bother posting anywhere. They're all rather trivial,
> actually; otherwise I would have held them until the next merge window.
> 
> I can start forwarding such patches to the main u-boot list if you want.

Please do. Ideally, *all* patches should be reviewed here on the list
*before* a custodian picks them up for his repo.

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
"Plan to throw one away.  You will anyway."
                              - Fred Brooks, "The Mythical Man Month"

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

On Sun, 14 Oct 2007 01:38:44 +0200
Wolfgang Denk <wd@denx.de> wrote:

> > I can start forwarding such patches to the main u-boot list if you
> > want.  
> 
> Please do. Ideally, *all* patches should be reviewed here on the list
> *before* a custodian picks them up for his repo.

Ok, since it's obviously best if the patches are sent to this list in
the first place, I've added a note to

http://avr32linux.org/twiki/bin/view/Main/MailingLists

I'll try to catch the ones that aren't and pass them on before merging.

H?vard

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Grant Likely]

On 10/14/07, Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> On Sun, 14 Oct 2007 01:38:44 +0200
> Wolfgang Denk <wd@denx.de> wrote:
>
> > > I can start forwarding such patches to the main u-boot list if you
> > > want.
> >
> > Please do. Ideally, *all* patches should be reviewed here on the list
> > *before* a custodian picks them up for his repo.
>
> Ok, since it's obviously best if the patches are sent to this list in
> the first place, I've added a note to
>
> http://avr32linux.org/twiki/bin/view/Main/MailingLists
>
> I'll try to catch the ones that aren't and pass them on before merging.

Can you drop the AVR32 u-boot mailing list entirely and direct posters
here?  It's not like the u-boot list is high volume and it would be
better to discuss even arch specific changes in the common forum.

Cheers,
g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

On Sun, 14 Oct 2007 16:22:40 -0600
"Grant Likely" <grant.likely@secretlab.ca> wrote:

> On 10/14/07, Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> > Ok, since it's obviously best if the patches are sent to this list
> > in the first place, I've added a note to
> >
> > http://avr32linux.org/twiki/bin/view/Main/MailingLists
> >
> > I'll try to catch the ones that aren't and pass them on before
> > merging.
> 
> Can you drop the AVR32 u-boot mailing list entirely and direct posters
> here?  It's not like the u-boot list is high volume and it would be
> better to discuss even arch specific changes in the common forum.

Yeah, that's a good point. When we created the kernel list at
avr32linux.org we sort of figured it might be a good idea to create one
for u-boot as well. Perhaps that was a bad move.

However, I'm a bit afraid of losing some of the potential testers that
are subscribed to that list. Contributors should probably subscribe to
u-boot-users to get a better feeling of the whole picture, but I
suspect that some people aren't all that interested in everything that
happens on the main mailing list, while they might very well be
interested in testing specific bugfixes or improvements targeted
towards avr32 boards.

I think the avr32linux.org list is also a good place to announce
releases and pre-releases of our "vendor" loaders. Those are probably
only interesting to people using avr32.

So I think I want to keep the list for now, as a very-low-volume
avr32-specific thing. The volume on u-boot-users seems to be picking
up; that's a good thing, but it may also drive some users away.

H?vard 

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Ulf Samuelsson]

----- Original Message ----- 
From: "Haavard Skinnemoen" <hskinnemoen@atmel.com>
To: "Grant Likely" <grant.likely@secretlab.ca>
Cc: "U-Boot Users" <u-boot-users@lists.sourceforge.net>; 
<u-boot@avr32linux.org>; "Wolfgang Denk" <wd@denx.de>
Sent: Monday, October 15, 2007 11:18 AM
Subject: Re: [U-Boot-Users] [GIT PULL] AVR32 fixes


> On Sun, 14 Oct 2007 16:22:40 -0600
> "Grant Likely" <grant.likely@secretlab.ca> wrote:
>
>> On 10/14/07, Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
>> > Ok, since it's obviously best if the patches are sent to this list
>> > in the first place, I've added a note to
>> >
>> > http://avr32linux.org/twiki/bin/view/Main/MailingLists
>> >
>> > I'll try to catch the ones that aren't and pass them on before
>> > merging.
>>
>> Can you drop the AVR32 u-boot mailing list entirely and direct posters
>> here?  It's not like the u-boot list is high volume and it would be
>> better to discuss even arch specific changes in the common forum.
>
> Yeah, that's a good point. When we created the kernel list at
> avr32linux.org we sort of figured it might be a good idea to create one
> for u-boot as well. Perhaps that was a bad move.
>
> However, I'm a bit afraid of losing some of the potential testers that
> are subscribed to that list. Contributors should probably subscribe to
> u-boot-users to get a better feeling of the whole picture, but I
> suspect that some people aren't all that interested in everything that
> happens on the main mailing list, while they might very well be
> interested in testing specific bugfixes or improvements targeted
> towards avr32 boards.
>
> I think the avr32linux.org list is also a good place to announce
> releases and pre-releases of our "vendor" loaders. Those are probably
> only interesting to people using avr32.
>
> So I think I want to keep the list for now, as a very-low-volume
> avr32-specific thing. The volume on u-boot-users seems to be picking
> up; that's a good thing, but it may also drive some users away.
>

You can forward everything on the AVR32 list to the normal u-boot list 
easily,
adding [AVR32] to the header.
You could also filter the u-boot list, and anything on this list with 
[AVR32]
in the header gets forwarded to the AVR32 list (without bouncing back of 
course)


> H?vard
>


Best Regards
Ulf Samuelsson                ulf at atmel.com
Atmel Nordic AB
Mail:  Box 2033, 174 02 Sundbyberg, Sweden
Visit:  Kavalleriv?gen 24, 174 58 Sundbyberg, Sweden
Phone +46 (8) 441 54 22     Fax +46 (8) 441 54 29
GSM    +46 (706) 22 44 57

Technical support when I am not available:
AT89 C51 Applications Group: mailto:micro.hotline at nto.atmel.com
AT90 AVR Applications Group: mailto:avr at atmel.com
AT91 ARM Applications Group: mailto:at91support at atmel.com
FPSLIC Application Group: mailto:fpslic at atmel.com Best AVR
link: www.avrfreaks.net 

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

On Mon, 15 Oct 2007 15:40:29 +0200
"Ulf Samuelsson" <ulf@atmel.com> wrote:

> > So I think I want to keep the list for now, as a very-low-volume
> > avr32-specific thing. The volume on u-boot-users seems to be picking
> > up; that's a good thing, but it may also drive some users away.
> >  
> 
> You can forward everything on the AVR32 list to the normal u-boot
> list easily, adding [AVR32] to the header.
> You could also filter the u-boot list, and anything on this list with 
> [AVR32] in the header gets forwarded to the AVR32 list (without
> bouncing back of course)

Hmm...I'm not sure if I want to do any automatic forwarding between the
two lists. By "forwarding patches", I really mean something along the
lines of

  * Apply the patch to my working tree and add my signoff
  * Test that it compiles
  * Extract it with git-format-patch and send it to u-boot-users for
    further review.

which takes about two minutes to do, assuming the patch applies
cleanly. This should work the other way around as well.

H?vard

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

Hi Wolfgang,

Please pull from

  git://www.denx.de/git/u-boot-avr32.git master

to receive the following fixes. The "avr32-fixes" branch used for
testing is now gone, and will be re-created as needed. Please use
"master" instead.

Btw, one of the nice things about the new workflow is that after
rebasing "avr32-fixes" onto "upstream/master", it could be fast-forward
merged into the master branch. That was a bit unexpected, but it means
that not only is the history of "master" very clean, it is also
completely linear (i.e. people pulling from it regularly won't get any
nasty surprises.)

Oh, and I know that this won't actually build at the moment. Just like
all the other non-ppc architectures, avr32 needs one of the SPI build
fixes posted recently.

Haavard Skinnemoen (5):
      ATNGW100: Fix default mtest range
      ATSTK1002: Use SDRAM + 4MB as default load address
      ATSTK1004: Fix comment about default load address
      ATSTK1000: Fix potential flash programming bug
      AVR32: Make SDRAM refresh rate configurable

 board/atmel/atngw100/atngw100.c         |    3 +++
 board/atmel/atstk1000/atstk1000.c       |    3 +++
 board/atmel/atstk1000/flash.c           |   31 ++++++++++++++++++++++---------
 cpu/at32ap/hsdramc.c                    |    6 +++++-
 include/asm-avr32/arch-at32ap700x/clk.h |    3 +++
 include/asm-avr32/sdram.h               |    3 +++
 include/configs/atngw100.h              |   10 +++-------
 include/configs/atstk1002.h             |    4 ++--
 include/configs/atstk1004.h             |    2 +-
 9 files changed, 45 insertions(+), 20 deletions(-)

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Wolfgang Denk]

In message <20080205123047.74b22589@dhcp-252-066.norway.atmel.com> you wrote:
> 
> Please pull from
> 
>   git://www.denx.de/git/u-boot-avr32.git master

Done, thanks.

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
panic: kernel trap (ignored)

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Haavard Skinnemoen]

Hi Wolfgang,

The following changes since commit 9986bc3e40e899bea372a99a2bca4071bdf2e24b:
  Wolfgang Denk (1):
        Update CHANGELOG

are available in the git repository at:

  git://www.denx.de/git/u-boot-avr32.git master

This includes one important build fix that was left out of the "make
do_div generic" merge for some reason and a couple of changes fixing
real problems that might break stuff from time to time or are merely a
bit annoying.

Haavard Skinnemoen (7):
      macb: Introduce a few barriers when dealing with DMA descriptors
      macb: Don't restart autonegotiation if we already have link
      Merge branch 'upstream'
      atmel_mci: Use 512 byte blocksize if possible
      Merge commit 'upstream/master'
      AVR32: Include <div64.h> instead of <asm/div64.h>
      atmel_mci: Fix data timeout value

 cpu/at32ap/atmel_mci.c  |   80 ++++++++++++++++++++++++++++++++++++++++++++--
 cpu/at32ap/atmel_mci.h  |    4 ++
 cpu/at32ap/interrupts.c |    2 +-
 drivers/macb.c          |   59 ++++++++++++++++++++--------------
 4 files changed, 116 insertions(+), 29 deletions(-)

[U-Boot-Users] [GIT PULL] AVR32 fixes

[Wolfgang Denk]

In message <20070813174203.095ca00e@dhcp-255-175.norway.atmel.com> you wrote:
> 
> The following changes since commit 9986bc3e40e899bea372a99a2bca4071bdf2e24b:
>   Wolfgang Denk (1):
>         Update CHANGELOG
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-avr32.git master

Merged. Thanks.

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
Make it right before you make it faster.