vexpress64: juno: add NOR flash detection
PATCH 1/2 vexpress64: juno: add NOR flash detection
This enables the vexpress64 to detect its NOR flash so that we can load kernel etc from it.
Signed-off-by Linus Walleij <[email protected]>
--- include/configs/vexpress_aemv8a.h | 41 ++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-)
include/configs/vexpress_aemv8a.h +23 -18
@@ -29,8 +29,6 @@/*#define CONFIG_ARMV8_SWITCH_TO_EL1*/ -#define CONFIG_SYS_NO_FLASH -#define CONFIG_SUPPORT_RAW_INITRD /* Cache Definitions */
@@ -56,14 +54,6 @@/* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT -/* CS register bases for the original memory map. */ -#define V2M_PA_CS0 0x00000000 -#define V2M_PA_CS1 0x14000000 -#define V2M_PA_CS2 0x18000000 -#define V2M_PA_CS3 0x1c000000 -#define V2M_PA_CS4 0x0c000000 -#define V2M_PA_CS5 0x10000000 -#define V2M_PERIPH_OFFSET (x) (x << 16)#define V2M_SYSREGS (V2M_PA_CS3 + V2M_PERIPH_OFFSET(1))#define V2M_SYSCTL (V2M_PA_CS3 + V2M_PERIPH_OFFSET(2))
@@ -71,13 +61,6 @@#define V2M_BASE 0x80000000 -/* -* Physical addresses, offset from V2M_PA_CS0-3 -*/ -#define V2M_NOR0 (V2M_PA_CS0) -#define V2M_NOR1 (V2M_PA_CS4) -#define V2M_SRAM (V2M_PA_CS1) -/* Common peripherals relative to CS7. */ #define V2M_AACI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(4))#define V2M_MMCI (V2M_PA_CS3 + V2M_PERIPH_OFFSET(5))
@@ -175,7 +158,6 @@#define CONFIG_CMD_DHCP #define CONFIG_CMD_PXE #define CONFIG_CMD_ENV -#define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI #define CONFIG_CMD_LOADB #define CONFIG_CMD_MEMORY
@@ -258,4 +240,27 @@#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 64/* max command args */ +/* Flash memory is available on the Juno board only */ +#ifndef CONFIG_TARGET_VEXPRESS64_JUNO +#define CONFIG_SYS_NO_FLASH +#else +#define CONFIG_CMD_FLASH +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_SYS_FLASH_BASE 0x08000000 +#define CONFIG_SYS_FLASH_SIZE 0x04000000/* 64 MiB */ +#define CONFIG_SYS_MAX_FLASH_BANKS 2 + +/* 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 */ + +/* 255 0x40000 sectors + first or last sector may have 4 erase regions = 259 */ +#define CONFIG_SYS_MAX_FLASH_SECT 259/* Max sectors */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes */ +#define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */ +#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ + +#endif +#endif /* __VEXPRESS_AEMV8A_H */
Signature · 1 line
1.9.3
PATCH 1/2 vexpress64: juno: add NOR flash detection
Quoted 4 lines · Linus Walleij
This enables the vexpress64 to detect its NOR flash so that we can load kernel etc from it.
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/20150306/fa7cfea6/attachment.sig>