stx: create common vendor hierarchy for Silicon Turnkey boards

Put environment into .ppcenv section aligned on a smaller "boot" eraseblock boundary near flash end.

Quoted 3 lines

Put environment into .ppcenv section aligned on a

smaller "boot" eraseblock

Quoted 1 line

boundary near flash end.

Hm... if you change to code to using a smaller boot sector...

Quoted 1 line

? #define CONFIG_ENV_ADDR? ? ?

? (CONFIG_SYS_MONITOR_BASE + 0x38000)

Quoted 1 line

? #define

CONFIG_ENV_SECT_SIZE???0x4000???/*
16K(one sector) for env */

Quoted 1 line

-#define CONFIG_ENV_SIZE? ? ? ?

0x2000

Quoted 1 line

+#define CONFIG_ENV_SIZE? ? ? ?

0x4000

...should then not be CONFIG_ENV_SECT_SIZE changed to some smaller
size, too?

Quoted 12 lines

Hm... if you change to code to using a smaller boot sector...

Quoted 1 line

? #define CONFIG_ENV_ADDR? ? ?

? (CONFIG_SYS_MONITOR_BASE + 0x38000)

Quoted 1 line

? #define

CONFIG_ENV_SECT_SIZE???0x4000???/*
16K(one sector) for env */

Quoted 1 line

-#define CONFIG_ENV_SIZE? ? ? ?

0x2000

Quoted 1 line

+#define CONFIG_ENV_SIZE? ? ? ?

Quoted 6 lines

0x4000

...should then not be CONFIG_ENV_SECT_SIZE changed to some smaller
size, too?

The "large" eraseblock size for this flash config is 128k (2x64k). Small one is 16k (2x8k).

From: Alex Dubov <[email protected]>

STx AMC8548 board is an old, AMC form factor, MPC8548 based board intended for RapidIO applications. It features 16MiB NAND flash, one DDR2 soDIMM slot, ethernet on front panel and backplane, RapidIO on backplane, USB controller on local bus (not currently enabled) and no PCI of any kind.

Signed-off-by Alex Dubov <[email protected]>

---
 Makefile                          |    3 +
 board/stx/stxamc8548/Makefile     |   51 ++++++
 board/stx/stxamc8548/config.mk    |   32 ++++
 board/stx/stxamc8548/stxamc8548.c |  168 +++++++++++++++++++
 board/stx/stxamc8548/u-boot.lds   |  143 ++++++++++++++++
 include/configs/stxamc8548.h      |  332 +++++++++++++++++++++++++++++++++++++
 6 files changed, 729 insertions(+), 0 deletions(-)
 create mode 100644 board/stx/stxamc8548/Makefile
 create mode 100644 board/stx/stxamc8548/config.mk
 create mode 100644 board/stx/stxamc8548/stxamc8548.c
 create mode 100644 board/stx/stxamc8548/u-boot.lds
 create mode 100644 include/configs/stxamc8548.h

Dear oakad at yahoo.com,

Quoted 8 lines · In message <[email protected]> you wrote:

From: Alex Dubov <[email protected]>

STx AMC8548 board is an old, AMC form factor, MPC8548 based board intended for RapidIO applications. It features 16MiB NAND flash, one DDR2 soDIMM slot, ethernet on front panel and backplane, RapidIO on backplane, USB controller on local bus (not currently enabled) and no PCI of any kind.

Signed-off-by Alex Dubov <[email protected]>

Quoted 13 lines

---
 Makefile                          |    3 +
 board/stx/stxamc8548/Makefile     |   51 ++++++
 board/stx/stxamc8548/config.mk    |   32 ++++
 board/stx/stxamc8548/stxamc8548.c |  168 +++++++++++++++++++
 board/stx/stxamc8548/u-boot.lds   |  143 ++++++++++++++++
 include/configs/stxamc8548.h      |  332 +++++++++++++++++++++++++++++++++++++
 6 files changed, 729 insertions(+), 0 deletions(-)
 create mode 100644 board/stx/stxamc8548/Makefile
 create mode 100644 board/stx/stxamc8548/config.mk
 create mode 100644 board/stx/stxamc8548/stxamc8548.c
 create mode 100644 board/stx/stxamc8548/u-boot.lds
 create mode 100644 include/configs/stxamc8548.h

What's the difference between this patch and the previously submitted one:

Subject: [U-Boot] [PATCH 2/2] stx: add support for AMC8548 board
From: Alex Dubov <[email protected]>
Date: Tue, 4 Aug 2009 02:26:49 -0700 (PDT)

?

From: Alex Dubov <[email protected]>

Move board definition files for STx XTC, GP3 and SSA boards into common subdirectory and factor out common code.

"-mno-spe" flag common to all MPC85xx configurations does not work so change it to "-mspe=no" which does (GCC bug 37759).

Signed-off-by Alex Dubov <[email protected]>

board/stx/common/law.c renamed from board/stxssa/law.c +0 -0

similarity index 74%
rename from board/stxssa/law.c
rename to board/stx/common/law.c
index 55dde66..a82c99f 100644

board/stx/common/law.c renamed from board/stxssa/law.c +0 -2

@@ -31,30 +31,34 @@
  * LAW(Local Access Window) configuration:
  *
  * 0x0000_0000     0x7fff_ffff     DDR                     2G
- * 0x8000_0000     0x9fff_ffff     PCI1 MEM                512M
- * 0xa000_0000     0xbfff_ffff     PCI2 MEM                512M

board/stx/common/law.c renamed from board/stxssa/law.c +4 -3

 struct law_entry law_table[] = {
-#ifndef CONFIG_SPD_EEPROM
-	SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_128M, LAW_TRGT_IF_DDR),
+#ifdef CONFIG_SYS_PCI1_MEM_PHYS
+	SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
+	SET_LAW(CONFIG_SYS_PCI1_IO_PHYS, LAW_SIZE_16M, LAW_TRGT_IF_PCI),
 #endif
-	SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI_1),
+#ifdef CONFIG_SYS_PCI2_MEM_PHYS
 	SET_LAW(CONFIG_SYS_PCI2_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI_2),

board/stx/common/tlb.c renamed from board/stxssa/tlb.c +2 -1

@@ -31,76 +31,90 @@ struct fsl_e_tlb_entry tlb_table[] = {
 	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,
 		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
 		      0, 0, BOOKE_PAGESZ_4K, 0),
-	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
+	SET_TLB_ENTRY(0, CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
+		      CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,
 		      MAS3_SX|MAS3_SW|MAS3_SR, 0,
 		      0, 0, BOOKE_PAGESZ_4K, 0),

board/stx/common/tlb.c renamed from board/stxssa/tlb.c +4 -4

-	SET_TLB_ENTRY(1, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE,
+	SET_TLB_ENTRY(1, CONFIG_SYS_LBC_OPTION_BASE,
+		      CONFIG_SYS_LBC_OPTION_BASE,
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
-		      0, 0, BOOKE_PAGESZ_64M, 1),
+		      0, 0, BOOKE_PAGESZ_256M, 1),
 
 	/*
-	 * TLB 1:	256M	Non-cacheable, guarded
-	 * 0x80000000	256M	PCI1 MEM First half
+	 * TLB 1:	64M	Non-cacheable, guarded

include/configs/stxgp3.h +1 -0

index 0424e29..12df277 100644
@@ -78,6 +78,7 @@
  */
 #define CONFIG_SYS_LBC_SDRAM_BASE      0xf0000000      /* Localbus SDRAM */
 #define CONFIG_SYS_LBC_SDRAM_SIZE	256		/* LBC SDRAM is 64MB	*/
+#define CONFIG_SYS_LBC_OPTION_BASE     0xf0000000
 
 #define CONFIG_SYS_FLASH_BASE        0xff000000      /* start of FLASH 16M    */
 #define CONFIG_SYS_BR0_PRELIM        0xff001801      /* port size 32bit      */

Quoted 3 lines

Move board definition files for STx XTC, GP3 and SSA

boards into

Quoted 3 lines

common subdirectory and factor out common code.

"-mno-spe" flag common to all MPC85xx configurations

does not work

Quoted 1 line

so change it to "-mspe=no" which does (GCC bug

37759).

Quoted 2 lines

Signed-off-by Alex Dubov <[email protected]>

...

Quoted 7 lines

board/stx/common/Makefile renamed from board/stxgp3/Makefile +0 -0

@@ -1,5 +1,5 @@

? #

board/stx/common/Makefile renamed from board/stxgp3/Makefile +1 -1

-# (C) Copyright 2001-2006
+# (C) Copyright 2006

? # Wolfgang Denk, DENX Software Engineering, wd at denx.de.

How comes?

board/stx/common/Makefile line 31

Quoted 3 lines

board/stx/common/Makefile renamed from board/stxgp3/Makefile +0 -0

@@ -31,30 +31,34 @@
 ???* LAW(Local Access Window)

configuration:

Quoted 2 lines

???*
???* 0x0000_0000?

???0x7fff_ffff?
???DDR? ? ? ? ?
? ? ? ? ???2G

Quoted 1 line

- * 0x8000_0000?

???0x9fff_ffff? ???PCI1
MEM? ? ? ? ? ? ? ?
512M

Quoted 1 line

- * 0xa000_0000?

???0xbfff_ffff? ???PCI2
MEM? ? ? ? ? ? ? ?
512M

Quoted 1 line

+ * 0x8000_0000?

???0x9fff_ffff?
???PCI1? ? ? ? ?
? ? ? ? ? 512M

Quoted 1 line

+ * 0xa000_0000?

???0xbfff_ffff?
???PCI2? ? ? ? ?
? ? ? ? ? 512M

Quoted 1 line

+ * 0xc000_0000?

???0xdfff_ffff?
???RapidIO? ? ? ? ?
? ? ???512M

Quoted 1 line

???* 0xe000_0000?

???0xe000_ffff?
???CCSR? ? ? ? ?
? ? ? ? ? 1M

Quoted 1 line

???* 0xe200_0000?

???0xe2ff_ffff? ???PCI1
IO? ? ? ? ? ? ?
???16M

Quoted 1 line

???* 0xe300_0000?

???0xe3ff_ffff? ???PCI2
IO? ? ? ? ? ? ?
???16M

Quoted 1 line

- * 0xf000_0000?

???0xfaff_ffff? ???Local
bus? ? ? ? ? ?
???128M

Quoted 1 line

- * 0xfb00_0000?

???0xfb00_ffff? ???Config
Latch? ? ? ? ? ? 64K

Quoted 1 line

- * 0xfc00_0000?

???0xffff_ffff? ???FLASH
(boot bank)? ? ???64M

Quoted 1 line

+ * 0xf000_0000?

???0xffff_ffff? ???LBC
options + FLASH? ???256M

Are you sure this is correct?

Quoted 4 lines

? struct law_entry law_table[] = {
-#ifndef CONFIG_SPD_EEPROM
-??? SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE,

LAW_SIZE_128M, LAW_TRGT_IF_DDR),

Quoted 2 lines

+#ifdef CONFIG_SYS_PCI1_MEM_PHYS
+??? SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS,

LAW_SIZE_512M, LAW_TRGT_IF_PCI),

Quoted 1 line

+??? SET_LAW(CONFIG_SYS_PCI1_IO_PHYS,

LAW_SIZE_16M, LAW_TRGT_IF_PCI),

Quoted 2 lines

? #endif
-??? SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS,

LAW_SIZE_512M, LAW_TRGT_IF_PCI_1),

Quoted 2 lines

+#ifdef CONFIG_SYS_PCI2_MEM_PHYS
? ???

SET_LAW(CONFIG_SYS_PCI2_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI_2),

Quoted 1 line

-??? SET_LAW(CONFIG_SYS_PCI1_IO_PHYS,

LAW_SIZE_16M, LAW_TRGT_IF_PCI_1),

Quoted 1 line

? ???

SET_LAW(CONFIG_SYS_PCI2_IO_PHYS, LAW_SIZE_16M, LAW_TRGT_IF_PCI_2),

Quoted 1 line

-??? /* Map the whole localbus,

including flash and reset latch. */

Quoted 1 line

-???

SET_LAW(CONFIG_SYS_LBC_OPTION_BASE, LAWAR_SIZE_256M, LAW_TRGT_IF_LBC),

board/stx/common/Makefile

Quoted 3 lines

board/stx/common/Makefile renamed from board/stxgp3/Makefile +3 -0

+#endif
+#ifdef CONFIG_SYS_RIO_MEM_PHYS
+??? SET_LAW(CONFIG_SYS_RIO_MEM_PHYS,

LAW_SIZE_512M, LAW_TRGT_IF_RIO),

Quoted 2 lines

