| Message ID | 50176CA2.6000303@monstr.eu |
|---|---|
| State | Accepted |
| Delegated to: | Wolfgang Denk |
| Headers | show |
Dear Michal Simek, In message <50176CA2.6000303@monstr.eu> you wrote: > > Please pull these patches to your repository. There will be one simple merge conflict > around SPI makefile which is easy to resolve. Maybe it's easy for you - to me it was extra effort. And I don;t even know if I did it right. Please validate! Next time please fix such issues yourself, and send clean, working pull requests. Thanks. > u-boot@lakedaemon.net (1): > ext2load: increase read speed > > are available in the git repository at: > > git://www.denx.de/git/u-boot-microblaze.git master > > Michal Simek (6): > microblaze: Add gpio.h > microblaze: Move individual board linker scripts to common script in cpu tree. > microblaze: Remove extern from board.c > microblaze: Move __udelay implementation > microblaze: Call serial multi initialization > microblaze: intc: Clear interrupt code > > Stephan Linz (9): > microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION > microblaze: Avoid compile error on systems without cfi flash > microblaze: Enable ubi support > microblaze: Expand and correct configuration comments > microblaze: Add missing undefs for UBI and UBIFS > fdt: Add board specific dts inclusion > microblaze: Wire up dts configuration > spi: microblaze: Adds driver for Xilinx SPI controller > microblaze: Wire up SPI driver > > arch/microblaze/config.mk | 2 + > arch/microblaze/cpu/interrupts.c | 88 +++++---- > arch/microblaze/cpu/start.S | 2 - > arch/microblaze/cpu/timer.c | 21 ++- > .../microblaze/cpu}/u-boot.lds | 0 > arch/microblaze/include/asm/gpio.h | 41 ++++ > arch/microblaze/include/asm/microblaze_intc.h | 3 + > arch/microblaze/lib/Makefile | 1 - > arch/microblaze/lib/board.c | 15 +- > arch/microblaze/lib/time.c | 42 ---- > board/xilinx/dts/microblaze.dts | 1 + > board/xilinx/microblaze-generic/dts/microblaze.dts | 7 + > drivers/spi/Makefile | 1 + > drivers/spi/xilinx_spi.c | 214 ++++++++++++++++++++ > drivers/spi/xilinx_spi.h | 135 ++++++++++++ > dts/Makefile | 3 +- > include/configs/microblaze-generic.h | 129 ++++++++++-- > 17 files changed, 594 insertions(+), 111 deletions(-) > rename {board/xilinx/microblaze-generic => arch/microblaze/cpu}/u-boot.lds (100%) > create mode 100644 arch/microblaze/include/asm/gpio.h > create mode 100644 board/xilinx/dts/microblaze.dts > create mode 100644 board/xilinx/microblaze-generic/dts/microblaze.dts > create mode 100644 drivers/spi/xilinx_spi.c > create mode 100644 drivers/spi/xilinx_spi.h Applied, thanks. Best regards, Wolfgang Denk
Dear Wolfgang Denk, On 07/31/2012 10:07 PM, Wolfgang Denk wrote: > Dear Michal Simek, > > In message <50176CA2.6000303@monstr.eu> you wrote: >> >> Please pull these patches to your repository. There will be one simple merge conflict >> around SPI makefile which is easy to resolve. > > Maybe it's easy for you - to me it was extra effort. And I don;t even > know if I did it right. Please validate! I have looked at it and there is one additional line. Will send patch to fix it. > > Next time please fix such issues yourself, and send clean, working > pull requests. Thanks. ok. Will do it next time. Thanks, Michal
Dear Wolfgang Denk, Please pull these patches to your repository. There will be one simple merge conflict around SPI makefile which is easy to resolve. dts/ patch is acked by Simon Thanks, Michal The following changes since commit 436da3cd233e7166b5ce9293dbd28092cf37bcc9: u-boot@lakedaemon.net (1): ext2load: increase read speed are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master Michal Simek (6): microblaze: Add gpio.h microblaze: Move individual board linker scripts to common script in cpu tree. microblaze: Remove extern from board.c microblaze: Move __udelay implementation microblaze: Call serial multi initialization microblaze: intc: Clear interrupt code Stephan Linz (9): microblaze: Remove wrong define CONFIG_SYS_FLASH_PROTECTION microblaze: Avoid compile error on systems without cfi flash microblaze: Enable ubi support microblaze: Expand and correct configuration comments microblaze: Add missing undefs for UBI and UBIFS fdt: Add board specific dts inclusion microblaze: Wire up dts configuration spi: microblaze: Adds driver for Xilinx SPI controller microblaze: Wire up SPI driver arch/microblaze/config.mk | 2 + arch/microblaze/cpu/interrupts.c | 88 +++++---- arch/microblaze/cpu/start.S | 2 - arch/microblaze/cpu/timer.c | 21 ++- .../microblaze/cpu}/u-boot.lds | 0 arch/microblaze/include/asm/gpio.h | 41 ++++ arch/microblaze/include/asm/microblaze_intc.h | 3 + arch/microblaze/lib/Makefile | 1 - arch/microblaze/lib/board.c | 15 +- arch/microblaze/lib/time.c | 42 ---- board/xilinx/dts/microblaze.dts | 1 + board/xilinx/microblaze-generic/dts/microblaze.dts | 7 + drivers/spi/Makefile | 1 + drivers/spi/xilinx_spi.c | 214 ++++++++++++++++++++ drivers/spi/xilinx_spi.h | 135 ++++++++++++ dts/Makefile | 3 +- include/configs/microblaze-generic.h | 129 ++++++++++-- 17 files changed, 594 insertions(+), 111 deletions(-) rename {board/xilinx/microblaze-generic => arch/microblaze/cpu}/u-boot.lds (100%) create mode 100644 arch/microblaze/include/asm/gpio.h create mode 100644 board/xilinx/dts/microblaze.dts create mode 100644 board/xilinx/microblaze-generic/dts/microblaze.dts create mode 100644 drivers/spi/xilinx_spi.c create mode 100644 drivers/spi/xilinx_spi.h