Patchwork [U-Boot] arm: at91sam9x5: add dataflash boot support

login
register
mail settings
Submitter Bo Shen
Date Dec. 7, 2012, 7:37 a.m.
Message ID <1354865824-6020-1-git-send-email-voice.shen@atmel.com>
Download mbox | patch
Permalink /patch/204413/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Bo Shen - Dec. 7, 2012, 7:37 a.m.
Add dataflash boot support on at91sam9x5ek board

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 boards.cfg                     |    1 +
 include/configs/at91sam9x5ek.h |   10 ++++++++++
 2 files changed, 11 insertions(+)
Andreas Bießmann - Dec. 9, 2012, 9:35 p.m.
Dear Bo Shen,

On 07.12.2012 08:37, Bo Shen wrote:
> Add dataflash boot support on at91sam9x5ek board

sorry, but this patch do not apply cleanly on top of current 
u-boot-arm/master. It seems the mmc (SYS_USE_MMC) is missing there. Can 
you please rebase or provide the other patches?

Best regards

Andreas Bießmann

>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
>   boards.cfg                     |    1 +
>   include/configs/at91sam9x5ek.h |   10 ++++++++++
>   2 files changed, 11 insertions(+)
>
> diff --git a/boards.cfg b/boards.cfg
> index 70a1569..e799d9b 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -97,6 +97,7 @@ at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel
>   at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
>   at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
>   at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
> +at91sam9x5ek_dataflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_DATAFLASH
>   at91sam9x5ek_spiflash        arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH
>   at91sam9x5ek_mmc             arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_MMC
>   at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index 1317582..a034ed0 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -178,6 +178,16 @@
>   #define CONFIG_BOOTCOMMAND	"sf probe 0; " \
>   				"sf read 0x22000000 0x100000 0x300000; " \
>   				"bootm 0x22000000"
> +#elif defined(CONFIG_SYS_USE_DATAFLASH)
> +/* bootstrap + u-boot + env + linux in data flash */
> +#define CONFIG_ENV_IS_IN_SPI_FLASH
> +#define CONFIG_ENV_OFFSET	0x4200
> +#define CONFIG_ENV_SIZE		0x4200
> +#define CONFIG_ENV_SECT_SIZE	0x210
> +#define CONFIG_ENV_SPI_MAX_HZ	30000000
> +#define CONFIG_BOOTCOMMAND	"sf probe 0; " \
> +				"sf read 0x22000000 0x84000 0x294000; " \
> +				"bootm 0x22000000"
>   #else /* CONFIG_SYS_USE_MMC */
>   /* bootstrap + u-boot + env + linux in mmc */
>   #define CONFIG_ENV_IS_IN_MMC
>
Andreas Bießmann - Dec. 9, 2012, 9:49 p.m.
Dear Bo Shen,

On 09.12.2012 22:35, Andreas Bießmann wrote:
> Dear Bo Shen,
>
> On 07.12.2012 08:37, Bo Shen wrote:
>> Add dataflash boot support on at91sam9x5ek board
>
> sorry, but this patch do not apply cleanly on top of current
> u-boot-arm/master. It seems the mmc (SYS_USE_MMC) is missing there. Can
> you please rebase or provide the other patches?

... got it: http://patchwork.ozlabs.org/patch/196532/ it is awaiting 
upstream via u-boot-mmc, sorry, this patch has to wait.

Best regards

Andreas Bießmann
Andreas Bießmann - Jan. 9, 2013, 4:17 p.m.
Dear Bo Shen,

Albert Aribaud agreed to apply this one to u-boot-arm/master for the
upcoming release.

On 07.12.2012 08:37, Bo Shen wrote:
> Add dataflash boot support on at91sam9x5ek board
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>

> ---
>  boards.cfg                     |    1 +
>  include/configs/at91sam9x5ek.h |   10 ++++++++++
>  2 files changed, 11 insertions(+)

Best regards

Andreas Bießmann
Andreas Bießmann - Jan. 12, 2013, 9:44 a.m.
Dear Albert Aribaud,

On 09.01.13 17:17, Andreas Bießmann wrote:
> Dear Bo Shen,
> 
> Albert Aribaud agreed to apply this one to u-boot-arm/master for the
> upcoming release.

gentle reminder ...

Best regards

Andreas Bießmann
Albert ARIBAUD - Jan. 12, 2013, 12:25 p.m.
Hi Bo,

On Fri,  7 Dec 2012 15:37:04 +0800, Bo Shen <voice.shen@atmel.com>
wrote:

> Add dataflash boot support on at91sam9x5ek board
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
>  boards.cfg                     |    1 +
>  include/configs/at91sam9x5ek.h |   10 ++++++++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/boards.cfg b/boards.cfg
> index 70a1569..e799d9b 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -97,6 +97,7 @@ at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel
>  at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
>  at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
>  at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
> +at91sam9x5ek_dataflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_DATAFLASH
>  at91sam9x5ek_spiflash        arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH
>  at91sam9x5ek_mmc             arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_MMC
>  at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index 1317582..a034ed0 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -178,6 +178,16 @@
>  #define CONFIG_BOOTCOMMAND	"sf probe 0; " \
>  				"sf read 0x22000000 0x100000 0x300000; " \
>  				"bootm 0x22000000"
> +#elif defined(CONFIG_SYS_USE_DATAFLASH)
> +/* bootstrap + u-boot + env + linux in data flash */
> +#define CONFIG_ENV_IS_IN_SPI_FLASH
> +#define CONFIG_ENV_OFFSET	0x4200
> +#define CONFIG_ENV_SIZE		0x4200
> +#define CONFIG_ENV_SECT_SIZE	0x210
> +#define CONFIG_ENV_SPI_MAX_HZ	30000000
> +#define CONFIG_BOOTCOMMAND	"sf probe 0; " \
> +				"sf read 0x22000000 0x84000 0x294000; " \
> +				"bootm 0x22000000"
>  #else /* CONFIG_SYS_USE_MMC */
>  /* bootstrap + u-boot + env + linux in mmc */
>  #define CONFIG_ENV_IS_IN_MMC

Applied to u-boot-arm/master, thanks!

Amicalement,

Patch

diff --git a/boards.cfg b/boards.cfg
index 70a1569..e799d9b 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -97,6 +97,7 @@  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel
 at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
 at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
+at91sam9x5ek_dataflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_DATAFLASH
 at91sam9x5ek_spiflash        arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH
 at91sam9x5ek_mmc             arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_MMC
 at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 1317582..a034ed0 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -178,6 +178,16 @@ 
 #define CONFIG_BOOTCOMMAND	"sf probe 0; " \
 				"sf read 0x22000000 0x100000 0x300000; " \
 				"bootm 0x22000000"
+#elif defined(CONFIG_SYS_USE_DATAFLASH)
+/* bootstrap + u-boot + env + linux in data flash */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_OFFSET	0x4200
+#define CONFIG_ENV_SIZE		0x4200
+#define CONFIG_ENV_SECT_SIZE	0x210
+#define CONFIG_ENV_SPI_MAX_HZ	30000000
+#define CONFIG_BOOTCOMMAND	"sf probe 0; " \
+				"sf read 0x22000000 0x84000 0x294000; " \
+				"bootm 0x22000000"
 #else /* CONFIG_SYS_USE_MMC */
 /* bootstrap + u-boot + env + linux in mmc */
 #define CONFIG_ENV_IS_IN_MMC