From: Albert ARIBAUD Date: Mon, 30 Jun 2014 20:19:03 +0000 (+0200) Subject: Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master' X-Git-Tag: v2014.07~74^2~4 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=b5b8d85e9a50c2294b6043830cd045de1002dc5d;hp=01a3647abdca096245c6b1d0c32e348efc07c67d Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master' --- diff --git a/boards.cfg b/boards.cfg index 947f2bc5ba..7a3beeaddb 100644 --- a/boards.cfg +++ b/boards.cfg @@ -369,9 +369,7 @@ Active arm armv7 omap5 ti omap5_uevm Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu :Tetsuyuki Kobayashi Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu -Active arm armv7 rmobile renesas koelsch koelsch_nor koelsch:NORFLASH Nobuhiro Iwamatsu Active arm armv7 rmobile renesas lager lager - Nobuhiro Iwamatsu -Active arm armv7 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - -