arm, at91, spl: add spl support for the taurus and corvus boards

move CONFIG_SYS_SPI_WRITE_TOUT into drivers/spi/atmel_spi.h and define a default value. Delete this define in the board config files, where it is possible (all boards use currently the same value).

Signed-off-by Heiko Schocher <[email protected]>

---

Changes in v3:
rebased against 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6

Changes in v2:
rebased against d58a9451e7339ed4cf2b2627e534611f427fb791 new in v2

 drivers/spi/atmel_spi.h         | 4 ++++
 include/configs/afeb9260.h      | 1 -
 include/configs/at91sam9260ek.h | 1 -
 include/configs/at91sam9261ek.h | 1 -
 include/configs/at91sam9263ek.h | 1 -
 include/configs/at91sam9rlek.h  | 1 -
 include/configs/ethernut5.h     | 1 -
 include/configs/meesc.h         | 1 -
 include/configs/otc570.h        | 1 -
 include/configs/pm9261.h        | 1 -
 include/configs/pm9263.h        | 1 -
 include/configs/sbc35_a9g20.h   | 1 -
 include/configs/tny_a9260.h     | 1 -
 include/configs/usb_a9263.h     | 1 -
 14 files changed, 4 insertions(+), 13 deletions(-)

drivers/spi/atmel_spi.h +4 -0