+#endif
+???

SET_LAW(CONFIG_SYS_LBC_OPTION_BASE, LAWAR_SIZE_256M, LAW_TRGT_IF_LBC)

Quoted 1 line

? };

This looks fishy, too.

board/stx/common/Makefile struct fsl_e_tlb_entry tlb_table[]

Quoted 1 line

board/stx/common/Makefile renamed from board/stxgp3/Makefile +0 -0

@@ -31,76 +31,90 @@ struct fsl_e_tlb_entry tlb_table[]

= {

board/stx/common/Makefile struct fsl_e_tlb_entry tlb_table[] · line 31

Quoted 1 line

board/stx/common/Makefile renamed from board/stxgp3/Makefile +0 -0

 ? ??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR, CONFIG_SYS_INIT_RAM_ADDR,

Quoted 1 line

? ??? ??? ?

? ? MAS3_SX|MAS3_SW|MAS3_SR, 0,

Quoted 1 line

? ??? ??? ?

? ? 0, 0, BOOKE_PAGESZ_4K, 0),

Quoted 1 line

-??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,

Quoted 1 line

+??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,

Quoted 1 line

+??? ??? ? ?

? CONFIG_SYS_INIT_RAM_ADDR + 4 * 1024,

Quoted 1 line

? ??? ??? ?

? ? MAS3_SX|MAS3_SW|MAS3_SR, 0,

Quoted 1 line

? ??? ??? ?

? ? 0, 0, BOOKE_PAGESZ_4K, 0),

Quoted 1 line

-??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,

Quoted 1 line

+??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,

Quoted 1 line

+??? ??? ? ?

? CONFIG_SYS_INIT_RAM_ADDR + 8 * 1024,

Quoted 1 line

? ??? ??? ?

? ? MAS3_SX|MAS3_SW|MAS3_SR, 0,

Quoted 1 line

? ??? ??? ?

? ? 0, 0, BOOKE_PAGESZ_4K, 0),

Quoted 1 line

-??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024 , CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,

Quoted 1 line

+??? SET_TLB_ENTRY(0,

CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,

Quoted 1 line

+??? ??? ? ?

? CONFIG_SYS_INIT_RAM_ADDR + 12 * 1024,

Quoted 1 line

? ??? ??? ?

? ? MAS3_SX|MAS3_SW|MAS3_SR, 0,

Quoted 1 line

? ??? ??? ?

? ? 0, 0, BOOKE_PAGESZ_4K, 0),

Better split code beautifying into separate patch.

Hm... did you actually test these changes on all 4 boards?

Quoted 10 lines

Quoted 8 lines

board/stx/common/Makefile renamed from board/stxgp3/Makefile +0 -0

@@ -1,5 +1,5 @@

? #

board/stx/common/Makefile renamed from board/stxgp3/Makefile +1 -1

-# (C) Copyright 2001-2006
+# (C) Copyright 2006

? # Wolfgang Denk, DENX Software Engineering, wd at denx.de.

How comes?

Git is confused somehow.
I don't see this change in my tree.

Quoted 1 line

Are you sure this is correct?

Yes, this will cover all three boards affected by the change. They all have their address maps set in similar fashion.

Quoted 1 line

This looks fishy, too.

Just look at the respective boards' law.c files before the patch. They all have this entry, either called CONFIG_SYS_LBC_OPTION_BASE or CONFIG_SYS_LBC_SDRAM_BASE.

Quoted 5 lines

? ? MAS3_SX|MAS3_SW|MAS3_SR, 0,

Quoted 1 line

? ??? ??? ?

? ? 0, 0, BOOKE_PAGESZ_4K, 0),

Better split code beautifying into separate patch.

I wrote this file from scratch.
Git is confused here.

There's no separate patch.
Same for the other issues here and below.

Quoted 1 line

Hm... did you actually test these changes on all 4 boards?

There are no real changes. All three boards have nearly identical configs.

Just a general observation: if you are not sure that tlb/law files can be safely factored out and most of the ddr.c files are actually board specific overrides (common part being less than 10 lines) why had you requested me to create a common board hierarchy for these STX boards in the first place?

For all I can see, they don't have any common, vendor specific hardware.

I still want my board supported, so I propose you decide how do you want them arranged (vendor/board/ or just board/) and I'll limit my contribution to my board's files exclusively.

