]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge branch 'petalinux/master-next' into master-next
authorMichal Simek <michal.simek@xilinx.com>
Thu, 11 Apr 2013 11:59:49 +0000 (13:59 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 11 Apr 2013 12:06:33 +0000 (14:06 +0200)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
1  2 
boards.cfg

diff --cc boards.cfg
index f75a13908889e470d34040043c96d7f197e2261f,bf6e5dd6ec51cf499755be68db55e87b4c4dc9d9..54d2bc718b7111aeef3f733c30477ba881b22274
@@@ -278,8 -278,10 +278,9 @@@ twister                      ar
  nokia_rx51                   arm         armv7       rx51                nokia          omap3
  omap4_panda                  arm         armv7       panda               ti             omap4
  omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
+ petalogix-arm-auto           arm         armv7       arm-auto            petalogix      zynq
  zynq_zc770_XM010             arm         armv7       zynq                xilinx         zynq  zynq_zc770:ZC770_XM010
  zynq_zc770_XM011             arm         armv7       zynq                xilinx         zynq  zynq_zc770:ZC770_XM011
 -zynq_zc770_XM011_n16b        arm         armv7       zynq                xilinx         zynq  zynq_zc770:ZC770_XM011,XILINX_ZYNQ_NAND_BUSWIDTH_16
  zynq_zc770_XM012             arm         armv7       zynq                xilinx         zynq  zynq_zc770:ZC770_XM012
  zynq_zc770_XM013             arm         armv7       zynq                xilinx         zynq  zynq_zc770:ZC770_XM013
  zynq_afx_nor                 arm         armv7       zynq                xilinx         zynq  zynq_afx:AFX_NOR