index d240945..1538a23 100644
@@ -94,3 +94,7 @@ static inline struct atmel_spi_slave *to_atmel_spi(struct spi_slave *slave)
        readl(as->regs + ATMEL_SPI_##reg)
 #define spi_writel(as, reg, value)                             \
        writel(value, as->regs + ATMEL_SPI_##reg)
+
+#if !defined(CONFIG_SYS_SPI_WRITE_TOUT)
+#define CONFIG_SYS_SPI_WRITE_TOUT      (5 * CONFIG_SYS_HZ)
+#endif

include/configs/afeb9260.h +0 -1

index 14bac15..932a309 100644
@@ -77,7 +77,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1    0xD0000000      /* CS1 */

include/configs/at91sam9260ek.h +0 -1

index 73917b0..72247cc 100644
@@ -135,7 +135,6 @@
 #ifndef CONFIG_AT91SAM9G20EK_2MMC
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1    0xD0000000      /* CS1 */

include/configs/at91sam9261ek.h +0 -1

index 226f8c1..cb16bda 100644
@@ -107,7 +107,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3    0xD0000000      /* CS3 */

include/configs/at91sam9263ek.h +0 -1

index b666d94..fa19e8b 100644
@@ -119,7 +119,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define AT91_SPI_CLK                   15000000

include/configs/at91sam9rlek.h +0 -1

index b8d5dd1..d5f0197 100644
@@ -100,7 +100,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH                   1
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define AT91_SPI_CLK                           15000000

include/configs/ethernut5.h +0 -1

index 4c69af6..ce61a16 100644
@@ -78,7 +78,6 @@
 
 /* SPI */
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SYS_SPI_WRITE_TOUT      (5 * CONFIG_SYS_HZ)
 #define AT91_SPI_CLK                   15000000
 
 /* Serial port */

include/configs/meesc.h +0 -1

index 86ce5f2..955d0e2 100644
@@ -124,7 +124,6 @@
 #ifdef CONFIG_SYS_USE_DATAFLASH
 # define CONFIG_ATMEL_DATAFLASH_SPI
 # define CONFIG_HAS_DATAFLASH
-# define CONFIG_SYS_SPI_WRITE_TOUT             (5 * CONFIG_SYS_HZ)
 # define CONFIG_SYS_MAX_DATAFLASH_BANKS                1
 # define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0   0xC0000000      /* CS0 */
 # define AT91_SPI_CLK                          15000000

include/configs/otc570.h +0 -1

index 629967d..2390beb 100644
@@ -174,7 +174,6 @@
 #ifdef CONFIG_SYS_USE_DATAFLASH
 # define CONFIG_ATMEL_DATAFLASH_SPI
 # define CONFIG_HAS_DATAFLASH
-# define CONFIG_SYS_SPI_WRITE_TOUT             (5 * CONFIG_SYS_HZ)
 # define CONFIG_SYS_MAX_DATAFLASH_BANKS                1
 # define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0   0xC0000000      /* CS0 */
 # define AT91_SPI_CLK                          15000000

include/configs/pm9261.h +0 -1

index 4a71927..0746056 100644
@@ -202,7 +202,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3    0xD0000000      /* CS3 */

include/configs/pm9263.h +0 -1

index d9c04d1..f0f12af 100644
@@ -216,7 +216,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH                   1
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000      /* CS0 */
 #define AT91_SPI_CLK                           15000000

include/configs/sbc35_a9g20.h +0 -1

index a1b5751..e7c35ec 100644
@@ -80,7 +80,6 @@
 #define CONFIG_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SYS_SPI_WRITE_TOUT      (5 * CONFIG_SYS_HZ)
 
 #define CONFIG_CMD_EEPROM
 #define CONFIG_SPI_M95XXX

include/configs/tny_a9260.h +0 -1

index 32f6b00..79c7fc5 100644
@@ -85,7 +85,6 @@
 #define CONFIG_SPI
 #define CONFIG_CMD_SPI
 #define CONFIG_ATMEL_SPI
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5 * CONFIG_SYS_HZ)
 
 #define CONFIG_CMD_EEPROM
 #define CONFIG_SPI_M95XXX

include/configs/usb_a9263.h +0 -2

index 3c54870..84571f6 100644
@@ -85,7 +85,6 @@
 /* DataFlash */
 #define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH
-#define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1
 #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0    0xC0000000
 #define AT91_SPI_CLK                           8000000
--

1.8.3.1

move CONFIG_SYS_SPI_WRITE_TOUT into drivers/spi/atmel_spi.h and define a default value. Delete this define in the board config files, where it is possible (all boards use currently the same value).

Signed-off-by Heiko Schocher <[email protected]>

---

Changes in v3:
rebased against 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6

Changes in v2:
rebased against d58a9451e7339ed4cf2b2627e534611f427fb791 new in v2

 drivers/spi/atmel_spi.h         | 4 ++++
 include/configs/afeb9260.h      | 1 -
 include/configs/at91sam9260ek.h | 1 -
 include/configs/at91sam9261ek.h | 1 -
 include/configs/at91sam9263ek.h | 1 -
 include/configs/at91sam9rlek.h  | 1 -
 include/configs/ethernut5.h     | 1 -
 include/configs/meesc.h         | 1 -
 include/configs/otc570.h        | 1 -
 include/configs/pm9261.h        | 1 -
 include/configs/pm9263.h        | 1 -
 include/configs/sbc35_a9g20.h   | 1 -
 include/configs/tny_a9260.h     | 1 -
 include/configs/usb_a9263.h     | 1 -
 14 files changed, 4 insertions(+), 13 deletions(-)

move CONFIG_SYS_SPI_WRITE_TOUT into drivers/spi/atmel_spi.h and define a default value. Delete this define in the board config files, where it is possible (all boards use currently the same value).

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
rebased against 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6

Changes in v2:
rebased against d58a9451e7339ed4cf2b2627e534611f427fb791 new in v2

drivers/spi/atmel_spi.h         | 4 ++++
include/configs/afeb9260.h      | 1 -
include/configs/at91sam9260ek.h | 1 -
include/configs/at91sam9261ek.h | 1 -
include/configs/at91sam9263ek.h | 1 -
include/configs/at91sam9rlek.h  | 1 -
include/configs/ethernut5.h     | 1 -
include/configs/meesc.h         | 1 -
include/configs/otc570.h        | 1 -
include/configs/pm9261.h        | 1 -
include/configs/pm9263.h        | 1 -
include/configs/sbc35_a9g20.h   | 1 -
include/configs/tny_a9260.h     | 1 -
include/configs/usb_a9263.h     | 1 -
14 files changed, 4 insertions(+), 13 deletions(-)

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file

    instead define a default in the spi driver -> new patch for v2

 board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
 include/configs/taurus.h      | 10 ++++++++++
 2 files changed, 28 insertions(+)

board/siemens/taurus/taurus.c +7 -0

index 673b302..76609c7 100644
@@ -22,6 +22,8 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/at91sam9_sdramc.h>
 #include <atmel_mci.h>
+#include <asm/arch/at91_spi.h>
+#include <spi.h>
 
 #include <net.h>
 #include <netdev.h>

@@ -127,6 +129,21 @@ int board_early_init_f(void)
        return 0;
 }
 
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+       return bus == 0 && cs == 0;
+}
+

board/siemens/taurus/taurus.c +1 -0

 int board_init(void)
 {
        /* adress of boot parameters */

@@ -139,6 +156,7 @@ int board_init(void)
 #ifdef CONFIG_MACB
        taurus_macb_hw_init();
 #endif
+       at91_spi0_hw_init(TAURUS_SPI_MASK);
 
        return 0;
 }

include/configs/taurus.h +3 -0

index aadf4cd..ba9496f 100644
@@ -127,6 +127,16 @@
 #define CONFIG_USB_STORAGE
 #endif
 
+/* SPI EEPROM */
+#define CONFIG_SPI
+#define CONFIG_CMD_SPI

Quoted 40 lines

Signed-off-by Heiko Schocher<[email protected]>

Reviewed-by Bo Shen<[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file

     instead define a default in the spi driver ->  new patch for v2

  board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
  include/configs/taurus.h      | 10 ++++++++++
  2 files changed, 28 insertions(+)

board/siemens/taurus/taurus.c +7 -0

index 673b302..76609c7 100644
@@ -22,6 +22,8 @@
  #include<asm/arch/gpio.h>
  #include<asm/arch/at91sam9_sdramc.h>
  #include<atmel_mci.h>
+#include<asm/arch/at91_spi.h>
+#include<spi.h>
 
  #include<net.h>
  #include<netdev.h>

@@ -127,6 +129,21 @@ int board_early_init_f(void)
         return 0;
  }
 
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+       return bus == 0&&  cs == 0;
+}
+

board/siemens/taurus/taurus.c int board_early_init_f(void) · line 146

Quoted 10 lines

board/siemens/taurus/taurus.c +10 -0

+void spi_cs_activate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
+}
+

Please add all these stuff in drivers/spi/atmel_spi.c

Did you see any issues?

Hello Jagan,

Am 31.10.2014 11:48, schrieb Jagan Teki:

Quoted 55 lines · Heiko Schocher

Quoted 41 lines

Signed-off-by Heiko Schocher<[email protected]>

Reviewed-by Bo Shen<[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file

     instead define a default in the spi driver ->  new patch for v2

  board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
  include/configs/taurus.h      | 10 ++++++++++
  2 files changed, 28 insertions(+)

board/siemens/taurus/taurus.c +7 -0

index 673b302..76609c7 100644
@@ -22,6 +22,8 @@
  #include<asm/arch/gpio.h>
  #include<asm/arch/at91sam9_sdramc.h>
  #include<atmel_mci.h>
+#include<asm/arch/at91_spi.h>
+#include<spi.h>
 
  #include<net.h>
  #include<netdev.h>

@@ -127,6 +129,21 @@ int board_early_init_f(void)
         return 0;
  }
 
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+       return bus == 0&&  cs == 0;
+}
+

board/siemens/taurus/taurus.c int board_early_init_f(void) · line 146

Quoted 10 lines

board/siemens/taurus/taurus.c +10 -0

+void spi_cs_activate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
+}
+

Please add all these stuff in drivers/spi/atmel_spi.c

Quoted 1 line

Did you see any issues?

Hmm.. this is board specific ... or?

Dear Jagan Teki,

Quoted 58 lines · Heiko Schocher

Hello Jagan,

Am 31.10.2014 11:48, schrieb Jagan Teki:

Quoted 55 lines · Heiko Schocher

Quoted 41 lines

Signed-off-by Heiko Schocher<[email protected]>

Reviewed-by Bo Shen<[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file

     instead define a default in the spi driver ->  new patch for v2

  board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
  include/configs/taurus.h      | 10 ++++++++++
  2 files changed, 28 insertions(+)

board/siemens/taurus/taurus.c +7 -0

index 673b302..76609c7 100644
@@ -22,6 +22,8 @@
  #include<asm/arch/gpio.h>
  #include<asm/arch/at91sam9_sdramc.h>
  #include<atmel_mci.h>
+#include<asm/arch/at91_spi.h>
+#include<spi.h>
 
  #include<net.h>
  #include<netdev.h>

@@ -127,6 +129,21 @@ int board_early_init_f(void)
         return 0;
  }
 
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+       return bus == 0&&  cs == 0;
+}
+

