linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

board: at91sam9260ek: 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:11 +08:00
committed by Tom Rini
parent 56a61e5e27
commit f166af88a8
16 changed files with 98 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
tcb1 = &tcb1; tcb1 = &tcb1;
i2c0 = &i2c0; i2c0 = &i2c0;
ssc0 = &ssc0; ssc0 = &ssc0;
spi0 = &spi0;
}; };
cpus { cpus {
#address-cells = <0>; #address-cells = <0>;

2
arch/arm/dts/at91sam9260ek.dts
View File

@ -118,7 +118,7 @@
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
mtd_dataflash@0 { mtd_dataflash@0 {
compatible = "atmel,at45", "atmel,dataflash"; compatible = "atmel,at45", "atmel,dataflash";
spi-max-frequency = <50000000>; spi-max-frequency = <15000000>;
reg = <1>; reg = <1>;
}; };
}; };

2
arch/arm/dts/at91sam9g20ek_common.dtsi
View File

@ -99,7 +99,7 @@
cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
mtd_dataflash@0 { mtd_dataflash@0 {
compatible = "atmel,at45", "atmel,dataflash"; compatible = "atmel,at45", "atmel,dataflash";
spi-max-frequency = <50000000>; spi-max-frequency = <15000000>;
reg = <1>; reg = <1>;
}; };
}; };

4
board/atmel/at91sam9260ek/at91sam9260ek.c
View File

@ -87,10 +87,6 @@ int board_init(void)
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
at91sam9260ek_nand_hw_init(); at91sam9260ek_nand_hw_init();
#endif #endif
#ifdef CONFIG_HAS_DATAFLASH
at91_spi0_hw_init((1 << 0) | (1 << 1));
#endif
return 0; return 0;
} }

9
configs/at91sam9260ek_dataflash_cs0_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

9
configs/at91sam9260ek_dataflash_cs1_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

7
configs/at91sam9260ek_nandflash_defconfig
View File

@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

7
configs/at91sam9g20ek_2mmc_defconfig
View File

@ -16,6 +16,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_USB=y CONFIG_CMD_USB=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
@ -31,6 +32,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_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -42,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

7
configs/at91sam9g20ek_2mmc_nandflash_defconfig
View File

@ -16,6 +16,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_USB=y CONFIG_CMD_USB=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
@ -31,6 +32,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_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -42,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

9
configs/at91sam9g20ek_dataflash_cs0_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

9
configs/at91sam9g20ek_dataflash_cs1_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

7
configs/at91sam9g20ek_nandflash_defconfig
View File

@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

9
configs/at91sam9xeek_dataflash_cs0_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

9
configs/at91sam9xeek_dataflash_cs1_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek" CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1" CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
CONFIG_ENV_IS_IN_DATAFLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SYS_PROMPT="U-Boot> " CONFIG_SYS_PROMPT="U-Boot> "
@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

7
configs/at91sam9xeek_nandflash_defconfig
View File

@ -15,6 +15,7 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
# CONFIG_CMD_LOADS is not set # CONFIG_CMD_LOADS is not set
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y
CONFIG_CMD_SF=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=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
@ -29,6 +30,10 @@ CONFIG_CLK_AT91=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_AT91_GPIO=y CONFIG_AT91_GPIO=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_ATMEL=y
CONFIG_SPI_FLASH_DATAFLASH=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_PINCTRL=y CONFIG_PINCTRL=y
@ -40,5 +45,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
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_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

40
include/configs/at91sam9260ek.h
View File

@ -93,25 +93,6 @@
# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK # define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
#endif #endif
#ifndef CONFIG_AT91SAM9G20EK_2MMC
/* DataFlash */
#define CONFIG_ATMEL_DATAFLASH_SPI
#define CONFIG_HAS_DATAFLASH 1
#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */
#define AT91_SPI_CLK 15000000
#else
/* Enable MMC. The MCCK is conflicted with DataFlash */
#endif
#ifdef CONFIG_AT91SAM9G20EK
#define DATAFLASH_TCSS (0x22 << 16)
#else
#define DATAFLASH_TCSS (0x1a << 16)
#endif
#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
@ -141,11 +122,13 @@
#ifdef CONFIG_SYS_USE_DATAFLASH_CS0 #ifdef CONFIG_SYS_USE_DATAFLASH_CS0
/* 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: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) " \
@ -153,12 +136,13 @@
#elif CONFIG_SYS_USE_DATAFLASH_CS1 #elif CONFIG_SYS_USE_DATAFLASH_CS1
/* bootstrap + u-boot + env + linux in dataflash on CS1 */ #define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x4200 #define CONFIG_ENV_SIZE 0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xD0084000 0x22000000 0x210000; bootm" #define CONFIG_ENV_SECT_SIZE 0x210
#define CONFIG_ENV_SPI_MAX_HZ 15000000
#define CONFIG_BOOTCOMMAND "sf probe 0:1; " \
"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) " \