| Message ID | 5461E373.1080305@monstr.eu |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Nov 11, 2014 at 11:22:43AM +0100, Michal Simek wrote: > Hi Tom, [cc: Albert] > > please pull these 4 patches to your tree. > It adds support for Zybo board and add support for new ps7_init_gpl file. > > Thanks, > Michal > > > The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: > > Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 13:11:18 -0500) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-microblaze.git zynq > > for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: > > kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) > OK, this doesn't build for me, the new zybo board blows up: +(zynq_zybo) common/built-in.o: In function `show_model_r': +(zynq_zybo) common/board_r.c:510: undefined reference to `checkboard' w+(zynq_zybo,zynq_zybo) include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default]In file included from include/config.h:4:0 Please fix, you can add it on top of the current PR, thanks!
On 11/11/2014 09:47 PM, Tom Rini wrote: > On Tue, Nov 11, 2014 at 11:22:43AM +0100, Michal Simek wrote: > >> Hi Tom, [cc: Albert] >> >> please pull these 4 patches to your tree. >> It adds support for Zybo board and add support for new ps7_init_gpl file. >> >> Thanks, >> Michal >> >> >> The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: >> >> Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 13:11:18 -0500) >> >> are available in the git repository at: >> >> >> git://www.denx.de/git/u-boot-microblaze.git zynq >> >> for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: >> >> kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) >> > > OK, this doesn't build for me, the new zybo board blows up: > +(zynq_zybo) common/built-in.o: In function `show_model_r': > +(zynq_zybo) common/board_r.c:510: undefined reference to `checkboard' > w+(zynq_zybo,zynq_zybo) include/configs/zynq_zybo.h:24:0: warning: > "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default]In file > included from include/config.h:4:0 > > Please fix, you can add it on top of the current PR, thanks! you are right. Not sure why I have missed it. I remember I was running MAKEALL but maybe before rebase. :-( Anyway I have sent one more patch to fix this. Thanks, Michal
On Tue, Nov 11, 2014 at 11:22:43AM +0100, Michal Simek wrote: > Hi Tom, [cc: Albert] > > please pull these 4 patches to your tree. > It adds support for Zybo board and add support for new ps7_init_gpl file. > > Thanks, > Michal > > > The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: > > Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 13:11:18 -0500) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-microblaze.git zynq > > for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: > > kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) > Applied to u-boot/master, thanks! > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
Hi Tom, [cc: Albert] please pull these 4 patches to your tree. It adds support for Zybo board and add support for new ps7_init_gpl file. Thanks, Michal The following changes since commit 11ada9225a16ed2d8ddbf0715a2416245a777cbc: Merge branch 'rmobile' of git://www.denx.de/git/u-boot-sh (2014-11-05 13:11:18 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git zynq for you to fetch changes up to 61eb3cf2d5ef174b5a3008df6f7530b21f393261: kconfig: zynq: Add ZYBO board (2014-11-11 11:02:52 +0100) ---------------------------------------------------------------- Peter Crosthwaite (2): arm: dts: zynq: Add digilent ZYBO board dts kconfig: zynq: Add ZYBO board Soren Brinkmann (1): zynq: Use GPLed files for SPL Tinghui Wang (1): configs: zynq: Add config support for ZYBO arch/arm/cpu/armv7/zynq/Kconfig | 4 ++++ arch/arm/dts/Makefile | 1 + arch/arm/dts/zynq-zybo.dts | 23 +++++++++++++++++++++++ board/xilinx/zynq/.gitignore | 1 + board/xilinx/zynq/Makefile | 6 ++++-- board/xilinx/zynq/legacy.c | 2 ++ board/xilinx/zynq/xil_io.h | 2 +- configs/zynq_zybo_defconfig | 4 ++++ include/configs/zynq_zybo.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/zynq-zybo.dts create mode 100644 board/xilinx/zynq/legacy.c create mode 100644 configs/zynq_zybo_defconfig create mode 100644 include/configs/zynq_zybo.h