sughosh ganu | 1 Nov 06:13 2010
Picon

Re: [RFC] arm926ejs: fix jump to RAM nand_boot

On Mon, Nov 1, 2010 at 4:34 AM, Albert ARIBAUD <albert.aribaud <at> free.fr>wrote:

> Le 31/10/2010 23:28, Alexander Holler a écrit :
> > On 31.10.2010 22:20, Albert Aribaud wrote:
> >
> >> Alexander, Darius, others who already tested the previous RFC patch,
> >> please test for non-regression.
> >
> > Still works here with that patch applied. But that isn't remarkable,
> because
> >
> >>    #ifdef CONFIG_NAND_SPL
> >
> > that isn't defined here. ;)
>
> ... and tx25 seems not to have it defined either, so my change should
> not have affected Wolfgang's tests. :/
>

 I think it is defined in nand_spl/board/karo/tx25/Makefile. We do get a
nand_spl/u-boot-spl when we compile for the tx25 board, which has a
reference to nand_boot.

-sughosh
_______________________________________________
U-Boot mailing list
U-Boot <at> lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
(Continue reading)

ratbert.chuang | 1 Nov 08:55 2010
Picon

[PATCH] arm: get_sp() should always be compiled

From: Po-Yu Chuang <ratbert <at> faraday-tech.com>

get_sp() was incorrectly excluded if none of
  CONFIG_SETUP_MEMORY_TAGS
  CONFIG_CMDLINE_TAG
  CONFIG_INITRD_TAG
  CONFIG_SERIAL_TAG
  CONFIG_REVISION_TAG
were defined.

Signed-off-by: Po-Yu Chuang <ratbert <at> faraday-tech.com>
---
 arch/arm/lib/bootm.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index a1649ee..7734953 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
 <at>  <at>  -327,12 +327,12  <at>  <at>  void setup_revision_tag(struct tag **in_params)
 }
 #endif  /* CONFIG_REVISION_TAG */

-
 static void setup_end_tag (bd_t *bd)
 {
 	params->hdr.tag = ATAG_NONE;
 	params->hdr.size = 0;
 }
+#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
(Continue reading)

ratbert.chuang | 1 Nov 09:06 2010
Picon

[PATCH 1/2] arm: a320 timer: move static data to global_data struct

From: Po-Yu Chuang <ratbert <at> faraday-tech.com>

timer.c used static data and are called before relocation.
Move all static variables into global_data structure. Also cleanup
timer.c from unused stubs and make it truly use 64 bit tick values.

Based on Reinhard Meyer <u-boot <at> emk-elektronik.de>'s patch
5dca710a3d7703e41da0e9894f2d71f9e25bea6b

Signed-off-by: Po-Yu Chuang <ratbert <at> faraday-tech.com>
---
 arch/arm/cpu/arm920t/a320/timer.c  |  137 ++++++++++++++----------------------
 arch/arm/include/asm/global_data.h |    5 ++
 board/faraday/a320evb/config.mk    |   35 ---------
 include/configs/a320evb.h          |    2 +
 4 files changed, 59 insertions(+), 120 deletions(-)
 delete mode 100644 board/faraday/a320evb/config.mk

diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index d2e316f..ac48328 100644
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
 <at>  <at>  -18,10 +18,13  <at>  <at> 
  */

 #include <common.h>
+#include <div64.h>
 #include <asm/io.h>
 #include <asm/arch/ftpmu010.h>
 #include <asm/arch/fttmr010.h>
(Continue reading)

ratbert.chuang | 1 Nov 09:07 2010
Picon

[PATCH 2/2] arm: a320evb: fixes for relocation support

From: Po-Yu Chuang <ratbert <at> faraday-tech.com>

- add CONFIG_SYS_SDRAM_BASE and CONFIG_SYS_INIT_SP_ADDR
- do not update gd->bd in dram_init() because bd is unavailable then

