| Message ID | 1439906060-18432-1-git-send-email-hs@denx.de |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | Andreas Bießmann |
| Headers | show |
Dear Heiko Schocher, Heiko Schocher <hs@denx.de> writes: >taurus changes: >- rename at91_spl_board_init to spl_board_init > fixes problems with recovery button and nand erase sector 0 >- adapt CONFIG_SPL_MAX_SIZE and CONFIG_SPL_BSS_MAX_SIZE >- add CONFIG_AT91_HW_WDT_TIMEOUT 15 >- CONFIG_SF_DEFAULT_MODE SPI_MODE_3 not mode 0 > >Signed-off-by: Heiko Schocher <hs@denx.de> >--- > >Changes in v2: >- add comments from Andreas Biessmann: > - rebase to 0d339cf9a969f0c249713d3697e735184f1bd955 > > board/siemens/taurus/taurus.c | 6 +++--- > include/configs/taurus.h | 9 +++++---- > 2 files changed, 8 insertions(+), 7 deletions(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Hi Heiko, On 08/21/2015 03:28 PM, Andreas Bießmann wrote: > Dear Heiko Schocher, > > Heiko Schocher <hs@denx.de> writes: >> taurus changes: >> - rename at91_spl_board_init to spl_board_init >> fixes problems with recovery button and nand erase sector 0 >> - adapt CONFIG_SPL_MAX_SIZE and CONFIG_SPL_BSS_MAX_SIZE >> - add CONFIG_AT91_HW_WDT_TIMEOUT 15 >> - CONFIG_SF_DEFAULT_MODE SPI_MODE_3 not mode 0 >> >> Signed-off-by: Heiko Schocher <hs@denx.de> >> --- >> >> Changes in v2: >> - add comments from Andreas Biessmann: >> - rebase to 0d339cf9a969f0c249713d3697e735184f1bd955 >> >> board/siemens/taurus/taurus.c | 6 +++--- >> include/configs/taurus.h | 9 +++++---- >> 2 files changed, 8 insertions(+), 7 deletions(-) > > applied to u-boot-atmel/master, thanks! sorry for the rash (automated) accepted mail. Please rebase onto fixed 'add axm extensions' Andreas > > Best regards, > Andreas Bießmann >
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 781727e..edeb15b 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -99,7 +99,7 @@ static int at91_is_recovery(void) } #endif -void at91_spl_board_init(void) +void spl_board_init(void) { taurus_nand_hw_init(); at91_spi0_hw_init(TAURUS_SPI_MASK); @@ -124,13 +124,13 @@ void at91_spl_board_init(void) if (at91_is_recovery() == 1) { struct spi_flash *flash; - debug("Recovery button pressed\n"); + puts("Recovery button pressed\n"); nand_init(); spl_nand_erase_one(0, 0); flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, 0, CONFIG_SF_DEFAULT_SPEED, - SPI_MODE_3); + CONFIG_SF_DEFAULT_MODE); if (!flash) { puts("no flash\n"); } else { diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 1a7e561..66b61c1 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -87,7 +87,7 @@ * leaving the correct space for initial global data structure above * that address while providing maximum stack area below. */ -# define CONFIG_SYS_INIT_SP_ADDR \ +#define CONFIG_SYS_INIT_SP_ADDR \ (ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) /* NAND flash */ @@ -111,6 +111,7 @@ #define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_AT91SAM9_WATCHDOG +#define CONFIG_AT91_HW_WDT_TIMEOUT 15 #if !defined(CONFIG_SPL_BUILD) /* Enable the watchdog */ #define CONFIG_HW_WATCHDOG @@ -145,8 +146,8 @@ #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 +#define CONFIG_SF_DEFAULT_SPEED 1000000 +#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 #endif /* load address */ @@ -252,7 +253,7 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #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 * 512) #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT
taurus changes: - rename at91_spl_board_init to spl_board_init fixes problems with recovery button and nand erase sector 0 - adapt CONFIG_SPL_MAX_SIZE and CONFIG_SPL_BSS_MAX_SIZE - add CONFIG_AT91_HW_WDT_TIMEOUT 15 - CONFIG_SF_DEFAULT_MODE SPI_MODE_3 not mode 0 Signed-off-by: Heiko Schocher <hs@denx.de> --- Changes in v2: - add comments from Andreas Biessmann: - rebase to 0d339cf9a969f0c249713d3697e735184f1bd955 board/siemens/taurus/taurus.c | 6 +++--- include/configs/taurus.h | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-)