common/armflash: Support for ARM flash images
PATCH v2 1/3 common/armflash: Support for ARM flash images
The ARM reference designs all use a special flash image format that stores a footer (two versions exist) at the end of the last erase block of the image in flash memory.
Version one of the footer is indicated by the magic number 0xA0FFFF9F at 12 bytes before the end of the flash block and version two is indicated by the magic number 0x464F4F54 0x464C5348 (ASCII for "FLSHFOOT") in the very last 8 bytes of the erase block.
This command driver implements support for both versions of the AFS images (the name comes from the Linux driver in drivers/mtd/afs.c) and makes it possible to list images and load an image by name into the memory with these commands:
afs - lists flash contents
afs load <image> - loads image to address indicated in the image afs load <image> <addres> - loads image to a specified address
This image scheme is used on the ARM Integrator family, ARM Versatile family, ARM RealView family (not yet supported in U-Boot) and ARM Versatile Express family up to and including the new Juno board for 64 bit development.
---
ChangeLog v1->v2:
- Fix a small compiler warning about unused "secstart" variable
- Add Tom's ACK
--- common/Kconfig | 6 ++ common/Makefile | 1 + common/cmd_armflash.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 285 insertions(+) create mode 100644 common/cmd_armflash.c
common/Kconfig +6 -0
@@ -193,6 +193,12 @@ config CMD_FLASH erase - FLASH memory protect - enable or disable FLASH write protection +config CMD_ARMFLASH + depends on FLASH_CFI_DRIVER + bool "armflash" + help + ARM Ltd reference designs flash partition access + config CMD_NAND bool "nand" help
common/Makefile +1 -0
@@ -60,6 +60,7 @@ obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command obj-$(CONFIG_CMD_AES) += cmd_aes.o obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o obj-$(CONFIG_SOURCE) += cmd_source.o obj-$(CONFIG_CMD_SOURCE) += cmd_source.o obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
common/cmd_armflash.c new file +278 -0
278 lines not on this page · raw message
Signature · 1 line
1.9.3
PATCH v2 2/3 vexpress64: juno: add default NOR flash boot
This modifies the vexpress64 Juno configuration so that it will by default load and boot a kernel and a device tree from the images stored in the NOR flash. When we are at it, also define the proper command line for the Juno and indicate that the USB stick (/dev/sda1) is the default root file system.
---
ChangeLog v1->v2:
- Rebase on the upstream baseline
- Add Tom's ACK
--- include/configs/vexpress_aemv8a.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
include/configs/vexpress_aemv8a.h +29 -1
@@ -198,7 +198,34 @@#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1/* Initial environment variables */ -#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +/* +* Defines where the kernel and FDT exist in NOR flash and where it will +* be copied into DRAM +*/ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ + "kernel_addr=0x80000000\0" \ + "fdt_name=juno\0" \ + "fdt_addr=0x83000000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + +/* Assume we boot with root on the first partition of a USB stick */ +#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \ + "root=/dev/sda1 rw " \ + "earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\ + "loglevel=9" + +/* Copy the kernel and FDT to DRAM memory and boot */ +#define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \ + "afs load ${fdt_name} ${fdt_addr} ; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "booti ${kernel_addr} - ${fdt_addr}" + +#define CONFIG_BOOTDELAY 1 + +#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=uImage\0" \ "kernel_addr=0x80000000\0" \
@@ -246,6 +273,7 @@#define CONFIG_SYS_NO_FLASH #else #define CONFIG_CMD_FLASH +#define CONFIG_CMD_ARMFLASH #define CONFIG_SYS_FLASH_CFI 1#define CONFIG_FLASH_CFI_DRIVER 1#define CONFIG_SYS_FLASH_BASE 0x08000000
Signature · 1 line
1.9.3
PATCH v2 2/3 vexpress64: juno: add default NOR flash boot
Quoted 9 lines · Linus Walleij
This modifies the vexpress64 Juno configuration so that it will by default load and boot a kernel and a device tree from the images stored in the NOR flash. When we are at it, also define the proper command line for the Juno and indicate that the USB stick (
/dev/sda1) is the default root file system.Reviewed-by Tom Rini <[email protected]>Signed-off-by Linus Walleij <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150410/cd193c2f/attachment.sig>
PATCH v2 3/3 integrator: consolidate flash info
In reply to Linus WalleijThis consolidates the flash settings for the Integrator and activates the new ARM flash image support for them so images can be loaded by name from flash.
---
ChangeLog v1->v2:
- Rebase on the upstream baseline
- Add Tom's ACK
--- include/configs/integrator-common.h | 22 ++++++++++++++++++++++ include/configs/integratorap.h | 16 +++------------- include/configs/integratorcp.h | 22 ++-------------------- 3 files changed, 27 insertions(+), 33 deletions(-)
include/configs/integrator-common.h +22 -0
@@ -86,3 +86,25 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE)#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET + +/* +* FLASH and environment organization +* Top varies according to amount fitted +* Reserve top 4 blocks of flash +* - ARM Boot Monitor +* - Unused +* - SIB block +* - U-Boot environment +*/ +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_ARMFLASH +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_BASE 0x24000000 +#define CONFIG_SYS_MAX_FLASH_BANKS 1 + +/* Timeout values in ticks */ +#define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ)/* Erase Timeout */ +#define CONFIG_SYS_FLASH_WRITE_TOUT (2 * CONFIG_SYS_HZ)/* Write Timeout */ +#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */ +#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */
include/configs/integratorap.h +3 -13
@@ -55,22 +55,12 @@*/ #define CONFIG_SYS_PROMPT "Integrator-AP # "/* Monitor Command Prompt */ -#define CONFIG_SYS_FLASH_BASE 0x24000000 - -/*----------------------------------------------------------------------- -* FLASH and environment organization -*/ -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_MAX_FLASH_BANKS 1/* max number of memory banks */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ)/* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ)/* Timeout for Flash Write */ +/* Flash settings */ +#define CONFIG_SYS_FLASH_SIZE 0x02000000/* 32 MiB */ #define CONFIG_SYS_MAX_FLASH_SECT 128 +#define CONFIG_ENV_IS_NOWHERE 1#define CONFIG_ENV_SIZE 32768 -/*----------------------------------------------------------------------- * PCI definitions */
include/configs/integratorcp.h +2 -20
@@ -55,28 +55,10 @@*/ #define CONFIG_SYS_PROMPT "Integrator-CP # "/* Monitor Command Prompt */ -/* -* FLASH and environment organization -* Top varies according to amount fitted -* Reserve top 4 blocks of flash -* - ARM Boot Monitor -* - Unused -* - SIB block -* - U-Boot environment -* -* Base is always 0x24000000 -*/ -#define CONFIG_SYS_FLASH_BASE 0x24000000 -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_SYS_MAX_FLASH_SECT 64 -#define CONFIG_SYS_MAX_FLASH_BANKS 1/* max number of memory banks */ #define PHYS_FLASH_SIZE 0x01000000/* 16MB */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ)/* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ)/* Timeout for Flash Write */ - -#define CONFIG_SYS_MONITOR_LEN 0x00100000 +#define CONFIG_SYS_MAX_FLASH_SECT 64#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_SYS_MONITOR_LEN 0x00100000/* * Move up the U-Boot & monitor area if more flash is fitted.
Signature · 1 line
1.9.3
PATCH v2 3/3 integrator: consolidate flash info
Quoted 6 lines · Linus Walleij
This consolidates the flash settings for the Integrator and activates the new ARM flash image support for them so images can be loaded by name from flash.
Reviewed-by Tom Rini <[email protected]>Signed-off-by Linus Walleij <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150410/d01bf418/attachment.sig>
PATCH v2 1/3 common/armflash: Support for ARM flash images
In reply to Linus WalleijQuoted 18 lines · Linus Walleij
The ARM reference designs all use a special flash image format that stores a footer (two versions exist) at the end of the last erase block of the image in flash memory.
Version one of the footer is indicated by the magic number
0xA0FFFF9Fat 12 bytes before the end of the flash block and version two is indicated by the magic number0x464F4F540x464C5348(ASCII for "FLSHFOOT") in the very last 8 bytes of the erase block.This command driver implements support for both versions of the AFS images (the name comes from the Linux driver in
drivers/mtd/afs.c) and makes it possible to list images and load an image by name into the memory with these commands:afs - lists flash contents
afs load <image> - loads image to address indicated in the image afs load <image> <addres> - loads image to a specified address
Quoted 7 lines
This image scheme is used on the ARM Integrator family, ARM Versatile family, ARM RealView family (not yet supported in U-Boot) and ARM Versatile Express family up to and including the new Juno board for 64 bit development.
Reviewed-by Tom Rini <[email protected]>Signed-off-by Linus Walleij <[email protected]>
Applied to u-boot/master, since Juno fails to build without this series, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150410/70796c15/attachment.sig>