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

taurus, spl: erase also spi flash if recovery button is pressed 

if in SPL mode recovery button is pressed, erase also spi flash
from offset 0 to CONFIG_SYS_NAND_U_BOOT_SIZE on the taurus board.

Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Heiko Schocher 2014-11-18 09:41:58 +01:00 committed by Andreas Bießmann
parent 389aee8930
commit a1655bb2e1
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
board/siemens/taurus/taurus.c
View File

@ -68,6 +68,7 @@ static void taurus_nand_hw_init(void)
#if defined(CONFIG_SPL_BUILD) #if defined(CONFIG_SPL_BUILD)
#include <spl.h> #include <spl.h>
#include <nand.h> #include <nand.h>
#include <spi_flash.h>
void matrix_init(void) void matrix_init(void)
{ {
@ -81,23 +82,28 @@ void matrix_init(void)
void at91_spl_board_init(void) void at91_spl_board_init(void)
{ {
taurus_nand_hw_init(); taurus_nand_hw_init();
at91_spi0_hw_init(TAURUS_SPI_MASK);
/* Configure recovery button PINs */ /* Configure recovery button PINs */
at91_set_gpio_input(AT91_PIN_PA31, 1); at91_set_gpio_input(AT91_PIN_PA31, 1);
/* check if button is pressed */ /* check if button is pressed */
if (at91_get_gpio_value(AT91_PIN_PA31) == 0) { if (at91_get_gpio_value(AT91_PIN_PA31) == 0) {
u32 boot_device; struct spi_flash *flash;
debug("Recovery button pressed\n"); debug("Recovery button pressed\n");
boot_device = spl_boot_device(); nand_init();
switch (boot_device) { spl_nand_erase_one(0, 0);
#ifdef CONFIG_SPL_NAND_SUPPORT flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
case BOOT_DEVICE_NAND: 0,
nand_init(); CONFIG_SF_DEFAULT_SPEED,
spl_nand_erase_one(0, 0); SPI_MODE_3);
break; if (!flash) {
#endif puts("no flash\n");
} else {
puts("erase spi flash sector 0\n");
spi_flash_erase(flash, 0,
CONFIG_SYS_NAND_U_BOOT_SIZE);
} }
} }
} }

18
include/configs/taurus.h
View File

@ -142,6 +142,19 @@
#define TAURUS_SPI_MASK (1 << 4) #define TAURUS_SPI_MASK (1 << 4)
#define TAURUS_SPI_CS_PIN AT91_PIN_PA3 #define TAURUS_SPI_CS_PIN AT91_PIN_PA3
#if defined(CONFIG_SPL_BUILD)
/* SPL related */
#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */
#define CONFIG_SPL_SPI_SUPPORT
#define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_SPEED 10000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#endif
/* load address */ /* load address */
#define CONFIG_SYS_LOAD_ADDR 0x22000000 #define CONFIG_SYS_LOAD_ADDR 0x22000000
@ -176,8 +189,11 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK
#define CONFIG_SPL_TEXT_BASE 0x0 #define CONFIG_SPL_TEXT_BASE 0x0
#define CONFIG_SPL_MAX_SIZE (11 * 1024) #define CONFIG_SPL_MAX_SIZE (14 * 1024)
#define CONFIG_SPL_STACK (16 * 1024) #define CONFIG_SPL_STACK (16 * 1024)
#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_TEXT_BASE - \
CONFIG_SYS_MALLOC_LEN)
#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN
#define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_MAX_SIZE
#define CONFIG_SPL_BSS_MAX_SIZE (3 * 1024) #define CONFIG_SPL_BSS_MAX_SIZE (3 * 1024)