board/siemens/taurus/taurus.c int board_early_init_f(void) · line 146

Quoted 10 lines

board/siemens/taurus/taurus.c +10 -0

+void spi_cs_activate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 0);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+       at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
+}
+

Please add all these stuff in drivers/spi/atmel_spi.c

Quoted 3 lines

Quoted 1 line

Did you see any issues?

Hmm.. this is board specific ... or?

Heiko is right, this is board specific and follows the current way to implement spi for the atmel driver.
But Jagan is also right, we should move this code to the driver code cause in fact it is parametrisation of generic code. Unfortunately this change will blow up this series. I think we should consider this when rewriting the atmel spi driver for dm, which will be done soon (but I think not in this merge window). Jagan, is this Ok for you?

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file

    instead define a default in the spi driver -> new patch for v2

 board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
 include/configs/taurus.h      | 10 ++++++++++
 2 files changed, 28 insertions(+)

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

Reviewed-by Jagannadha Sutradharudu Teki <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file instead define a default in the spi driver -> new patch for v2

board/siemens/taurus/taurus.c | 18 ++++++++++++++++++
include/configs/taurus.h | 10 ++++++++++

2 files changed, 28 insertions(+)

use the configure value for computing the ba_off value not the value from the cr register. This leaded in a wrong ram configuration on the upcoming corvus spl board support.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
ignore 80 characters length as Bo Shen and Adreas Biessmann suggested

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

arch/arm/cpu/at91-common/mpddrc.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

- compile mpddrc ram init code also for AT91SAM9M10G45
based boards.
- in CONFIG_SAMA5D3 case, look for the ATMEL_MPDDRC_CR_DECOD_INTERLEAVED in the cr configuration

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

arch/arm/cpu/at91-common/Makefile | 6 +++++- arch/arm/cpu/at91-common/mpddrc.c | 11 ++++++++++-

2 files changed, 15 insertions(+), 2 deletions(-)

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add comment from Andreas Biessmann:
- rename "MPDDRC_CR_EBISHARE" to "MPDDRC_CR_DQMS_SHARED"

arch/arm/include/asm/arch-at91/atmel_mpddrc.h | 1 +

1 file changed, 1 insertion(+)

enable to boot only a raw u-boot.bin image from nand with the CONFIG_SPL_NAND_RAW_ONLY define. This option saves space on boards where spl space is low.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---
on the siemens taurus board, this option saved 0x14d bytes

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

README                |  4 ++++
common/spl/spl.c      | 15 ++++++++++-----
common/spl/spl_nand.c | 13 +++++++++++++
include/spl.h         |  1 +
4 files changed, 28 insertions(+), 5 deletions(-)

using this driver in SPL code with CONFIG_SPL_NAND_ECC configured leads in an compileerror. Fix this.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

  drivers/mtd/nand/atmel_nand.c | 1 +
  1 file changed, 1 insertion(+)

drivers/mtd/nand/atmel_nand.c +0 -0

index 9114a86..d506e42 100644

Hi Heiko,
Sorry for missing the subject typo error on v2 review.

s/missign/missing.

I think it can be corrected when apply.

Quoted 23 lines

using this driver in SPL code with CONFIG_SPL_NAND_ECC configured leads in an compileerror. Fix this.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

drivers/mtd/nand/atmel_nand.c | 1 +

1 file changed, 1 insertion(+)

drivers/mtd/nand/atmel_nand.c +0 -0

index 9114a86..d506e42 100644

drivers/mtd/nand/atmel_nand.c line 23

Quoted 6 lines

drivers/mtd/nand/atmel_nand.c +1 -0

@@ -18,6 +18,7 @@
 #include <malloc.h>
 #include <nand.h>
 #include <watchdog.h>
+#include <linux/mtd/nand_ecc.h>
 
 #ifdef CONFIG_ATMEL_NAND_HWECC

Best Regards,
Bo Shen

Hello Bo,

Am 31.10.2014 08:43, schrieb Bo Shen:

Quoted 3 lines

Hi Heiko,
Sorry for missing the subject typo error on v2 review.

Quoted 1 line

s/missign/missing.

Ups ... corrected ...

Quoted 1 line

I think it can be corrected when apply.

That would be great, thanks!