After all, I don't work for Silicon Turnkey and it starts taking too much time.

Quoted 3 lines

Just a general observation: if you are not sure that

tlb/law files can be

Quoted 1 line

safely factored out and most of the ddr.c files are

actually board specific

Quoted 1 line

overrides (common part being less than 10 lines) why

had you requested me

Quoted 1 line

to create a common board hierarchy for these STX

boards in the first place?

I am sure that the tlb/law files can be safely factored out, but that
does not mean that you can simply use one of the files and? force? it
upon? the? othe? rboards.? The?
differences? between? the boards must obviously been taken care? of,? for?
example? by? using? preprocessor
variables? (defined in the board config files) to describe the (tiny)
differences between the boards.

I don't understand why you claim the ddr.c files were so different:

-> diff board/stxgp3/ddr.c board/stxssa/ddr.c | wc -l 0

However, the real issue here is whether you prefer a #define sprawl or having a couple of additional short files for each board in question. Until now, as I can see, the second option was preferred.

From: Alex Dubov <[email protected]>

Move board definition files for STx XTC, GP3 and SSA boards into common subdirectory and factor out common code.

"-mno-spe" flag common to all MPC85xx configurations does not work so change it to "-mspe=no" which does (GCC bug 37759).

Signed-off-by Alex Dubov <[email protected]>

---

Makefile                                |    6 +-
board/{stxgp3 => stx/common}/Makefile   |   20 +++--
board/{stxssa => stx/common}/ddr.c      |   46 ++++++++---
board/{stxssa => stx/common}/law.c      |   30 ++++---
board/{stxssa => stx/common}/tlb.c      |   72 ++++++++++-------
board/{ => stx}/stxgp3/Makefile         |    3 -
board/{ => stx}/stxgp3/config.mk        |    0
board/{ => stx}/stxgp3/flash.c          |    0
board/{ => stx}/stxgp3/stxgp3.c         |    0
board/{ => stx}/stxgp3/u-boot.lds       |    0
board/{ => stx}/stxssa/Makefile         |    3 -
board/{ => stx}/stxssa/config.mk        |    0
board/{ => stx}/stxssa/stxssa.c         |    0
board/{ => stx}/stxssa/u-boot.lds       |    0
board/{ => stx}/stxxtc/Makefile         |    0
board/{ => stx}/stxxtc/config.mk        |    0
board/{ => stx}/stxxtc/stxxtc.c         |    0
board/{ => stx}/stxxtc/u-boot.lds       |    0
board/{ => stx}/stxxtc/u-boot.lds.debug |    0
board/stxgp3/ddr.c                      |   76 ------------------
board/stxgp3/law.c                      |   58 --------------
board/stxgp3/tlb.c                      |  130  
-------------------------------
cpu/mpc85xx/config.mk                   |    2 +-
include/configs/stxgp3.h                |   21 +++--
include/configs/stxssa.h                |   28 ++++---
25 files changed, 135 insertions(+), 360 deletions(-)

copy board/{stxgp3 => stx/common}/Makefile (82%) rename board/{stxssa => stx/common}/ddr.c (57%) rename board/{stxssa => stx/common}/law.c (74%) rename board/{stxssa => stx/common}/tlb.c (59%) rename board/{ => stx}/stxgp3/Makefile (95%) rename board/{ => stx}/stxgp3/config.mk (100%) rename board/{ => stx}/stxgp3/flash.c (100%) rename board/{ => stx}/stxgp3/stxgp3.c (100%) rename board/{ => stx}/stxgp3/u-boot.lds (100%) rename board/{ => stx}/stxssa/Makefile (95%) rename board/{ => stx}/stxssa/config.mk (100%) rename board/{ => stx}/stxssa/stxssa.c (100%) rename board/{ => stx}/stxssa/u-boot.lds (100%)

rename board/{ => stx}/stxxtc/Makefile (100%) rename board/{ => stx}/stxxtc/config.mk (100%) rename board/{ => stx}/stxxtc/stxxtc.c (100%) rename board/{ => stx}/stxxtc/u-boot.lds (100%) rename board/{ => stx}/stxxtc/u-boot.lds.debug (100%) delete mode 100644 board/stxgp3/ddr.c
delete mode 100644 board/stxgp3/law.c
delete mode 100644 board/stxgp3/tlb.c