leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: at91sam9rlek: Use SPI-flash-based AT45xxx DataFlash

Browse Source 
To support driver model and device tree, use the SPI-flash-based
AT45xxx DataFlash driver, DataFlash is a kind of SPI flash.
Instead of ATMEL_DATAFLASH_SPI DataFlash older driver that will
be removed in the future.

Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Wenyou.Yang@microchip.com 2017-07-21 13:40:10 +08:00 committed by Tom Rini
parent eab36f6d7b
commit 56a61e5e27
6 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/dts/at91sam9rl.dtsi
View File

@ -34,6 +34,7 @@
ssc0 = &ssc0; ssc0 = &ssc0;
ssc1 = &ssc1; ssc1 = &ssc1;
pwm0 = &pwm0; pwm0 = &pwm0;
spi0 = &spi0;
}; };
cpus { cpus {

3
board/atmel/at91sam9rlek/at91sam9rlek.c
View File

@ -184,9 +184,6 @@ int board_init(void)
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
at91sam9rlek_nand_hw_init(); at91sam9rlek_nand_hw_init();
#endif #endif
#ifdef CONFIG_HAS_DATAFLASH
at91_spi0_hw_init(1 << 0);
#endif
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
at91sam9rlek_lcd_hw_init(); at91sam9rlek_lcd_hw_init();
#endif #endif

9
configs/at91sam9rlek_dataflash_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SOURCE is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
@ -34,6 +35,10 @@ CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_GENERIC_ATMEL_MCI=y CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
@ -43,4 +48,6 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_BOARD_INIT=y
CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y CONFIG_ATMEL_USART=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_SPI=y
CONFIG_LCD=y CONFIG_LCD=y

7
configs/at91sam9rlek_mmc_defconfig
View File

@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SOURCE is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
@ -34,6 +35,10 @@ CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_GENERIC_ATMEL_MCI=y CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
@ -43,4 +48,6 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_BOARD_INIT=y
CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y CONFIG_ATMEL_USART=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_SPI=y
CONFIG_LCD=y CONFIG_LCD=y

7
configs/at91sam9rlek_nandflash_defconfig
View File

@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SOURCE is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
@ -34,6 +35,10 @@ CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_GENERIC_ATMEL_MCI=y CONFIG_GENERIC_ATMEL_MCI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
@ -43,4 +48,6 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_BOARD_INIT=y
CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y CONFIG_ATMEL_USART=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_SPI=y
CONFIG_LCD=y CONFIG_LCD=y

19
include/configs/at91sam9rlek.h
View File

@ -53,15 +53,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR \
(ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE) (ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
/* DataFlash */
#define CONFIG_ATMEL_DATAFLASH_SPI
#define CONFIG_HAS_DATAFLASH 1
#define CONFIG_SYS_MAX_DATAFLASH_BANKS 1
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
#define AT91_SPI_CLK 15000000
#define DATAFLASH_TCSS (0x1a << 16)
#define DATAFLASH_TCHS (0x1 << 24)
/* NAND flash */ /* NAND flash */
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
#define CONFIG_NAND_ATMEL #define CONFIG_NAND_ATMEL
@ -89,11 +80,13 @@
#ifdef CONFIG_SYS_USE_DATAFLASH #ifdef CONFIG_SYS_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SIZE 0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0084000 0x22000000 0x210000; bootm" #define CONFIG_ENV_SECT_SIZE 0x210
#define CONFIG_ENV_SPI_MAX_HZ 15000000
#define CONFIG_BOOTCOMMAND "sf probe 0; " \
"sf read 0x22000000 0x84000 0x294000; " \
"bootm 0x22000000"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=atmel_nand:-(root) "\ "mtdparts=atmel_nand:-(root) "\