Signed-off-by: Po-Yu Chuang <ratbert <at> faraday-tech.com>
---
 board/faraday/a320evb/a320evb.c |    3 +--
 include/configs/a320evb.h       |   10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
index 85b11b9..b9343e4 100644
--- a/board/faraday/a320evb/a320evb.c
+++ b/board/faraday/a320evb/a320evb.c
 <at>  <at>  -46,8 +46,7  <at>  <at>  int dram_init(void)

 	actual_size = get_ram_size((void *)sdram_base, expected_size);

-	gd->bd->bi_dram[0].start = sdram_base;
-	gd->bd->bi_dram[0].size  = actual_size;
+	gd->ram_size = actual_size;

 	if (expected_size != actual_size)
 		printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 0284d40..97bf8b9 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
 <at>  <at>  -138,15 +138,19  <at>  <at> 
(Continue reading)

Albert ARIBAUD | 1 Nov 09:12 2010
Picon

Re: [RFC] arm926ejs: fix jump to RAM nand_boot

Le 01/11/2010 06:13, sughosh ganu a écrit :
> On Mon, Nov 1, 2010 at 4:34 AM, Albert ARIBAUD<albert.aribaud <at> free.fr>wrote:
>
>> Le 31/10/2010 23:28, Alexander Holler a écrit :
>>> On 31.10.2010 22:20, Albert Aribaud wrote:
>>>
>>>> Alexander, Darius, others who already tested the previous RFC patch,
>>>> please test for non-regression.
>>>
>>> Still works here with that patch applied. But that isn't remarkable,
>> because
>>>
>>>>     #ifdef CONFIG_NAND_SPL
>>>
>>> that isn't defined here. ;)
>>
>> ... and tx25 seems not to have it defined either, so my change should
>> not have affected Wolfgang's tests. :/
>>
>
>   I think it is defined in nand_spl/board/karo/tx25/Makefile. We do get a
> nand_spl/u-boot-spl when we compile for the tx25 board, which has a
> reference to nand_boot.

Thanks Sugish. Which commands do you use to build the tx25? I tried

	make distclean; make tx25_config; make

and

(Continue reading)

Alexander Stein | 1 Nov 09:29 2010

various at91 patches to make some boards compilable again

This patch series changes some at91 boards to SoC access and adds some defines
to make the boards compilable again.
Please note: All changes are untested!

Best regards,
Alexander
Alexander Stein | 1 Nov 09:29 2010

[PATCH 01/11] at91sam9260: Replace PHYS_SDRAM with CONFIG_SYS_SDRAM_BASE

Same for PHYS_SDRAM_SIZE and CONFIG_SYS_SDRAM_SIZE and use SZ_* macros

Signed-off-by: Alexander Stein <alexander.stein <at> systec-electronic.com>
---
 board/atmel/at91sam9260ek/at91sam9260ek.c |    6 +++---
 include/configs/at91sam9260ek.h           |   17 ++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 64c6d17..063ddbf 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
 <at>  <at>  -153,7 +153,7  <at>  <at>  int board_init(void)
 	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;
 #endif
 	/* adress of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

 	at91_serial_hw_init();
 #ifdef CONFIG_CMD_NAND
 <at>  <at>  -171,8 +171,8  <at>  <at>  int board_init(void)

 int dram_init(void)
 {
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE;
 	return 0;
(Continue reading)

Alexander Stein | 1 Nov 09:29 2010

[PATCH 02/11] at91: Add USART & DBGU base address defines

Signed-off-by: Alexander Stein <alexander.stein <at> systec-electronic.com>
---
 arch/arm/include/asm/arch-at91/at91cap9.h    |   12 ++++++++----
 arch/arm/include/asm/arch-at91/at91sam9260.h |    7 +++++++
 arch/arm/include/asm/arch-at91/at91sam9261.h |    4 ++++
 arch/arm/include/asm/arch-at91/at91sam9263.h |    3 +++
 arch/arm/include/asm/arch-at91/at91sam9g45.h |    5 +++++
 arch/arm/include/asm/arch-at91/at91sam9rl.h  |    4 ++++
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/arch/arm/include/asm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h
index 5af6fdc..f109c66 100644
--- a/arch/arm/include/asm/arch-at91/at91cap9.h
+++ b/arch/arm/include/asm/arch-at91/at91cap9.h
 <at>  <at>  -53,10 +53,14  <at>  <at> 
 #define AT91CAP9_ID_IRQ0	30	/* Advanced Interrupt Controller (IRQ0) */
 #define AT91CAP9_ID_IRQ1	31	/* Advanced Interrupt Controller (IRQ1) */

