Hi Stefan, On Fri, 6 Jul 2012 09:01:07 +0200, Stefan Roese <s...@denx.de> wrote: > Hi Albert, > > as requested, I rebased my staging repository with the SPEAr patches > onto latest u-boot-arm/master. Please try again. > > Thanks, > Stefan > > > The following changes since commit 8663092787ac2c39fbdb235cd162c5e893646b40: > > cm-t35: fix incorrect NAND_ECC layout selection (2012-07-05 19:22:27 +0200) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-staging s...@denx.de > > for you to fetch changes up to b36215ee1a532603d4f94a8a78f7a581068c7377: > > MTD: SPEAr SMI: Add write support for length < 4 bytes (2012-07-06 08:28:31 > +0200) > > ---------------------------------------------------------------- > Amit Virdi (10): > st_smi: Return error in case TFF is not set > st_smi: Change SMI timeout values > st_smi: Enhance the error handling > st_smi: Change timeout loop implementation > SPEAr: Fix ARM relocation support > SPEAr: Eliminate dependency on Xloader table > SPEAr: Initialize SNOR in early_board_init_f > SPEAr: Remove CONFIG_MTD_NAND_VERIFY_WRITE to speed up NAND access > cleanup/SPEAr: Remove unnecessary parenthesis > cleanup/SPEAr: Define configuration flags more elegantly > > Armando Visconti (4): > st_smi: Removed no needed dependency on ST_M25Pxx_ID > st_smi: Change the flash probing method > st_smi: Fix bug in flash_print_info() > st_smi: Fixed page size for Winbond W25Q128FV flash > > Shiraz Hashim (5): > st_smi: Move status register read before modifying ctrl register > SPEAr: Enable autoneg for ethernet > SPEAr: Enable dcache for fast file transfer > SPEAr: explicitly select clk src for UART > SPEAr: Correct SoC ID offset in misc configuration space > > Simon Glass (1): > arm: Don't use printf() in SPL builds > > Stefan Roese (10): > net: Multiple updates/enhancements to designware.c > GPIO: Add SPEAr GPIO driver > SPL: common/Makefile: Add image.c to SPL build > SPL: lib/Makefile: Add crc32.c to SPL build > SPL: ARM: spear: Remove some objects from SPL build > Makefile: Add u-boot.spr build target (SPEAr) > SPL: ARM: spear: Add SPL support for SPEAr600 platform > rtc/m41t62: Add support for M41T82 with HT (Halt Update) > i2c: designware_i2c.c: Add support for the "i2c probe" command > MTD: SPEAr SMI: Add write support for length < 4 bytes > > Vipin KUMAR (14): > mtd/NAND: Add FSMC driver support > SPEAr: Configure FSMC driver for NAND interface > mtd/NAND: Remove obsolete SPEAr specific NAND drivers > st_smi: Add support for SPEAr SMI driver > st_smi: Read status until timeout happens > SPEAr: Place ethaddr write and read within CONFIG_CMD_NET > SPEAr: Configure network support for spear SoCs > SPEAr: Add macb driver support for spear310 and spear320 > SPEAr: Add basic arch related support for SPEAr SoCs > SPEAr: Add configuration options for spear3xx and spear6xx boards > SPEAr: Remove unused flag (CONFIG_SYS_HZ_CLOCK) > SPEAr: Change the default environment variables > SPEAr: Enable usb device high speed support > SPEAr: Enable udc and usb-console support only for usbtty configuration > > Vipin Kumar (6): > st_smi: Fix smi read status > SPEAr: Add interface information in initialization > SPEAr: Enable CONFIG_SYS_FLASH_PROTECTION > SPEAr: Correct the definition of CONFIG_SYS_MONITOR_BASE > SPEAr: Enable CONFIG_SYS_FLASH_EMPTY_INFO macro > SPEAr: Enable ONFI nand flash detection for spear3xx and 6xx and evb > > Makefile | 17 + > arch/arm/cpu/arm926ejs/spear/Makefile | 25 +- > arch/arm/cpu/arm926ejs/spear/cpu.c | 87 ++++ > arch/arm/cpu/arm926ejs/spear/spear600.c | 236 ++++++++++ > arch/arm/cpu/arm926ejs/spear/spl.c | 282 ++++++++++++ > arch/arm/cpu/arm926ejs/spear/spl_boot.c | 197 +++++++++ > .../spear/spr600_mt47h128m8_3_266_cl5_async.c | 130 ++++++ > .../spear/spr600_mt47h32m16_333_cl5_psync.c | 135 ++++++ > .../spear/spr600_mt47h32m16_37e_166_cl4_sync.c | 130 ++++++ > .../spear/spr600_mt47h64m16_3_333_cl5_psync.c | 144 ++++++ > arch/arm/cpu/arm926ejs/spear/start.S | 122 ++++++ > arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 87 ++++ > arch/arm/include/asm/arch-spear/clk.h | 27 ++ > arch/arm/include/asm/arch-spear/gpio.h | 40 ++ > arch/arm/include/asm/arch-spear/hardware.h | 63 ++- > arch/arm/include/asm/arch-spear/spr_defs.h | 23 + > arch/arm/include/asm/arch-spear/spr_gpt.h | 4 +- > arch/arm/include/asm/arch-spear/spr_misc.h | 147 ++++++- > arch/arm/include/asm/arch-spear/spr_nand.h | 57 --- > arch/arm/include/asm/arch-spear/spr_ssp.h | 45 ++ > arch/arm/include/asm/arch-spear/spr_syscntl.h | 14 + > .../arm/include/asm/arch-spear/spr_xloader_table.h | 67 --- > arch/arm/lib/eabi_compat.c | 3 +- > board/spear/common/Makefile | 2 + > board/spear/common/spr_misc.c | 102 ++--- > board/spear/spear300/config.mk | 39 -- > board/spear/spear300/spear300.c | 27 +- > board/spear/spear310/config.mk | 44 -- > board/spear/spear310/spear310.c | 44 +- > board/spear/spear320/config.mk | 44 -- > board/spear/spear320/spear320.c | 43 +- > board/spear/spear600/Makefile | 2 + > board/spear/spear600/config.mk | 39 -- > board/spear/spear600/spear600.c | 30 +- > boards.cfg | 24 +- > common/Makefile | 2 +- > config.mk | 4 + > doc/README.spear | 54 ++- > drivers/gpio/Makefile | 1 + > drivers/gpio/spear_gpio.c | 102 +++++ > drivers/i2c/designware_i2c.c | 16 +- > drivers/mtd/Makefile | 2 +- > drivers/mtd/nand/Makefile | 1 + > drivers/mtd/nand/fsmc_nand.c | 486 > +++++++++++++++++++++ > drivers/mtd/nand/spr_nand.c | 124 ------ > drivers/mtd/{spr_smi.c => st_smi.c} | 255 +++++++---- > drivers/net/designware.c | 126 +++--- > drivers/net/designware.h | 2 + > drivers/rtc/m41t62.c | 10 +- > include/configs/spear-common.h | 94 ++-- > include/configs/{spear3xx.h => spear3xx_evb.h} | 62 ++- > include/configs/{spear6xx.h => spear6xx_evb.h} | 20 +- > include/linux/mtd/fsmc_nand.h | 101 +++++ > .../spr_smi.h => include/linux/mtd/st_smi.h | 10 +- > include/netdev.h | 2 +- > lib/Makefile | 2 +- > 56 files changed, 3229 insertions(+), 769 deletions(-) > create mode 100644 arch/arm/cpu/arm926ejs/spear/cpu.c > create mode 100644 arch/arm/cpu/arm926ejs/spear/spear600.c > create mode 100644 arch/arm/cpu/arm926ejs/spear/spl.c > create mode 100644 arch/arm/cpu/arm926ejs/spear/spl_boot.c > create mode 100644 > arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c > create mode 100644 > arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c > create mode 100644 > arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c > create mode 100644 > arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c > create mode 100644 arch/arm/cpu/arm926ejs/spear/start.S > create mode 100644 arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds > create mode 100644 arch/arm/include/asm/arch-spear/clk.h > create mode 100644 arch/arm/include/asm/arch-spear/gpio.h > delete mode 100644 arch/arm/include/asm/arch-spear/spr_nand.h > create mode 100644 arch/arm/include/asm/arch-spear/spr_ssp.h > delete mode 100644 arch/arm/include/asm/arch-spear/spr_xloader_table.h > delete mode 100644 board/spear/spear300/config.mk > delete mode 100644 board/spear/spear310/config.mk > delete mode 100644 board/spear/spear320/config.mk > delete mode 100644 board/spear/spear600/config.mk > create mode 100644 drivers/gpio/spear_gpio.c > create mode 100644 drivers/mtd/nand/fsmc_nand.c > delete mode 100644 drivers/mtd/nand/spr_nand.c > rename drivers/mtd/{spr_smi.c => st_smi.c} (62%) > rename include/configs/{spear3xx.h => spear3xx_evb.h} (72%) > rename include/configs/{spear6xx.h => spear6xx_evb.h} (74%) > create mode 100644 include/linux/mtd/fsmc_nand.h > rename arch/arm/include/asm/arch-spear/spr_smi.h => > include/linux/mtd/st_smi.h (95%)
Applied to u-boot-arm/master, thanks. Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot