summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-04-30 16:55:37 +0200
committerWolfgang Denk <wd@denx.de>2012-04-30 16:55:37 +0200
commite0f6a4e8b17afead8add6e528936a505367c091c (patch)
tree27df2ba6194aa03a6e4da948c66113076f17f978 /boards.cfg
parentf588bb034d5d3a0417f45965f1aba4d4cf8a2893 (diff)
parent4212657c53f9ed66fd5adc9da9a327e3739646fb (diff)
downloadu-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.zip
u-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.tar.gz
u-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians: powerpc/ppc4xx: Remove typedefs for gdsys FPGA powerpc/ppc4xx: Fix typo in gdsys_fpga.h powerpc/ppc4xx: Update gdsys board configurations powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20 powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes powerpc/ppc4xx: Make gdsys 405ep boards reset more generic powerpc/ppc4xx: Adjust environment size on neo
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg
index 15339f7..5f328b5 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -990,7 +990,7 @@ intip powerpc ppc4xx intip gdsys
io powerpc ppc4xx 405ep gdsys
io64 powerpc ppc4xx 405ex gdsys
iocon powerpc ppc4xx 405ep gdsys
-neo powerpc ppc4xx - gdsys
+neo powerpc ppc4xx 405ep gdsys
icon powerpc ppc4xx - mosaixtech
MIP405 powerpc ppc4xx mip405 mpl
MIP405T powerpc ppc4xx mip405 mpl - MIP405:MIP405T