-#define AT91_PIO_BASE	0xfffff200
-#define AT91_PMC_BASE	0xfffffc00
-#define AT91_RSTC_BASE	0xfffffd00
-#define AT91_PIT_BASE	0xfffffd30
+#define AT91_USART0_BASE	0xfff8c000
+#define AT91_USART1_BASE	0xfff90000
+#define AT91_USART2_BASE	0xfff94000
+#define AT91_DBGU_BASE		0xffffee00
+#define AT91_PIO_BASE		0xfffff200
+#define AT91_PMC_BASE		0xfffffc00
+#define AT91_RSTC_BASE		0xfffffd00
+#define AT91_PIT_BASE		0xfffffd30
(Continue reading)

Alexander Stein | 1 Nov 09:29 2010

[PATCH 11/11] at91cap9adk: make compilable again

Signed-off-by: Alexander Stein <alexander.stein <at> systec-electronic.com>
---
 board/atmel/at91cap9adk/at91cap9adk.c |    6 +++---
 include/configs/at91cap9adk.h         |   15 +++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c
index 2ab8bc2..ce77a13 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
 <at>  <at>  -306,7 +306,7  <at>  <at>  int board_init(void)
 	/* arch number of AT91CAP9ADK-Board */
 	gd->bd->bi_arch_number = MACH_TYPE_AT91CAP9ADK;
 	/* adress of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

 	at91_serial_hw_init();
 	at91cap9_slowclock_hw_init();
 <at>  <at>  -331,8 +331,8  <at>  <at>  int board_init(void)

 int dram_init(void)
 {
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+	gd->bd->bi_dram[0].size = CONFIG_SYS_SDRAM_SIZE;
 	return 0;
 }

(Continue reading)

Alexander Stein | 1 Nov 09:29 2010

[PATCH 04/11] at91sam9260ek: Convert to SoC

Signed-off-by: Alexander Stein <alexander.stein <at> systec-electronic.com>
---
 board/atmel/at91sam9260ek/at91sam9260ek.c |   88 +++++++++++++---------------
 board/atmel/at91sam9260ek/led.c           |   12 ++--
 include/configs/at91sam9260ek.h           |   12 ++--
 3 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 063ddbf..8126c4f 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
 <at>  <at>  -29,6 +29,7  <at>  <at> 
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
+#include <asm/arch/at91_matrix.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/io.h>
 #include <asm/arch/hardware.h>
 <at>  <at>  -48,48 +49,55  <at>  <at>  DECLARE_GLOBAL_DATA_PTR;
 static void at91sam9260ek_nand_hw_init(void)
 {
 	unsigned long csa;
+	at91_smc_t	*smc 	= (at91_smc_t *) AT91_SMC_BASE;
+	at91_matrix_t	*matrix = (at91_matrix_t *) AT91_MATRIX_BASE;
+	at91_pmc_t	*pmc	= (at91_pmc_t *) AT91_PMC_BASE;

 	/* Enable CS3 */
-	csa = at91_sys_read(AT91_MATRIX_EBICSA);
-	at91_sys_write(AT91_MATRIX_EBICSA,
(Continue reading)


Gmane