summaryrefslogtreecommitdiff
path: root/boards.cfg
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
committerWolfgang Denk <wd@denx.de>2010-09-28 23:30:47 +0200
commit2e6e1772c0e34871769be4aef79748fe3e47d953 (patch)
tree00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /boards.cfg
parent1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff)
parent3df61957938586c512c17e72d83551d190400981 (diff)
downloadu-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.zip
u-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.gz
u-boot-imx-2e6e1772c0e34871769be4aef79748fe3e47d953.tar.bz2
Merge branch 'next' of /home/wd/git/u-boot/next
Conflicts: include/ppc4xx.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'boards.cfg')
-rw-r--r--boards.cfg4
1 files changed, 1 insertions, 3 deletions
diff --git a/boards.cfg b/boards.cfg
index 0bf9c93..02eb153 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -104,8 +104,6 @@ uc101 powerpc mpc5xxx
v38b powerpc mpc5xxx
pf5200 powerpc mpc5xxx - esd
aev powerpc mpc5xxx tqm5200 tqc
-smmaco4 powerpc mpc5xxx tqm5200 tqc
-spieval powerpc mpc5xxx tqm5200 tqc
sorcery powerpc mpc8220
A3000 powerpc mpc824x a3000
barco powerpc mpc824x
@@ -170,7 +168,6 @@ QS823 powerpc mpc8xx qs850 snmc
QS850 powerpc mpc8xx qs850 snmc
QS860T powerpc mpc8xx qs860t snmc
stxxtc powerpc mpc8xx stxxtc stx
-HMI10 powerpc mpc8xx tqm8xx tqc
SM850 powerpc mpc8xx tqm8xx tqc
AMX860 powerpc mpc8xx amx860 westel
csb272 powerpc ppc4xx
@@ -331,6 +328,7 @@ ppmc8260 powerpc mpc8260
RPXsuper powerpc mpc8260 rpxsuper
rsdproto powerpc mpc8260
MPC8266ADS powerpc mpc8260 mpc8266ads freescale
+mpc8308_p1m powerpc mpc83xx
MPC8308RDB powerpc mpc83xx mpc8308rdb freescale
MPC8323ERDB powerpc mpc83xx mpc8323erdb freescale
MPC8349EMDS powerpc mpc83xx mpc8349emds freescale