diff mbox

[U-Boot,U-boot,v2,3/3] k2hk_evm: add script to automate NAND flash process

Message ID 1404475407-4486-4-git-send-email-ivan.khoronzhuk@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Ivan Khoronzhuk July 4, 2014, 12:03 p.m. UTC
Add script to automate NAND flash process. As for now the board has
two burn scripts - burn to boot from SPI NOR flash and burn to boot
from AEMIF NAND flash, rename burn_uboot script to burn_uboot_spi.
Also update README to contain NAND burn U-boot process description.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
 board/ti/k2hk_evm/README   | 28 +++++++++++++++++++++++++++-
 include/configs/k2hk_evm.h |  4 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)

Comments

Murali Karicheri July 7, 2014, 4:01 p.m. UTC | #1
On 07/04/2014 08:03 AM, Ivan Khoronzhuk wrote:
> Add script to automate NAND flash process. As for now the board has
> two burn scripts - burn to boot from SPI NOR flash and burn to boot
> from AEMIF NAND flash, rename burn_uboot script to burn_uboot_spi.
> Also update README to contain NAND burn U-boot process description.
>
> Signed-off-by: Ivan Khoronzhuk<ivan.khoronzhuk@ti.com>
> ---
>   board/ti/k2hk_evm/README   | 28 +++++++++++++++++++++++++++-
>   include/configs/k2hk_evm.h |  4 +++-
>   2 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/board/ti/k2hk_evm/README b/board/ti/k2hk_evm/README
> index bfeb05b..7426b8d 100644
> --- a/board/ti/k2hk_evm/README
> +++ b/board/ti/k2hk_evm/README
> @@ -38,11 +38,13 @@ board configuration file: include/configs/k2hk_evm.h
>
>   Supported boot modes:
>    - SPI NOR boot
> + - AEMIF NAND boot
>
>   Supported image formats:-
>    - u-boot.bin: for loading and running u-boot.bin through Texas instruments
>                  code composure studio (CCS)
>    - u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot
> + - u-boot-nand.gph: gpimage for programming AEMIF NAND flash for NAND boot
>
>   Build instructions:
>   ===================
> @@ -55,6 +57,10 @@ To build u-boot-spi.gph
>     >make k2hk_evm_config
>     >make u-boot-spi.gph
>
> +To build u-boot-nand.gph
> +>make k2hk_evm_config
> +>make u-boot-nand.gph
> +
>   Load and Run U-Boot on K2HK EVM using CCS
>   =========================================
>
> @@ -115,8 +121,28 @@ instructions:-
>   5. At the U-Boot console type following to setup u-boot environment variables.
>      setenv addr_uboot 0x87000000
>      setenv filesize<size in hex of u-boot-spi.gph rounded to hex 0x10000>
> -   run burn_uboot
> +   run burn_uboot_spi
>      Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
>      to "SPI Little Endian Boot mode" as per instruction at
>      http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup.
>   6. Power ON the EVM. The EVM now boots with u-boot image on the NOR flash.
> +
> +AEMIF NAND Flash programming instructions
> +======================================
> +U-Boot image can be flashed to first 1024KB of the NAND flash using following
> +instructions:-
> +
> +1. Start CCS and run U-boot as described above.
> +2. Suspend Target. Select Run ->  Suspend from top level menu
> +   CortexA15_1 (Free Running)"
> +3. Load u-boot-nand.gph binary from build folder on to DDR address 0x87000000
> +   through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM
> +   using CCS", but using address 0x87000000.
> +4. Free Run the target as desribed earlier (step 4) to get u-boot prompt
> +5. At the U-Boot console type following to setup u-boot environment variables.
> +   setenv filesize<size in hex of u-boot-nand.gph rounded to hex 0x10000>
> +   run burn_uboot_nand
> +   Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
> +   to "ARM NAND Boot mode" as per instruction at
> +   http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup.
> +6. Power ON the EVM. The EVM now boots with u-boot image on the NAND flash.
> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
> index 3f87741..63e0249 100644
> --- a/include/configs/k2hk_evm.h
> +++ b/include/configs/k2hk_evm.h
> @@ -221,8 +221,10 @@
>   	"get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"	\
>   	"get_mon_ubi=ubifsload ${addr_mon} ${name_mon}\0"		\
>   	"get_uboot_net=dhcp ${addr_uboot} ${tftp_root}/${name_uboot}\0"	\
> -	"burn_uboot=sf probe; sf erase 0 0x100000; "			\
> +	"burn_uboot_spi=sf probe; sf erase 0 0x100000; "		\
>   		"sf write ${addr_uboot} 0 ${filesize}\0"		\
> +	"burn_uboot_nand=nand erase 0 0x100000; "			\
> +		"nand write ${addr_uboot} 0 ${filesize}\0"		\
>   	"args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1\0"	\
>   	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
>   		"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"	\
Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Tom Rini July 26, 2014, 1:25 a.m. UTC | #2
On Fri, Jul 04, 2014 at 03:03:27PM +0300, Khoronzhuk, Ivan wrote:

> Add script to automate NAND flash process. As for now the board has
> two burn scripts - burn to boot from SPI NOR flash and burn to boot
> from AEMIF NAND flash, rename burn_uboot script to burn_uboot_spi.
> Also update README to contain NAND burn U-boot process description.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Acked-by: Murali Karicheri <m-karicheri2@ti.com>

Applied to u-boot-ti/master, thanks!
diff mbox

Patch

diff --git a/board/ti/k2hk_evm/README b/board/ti/k2hk_evm/README
index bfeb05b..7426b8d 100644
--- a/board/ti/k2hk_evm/README
+++ b/board/ti/k2hk_evm/README
@@ -38,11 +38,13 @@  board configuration file: include/configs/k2hk_evm.h
 
 Supported boot modes:
  - SPI NOR boot
+ - AEMIF NAND boot
 
 Supported image formats:-
  - u-boot.bin: for loading and running u-boot.bin through Texas instruments
                code composure studio (CCS)
  - u-boot-spi.gph: gpimage for programming SPI NOR flash for SPI NOR boot
+ - u-boot-nand.gph: gpimage for programming AEMIF NAND flash for NAND boot
 
 Build instructions:
 ===================
@@ -55,6 +57,10 @@  To build u-boot-spi.gph
   >make k2hk_evm_config
   >make u-boot-spi.gph
 
+To build u-boot-nand.gph
+  >make k2hk_evm_config
+  >make u-boot-nand.gph
+
 Load and Run U-Boot on K2HK EVM using CCS
 =========================================
 
@@ -115,8 +121,28 @@  instructions:-
 5. At the U-Boot console type following to setup u-boot environment variables.
    setenv addr_uboot 0x87000000
    setenv filesize <size in hex of u-boot-spi.gph rounded to hex 0x10000>
-   run burn_uboot
+   run burn_uboot_spi
    Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
    to "SPI Little Endian Boot mode" as per instruction at
    http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup.
 6. Power ON the EVM. The EVM now boots with u-boot image on the NOR flash.
+
+AEMIF NAND Flash programming instructions
+======================================
+U-Boot image can be flashed to first 1024KB of the NAND flash using following
+instructions:-
+
+1. Start CCS and run U-boot as described above.
+2. Suspend Target. Select Run -> Suspend from top level menu
+   CortexA15_1 (Free Running)"
+3. Load u-boot-nand.gph binary from build folder on to DDR address 0x87000000
+   through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM
+   using CCS", but using address 0x87000000.
+4. Free Run the target as desribed earlier (step 4) to get u-boot prompt
+5. At the U-Boot console type following to setup u-boot environment variables.
+   setenv filesize <size in hex of u-boot-nand.gph rounded to hex 0x10000>
+   run burn_uboot_nand
+   Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
+   to "ARM NAND Boot mode" as per instruction at
+   http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup.
+6. Power ON the EVM. The EVM now boots with u-boot image on the NAND flash.
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 3f87741..63e0249 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -221,8 +221,10 @@ 
 	"get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0"	\
 	"get_mon_ubi=ubifsload ${addr_mon} ${name_mon}\0"		\
 	"get_uboot_net=dhcp ${addr_uboot} ${tftp_root}/${name_uboot}\0"	\
-	"burn_uboot=sf probe; sf erase 0 0x100000; "			\
+	"burn_uboot_spi=sf probe; sf erase 0 0x100000; "		\
 		"sf write ${addr_uboot} 0 ${filesize}\0"		\
+	"burn_uboot_nand=nand erase 0 0x100000; "			\
+		"nand write ${addr_uboot} 0 ${filesize}\0"		\
 	"args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1\0"	\
 	"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "	\
 		"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"	\