Patchwork [U-Boot] 85xx: enable FDT support for STX SSA board

login
register
mail settings
Submitter Wolfgang Denk
Date July 25, 2011, 1:15 p.m.
Message ID <1311599744-11487-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/106661/
State Accepted
Delegated to: Kumar Gala
Headers show

Comments

Wolfgang Denk - July 25, 2011, 1:15 p.m.
We also have to shift TEXT_BASE to accomodate for the additional
code size.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kumar Gala <galak@kernel.crashing.org>

---
 board/stx/stxssa/stxssa.c |    8 ++++++++
 include/configs/stxssa.h  |    7 ++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
Sergei Shtylyov - July 26, 2011, 11:49 a.m.
Hello.

On 25-07-2011 17:15, Wolfgang Denk wrote:

> We also have to shift TEXT_BASE to accomodate for the additional
> code size.

> Signed-off-by: Wolfgang Denk<wd@denx.de>
> Cc: Kumar Gala<galak@kernel.crashing.org>

> ---
>   board/stx/stxssa/stxssa.c |    8 ++++++++
>   include/configs/stxssa.h  |    7 ++++++-
>   2 files changed, 14 insertions(+), 1 deletions(-)

> diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
> index 83ffcd2..c78538d 100644
> --- a/board/stx/stxssa/stxssa.c
> +++ b/board/stx/stxssa/stxssa.c
[...]
> @@ -247,6 +248,13 @@ reset_phy(void)
>   #endif
>   }
>
> +#ifdef CONFIG_OF_BOARD_SETUP
> +void ft_board_setup (void *blob, bd_t *bd)
> +{
> +	ft_cpu_setup (blob, bd);

    I guess this won't pass checkpatch.pl (spaces before paren).

WBR, Sergei
Kumar Gala - July 27, 2011, 2:45 a.m.
On Jul 26, 2011, at 6:49 AM, Sergei Shtylyov wrote:

> Hello.
> 
> On 25-07-2011 17:15, Wolfgang Denk wrote:
> 
>> We also have to shift TEXT_BASE to accomodate for the additional
>> code size.
> 
>> Signed-off-by: Wolfgang Denk<wd@denx.de>
>> Cc: Kumar Gala<galak@kernel.crashing.org>
> 
>> ---
>>  board/stx/stxssa/stxssa.c |    8 ++++++++
>>  include/configs/stxssa.h  |    7 ++++++-
>>  2 files changed, 14 insertions(+), 1 deletions(-)
> 
>> diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
>> index 83ffcd2..c78538d 100644
>> --- a/board/stx/stxssa/stxssa.c
>> +++ b/board/stx/stxssa/stxssa.c
> [...]
>> @@ -247,6 +248,13 @@ reset_phy(void)
>>  #endif
>>  }
>> 
>> +#ifdef CONFIG_OF_BOARD_SETUP
>> +void ft_board_setup (void *blob, bd_t *bd)
>> +{
>> +	ft_cpu_setup (blob, bd);
> 
>   I guess this won't pass checkpatch.pl (spaces before paren).
> 
> WBR, Sergei

applied to 85xx & fixed whitespace issue.

- k

Patch

diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
index 83ffcd2..c78538d 100644
--- a/board/stx/stxssa/stxssa.c
+++ b/board/stx/stxssa/stxssa.c
@@ -34,6 +34,7 @@ 
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/immap_85xx.h>
+#include <asm/fsl_pci.h>
 #include <asm/fsl_ddr_sdram.h>
 #include <ioports.h>
 #include <asm/io.h>
@@ -247,6 +248,13 @@  reset_phy(void)
 #endif
 }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+void ft_board_setup (void *blob, bd_t *bd)
+{
+	ft_cpu_setup (blob, bd);
+}
+#endif /* CONFIG_OF_BOARD_SETUP */
+
 int
 board_early_init_f(void)
 {
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index d5dd94f..141da26 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -43,7 +43,7 @@ 
 #define CONFIG_STXSSA		1	/* Silicon Tx GPPP SSA board specific*/
 #define CONFIG_MPC8560		1
 
-#define	CONFIG_SYS_TEXT_BASE	0xFFFC0000
+#define	CONFIG_SYS_TEXT_BASE	0xFFF80000
 
 #define CONFIG_PCI			/* PCI ethernet support	*/
 #define CONFIG_TSEC_ENET		/* tsec ethernet support*/
@@ -194,6 +194,11 @@ 
 #define CONFIG_SYS_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
  */