using this driver in SPL code with CONFIG_SPL_NAND_ECC configured leads in an compileerror. Fix this.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

[fix subject]

Signed-off-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

drivers/mtd/nand/atmel_nand.c | 1 +

1 file changed, 1 insertion(+)

erase one nand block in spl code. keep it simple, as size matters This is used on the upcoming taurus spl support.

Signed-off-by Heiko Schocher <[email protected]>

Acked-by Scott Wood <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Acked-by from Scott Wood
add Reviewed-by from Bo Shen

Changes in v2:
add comment from scott wood:
- move nand_erase_one into "include/nand.h" and rename it to spl_nand_erase_one

 drivers/mtd/nand/atmel_nand.c | 33 +++++++++++++++++++++++++++++++++
 include/nand.h                |  1 +
 2 files changed, 34 insertions(+)

erase one nand block in spl code. keep it simple, as size matters This is used on the upcoming taurus spl support.

Signed-off-by Heiko Schocher <[email protected]>

Acked-by Scott Wood <[email protected]>

Reviewed-by Bo Shen <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
add Acked-by from Scott Wood
add Reviewed-by from Bo Shen

Changes in v2:
add comment from scott wood:
- move nand_erase_one into "include/nand.h" and rename it to spl_nand_erase_one

drivers/mtd/nand/atmel_nand.c | 33 +++++++++++++++++++++++++++++++++
include/nand.h | 1 +

2 files changed, 34 insertions(+)

device ready pin is signalling that the device is ready on state 1 not on 0. Simmiliar as it is in drivers/mtd/nand/nand_spl_simple.c

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

Reviewed-by Bo Shen <[email protected]>

Acked-by Scott Wood <[email protected]>

---

Changes in v3:
add Acked-by from Scott Wood
add Reviewed-by from Bo Shen

Changes in v2:
add Reviewed-by: Andreas Bie?mann <[email protected]>

drivers/mtd/nand/atmel_nand.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

add support for using spl code on at91sam9260 and at91sam9g45 based boards.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add comment from Bo shen
- fix AT91_PMC_MCKR_CSS_MASK and AT91_PMC_MCKR_PRES_MASK
- make matrix_init weak, and add it in the taurus board code
- do not introduce ifdef mess for the differences between the SoCs, instead use a seperate file for each SoC:
- for armv5 (arm926ejs, now at91 series), named it spl_at91.c,
- for armv7 (cortex-a5, now, sama5d3), named it spl_atmel.c
- move common code to arch/arm/cpu/at91-common/spl.c

Changes in v2: None

 arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c  |  22 ++++
 arch/arm/cpu/arm926ejs/at91/clock.c                |  60 ++++++++++
 arch/arm/cpu/armv7/at91/clock.c                    |  27 +++++
 arch/arm/cpu/at91-common/Makefile                  |   5 +-
 arch/arm/cpu/at91-common/sdram.c                   |  77 +++++++++++++
 arch/arm/cpu/at91-common/spl.c                     |  89 +--------------
 arch/arm/cpu/at91-common/spl_at91.c                | 124 +++++++++++++++++++++
 arch/arm/cpu/at91-common/spl_atmel.c               |  76 +++++++++++++
 arch/arm/include/asm/arch-at91/at91_common.h       |   6 +
 arch/arm/include/asm/arch-at91/at91_pmc.h          |   1 +
 arch/arm/include/asm/arch-at91/at91sam9260.h       |   1 +
 .../arm/include/asm/arch-at91/at91sam9260_matrix.h |   5 +
 arch/arm/include/asm/arch-at91/at91sam9_sdramc.h   |  22 +++-
 13 files changed, 424 insertions(+), 91 deletions(-)
 create mode 100644 arch/arm/cpu/at91-common/sdram.c
 create mode 100644 arch/arm/cpu/at91-common/spl_at91.c
 create mode 100644 arch/arm/cpu/at91-common/spl_atmel.c

add support for using spl code on at91sam9260 and at91sam9g45 based boards.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

[adopt Bo's change in spl.c]

Signed-off-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
add comment from Bo shen
- fix AT91_PMC_MCKR_CSS_MASK and AT91_PMC_MCKR_PRES_MASK
- make matrix_init weak, and add it in the taurus board code
- do not introduce ifdef mess for the differences between the SoCs, instead use a seperate file for each SoC:
- for armv5 (arm926ejs, now at91 series), named it spl_at91.c,
- for armv7 (cortex-a5, now, sama5d3), named it spl_atmel.c
- move common code to arch/arm/cpu/at91-common/spl.c

Changes in v2: None

arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c  |  22 ++++
arch/arm/cpu/arm926ejs/at91/clock.c                |  60 ++++++++++
arch/arm/cpu/armv7/at91/clock.c                    |  27 +++++
arch/arm/cpu/at91-common/Makefile                  |   5 +-
arch/arm/cpu/at91-common/sdram.c                   |  77 +++++++++++++
arch/arm/cpu/at91-common/spl.c                     |  89 +--------------
arch/arm/cpu/at91-common/spl_at91.c                | 124 +++++++++++++++++++++
arch/arm/cpu/at91-common/spl_atmel.c               |  76 +++++++++++++
arch/arm/include/asm/arch-at91/at91_common.h       |   6 +
arch/arm/include/asm/arch-at91/at91_pmc.h          |   1 +
arch/arm/include/asm/arch-at91/at91sam9260.h       |   1 +
.../arm/include/asm/arch-at91/at91sam9260_matrix.h |   5 +
arch/arm/include/asm/arch-at91/at91sam9_sdramc.h   |  22 +++-
13 files changed, 424 insertions(+), 91 deletions(-)

create mode 100644 arch/arm/cpu/at91-common/sdram.c create mode 100644 arch/arm/cpu/at91-common/spl_at91.c create mode 100644 arch/arm/cpu/at91-common/spl_atmel.c

replaces the at91bootstrap code with SPL code.

make the spl image with:
./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

this writes the length of the spl image into the 6th execption vector. This is needed from the ROM bootloader.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add comment from Bo Shen:
- make matrix_init weak, and add it in taurs board code
- add Reviewed-by from Bo Shen

Changes in v2:
- rename function "nand_erase_one" to "spl_nand_erase_one" as Scott Wood suggested

arch/arm/Kconfig              |  1 +
board/siemens/taurus/taurus.c | 82 +++++++++++++++++++++++++++++++++++++------
configs/taurus_defconfig      |  5 +--
include/configs/taurus.h      | 52 ++++++++++++++++++++++++++-
4 files changed, 127 insertions(+), 13 deletions(-)

replaces the at91bootstrap code with SPL code.
make the spl image with:
./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

this writes the length of the spl image into the 6th execption vector. This is needed from the ROM bootloader.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- rename function "nand_erase_one" to "spl_nand_erase_one" as Scott Wood suggested
- add comment from Andreas Biessmann:
rename "MPDDRC_CR_EBISHARE" to "MPDDRC_CR_DQMS_SHARED"

 arch/arm/Kconfig             |   1 +
 board/siemens/corvus/board.c | 109 ++++++++++++++++++++++++++++++++++++++-----
 configs/corvus_defconfig     |   5 +-
 include/configs/corvus.h     |  54 +++++++++++++++++++--
 4 files changed, 151 insertions(+), 18 deletions(-)

replaces the at91bootstrap code with SPL code.
make the spl image with:
./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

this writes the length of the spl image into the 6th execption vector. This is needed from the ROM bootloader.

Signed-off-by Heiko Schocher <[email protected]>

Reviewed-by Bo Shen <[email protected]>

Reviewed-by Andreas Bie?mann <[email protected]>

---

Changes in v3:
add Reviewed-by from Bo Shen

Changes in v2:
- rename function "nand_erase_one" to "spl_nand_erase_one" as Scott Wood suggested
- add comment from Andreas Biessmann:

 rename "MPDDRC_CR_EBISHARE" to "MPDDRC_CR_DQMS_SHARED"

arch/arm/Kconfig             |   1 +
board/siemens/corvus/board.c | 109 ++++++++++++++++++++++++++++++++++++++-----
configs/corvus_defconfig     |   5 +-
include/configs/corvus.h     |  54 +++++++++++++++++++--
4 files changed, 151 insertions(+), 18 deletions(-)

This patchset add SPL support for the AT91SAM9G20 based taurus board, and the AT91SAM9M10G45 based corvus board from siemens, and replaces the at91bootstrap code.

The boot.bin which replaces the at91bootstrap image can created with mkimage:

./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

For other SoC this step is done in one step ... should we add this also for AT91 based boards?

For example add a "u-boot.at91" target in the Makefile?

This patchset is based on the common updates for the taurus and corvus board:

Patchwork [U-Boot] arm, at91: add generic board support for the taurus and corvus board
http://patchwork.ozlabs.org/patch/395398/
(now in mainline)

Patchwork [U-Boot] arm, at91: add spi dataflash support for the taurus board
http://patchwork.ozlabs.org/patch/395400/

Changes in v3:
rebased against 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6
add Reviewed-by from Bo Shen
add Acked-by from Scott Wood
add comment from Bo shen
- ignore 80 characters length as Bo Shen and Adreas Biessmann suggested
- fix AT91_PMC_MCKR_CSS_MASK and AT91_PMC_MCKR_PRES_MASK
- make matrix_init weak, and add it in the taurus board code
- do not introduce ifdef mess for the differences between the SoCs, instead use a seperate file for each SoC:
- for armv5 (arm926ejs, now at91 series), named it spl_at91.c,
- for armv7 (cortex-a5, now, sama5d3), named it spl_atmel.c
- move common code to arch/arm/cpu/at91-common/spl.c

Changes in v2:
- rebased against d58a9451e7339ed4cf2b2627e534611f427fb791
- spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header new in v2
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file instead define a default in the spi driver -> new patch for v2
- add Reviewed-by: Andreas Bie?mann <[email protected]>
- add comment from Andreas Biessmann:
rename "MPDDRC_CR_EBISHARE" to "MPDDRC_CR_DQMS_SHARED"
- add comment from scott wood:
move nand_erase_one into "include/nand.h" and rename it to spl_nand_erase_one

Hi Heiko,

Quoted 40 lines · Heiko Schocher

This patchset add SPL support for the AT91SAM9G20 based taurus board, and the AT91SAM9M10G45 based corvus board from siemens, and replaces the at91bootstrap code.

The boot.bin which replaces the at91bootstrap image can created with mkimage:

./tools/mkimage -T atmelimage -d spl/u-boot-spl.bin spl/boot.bin

For other SoC this step is done in one step ... should we add this also for AT91 based boards?

For example add a "u-boot.at91" target in the Makefile?

This patchset is based on the common updates for the taurus and corvus board:

Patchwork [U-Boot] arm, at91: add generic board support for the taurus and corvus board
http://patchwork.ozlabs.org/patch/395398/
(now in mainline)

Patchwork [U-Boot] arm, at91: add spi dataflash support for the taurus board
http://patchwork.ozlabs.org/patch/395400/

Changes in v3:
rebased against 571bdf16a78e9e116a93d46f4809c4f8a3f2adb6
add Reviewed-by from Bo Shen
add Acked-by from Scott Wood
add comment from Bo shen
- ignore 80 characters length as Bo Shen and Adreas Biessmann suggested
- fix AT91_PMC_MCKR_CSS_MASK and AT91_PMC_MCKR_PRES_MASK
- make matrix_init weak, and add it in the taurus board code
- do not introduce ifdef mess for the differences between the SoCs, instead use a seperate file for each SoC:
- for armv5 (arm926ejs, now at91 series), named it spl_at91.c,
- for armv7 (cortex-a5, now, sama5d3), named it spl_atmel.c
- move common code to arch/arm/cpu/at91-common/spl.c

Quoted 14 lines

Changes in v2:
- rebased against d58a9451e7339ed4cf2b2627e534611f427fb791
- spi, atmel: move CONFIG_SYS_SPI_WRITE_TOUT into common header new in v2
- add comment from Jagan Teki:
- remove spi_init_f() from board file
- remove CONFIG_SYS_SPI_WRITE_TOUT from board config file instead define a default in the spi driver -> new patch for v2
- add Reviewed-by: Andreas Bie?mann<[email protected]>
- add comment from Andreas Biessmann:
rename "MPDDRC_CR_EBISHARE" to "MPDDRC_CR_DQMS_SHARED"
- add comment from scott wood:
move nand_erase_one into "include/nand.h" and rename it to spl_nand_erase_one

for me this series looks good. Lets wait for Jagan's Ok for '[v3 PATCH 02/12] arm, at91: add spi dataflash support for the taurus board', then I'll apply it this weekend or so.