git.openpandora.org / pandora-u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a430b13 a429db7)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Wed, 8 Dec 2010 22:17:57 +0000 (23:17 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 8 Dec 2010 22:17:57 +0000 (23:17 +0100)
1  2 
boards.cfg patch | diff1 | diff2 | blob | history

diff --combined boards.cfg
index 8994e41,b04ba40..dcd5a12
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -48,7 -48,8 +48,8 @@@ lpc2292sodimm                ar
  SMN42                        arm         arm720t     -                   siemens        lpc2292
  evb4510                      arm         arm720t     -                   -              s3c4510b
  a320evb                      arm         arm920t     -                   faraday        a320
- at91rm9200ek                 arm         arm920t     -                   atmel          at91
+ at91rm9200ek                 arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek
+ at91rm9200ek_ram             arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek:RAMBOOT
  eb_cpux9k2                   arm         arm920t     -                   BuS            at91
  cmc_pu2                      arm         arm920t     -                   -              at91rm9200
  csb637                       arm         arm920t     -                   -              at91rm9200
@@@ -70,6 -71,8 +71,8 @@@ voiceblue                    ar
  omap1510inn                  arm         arm925t     -                   ti
  afeb9260                     arm         arm926ejs   -                   -              at91
  at91cap9adk                  arm         arm926ejs   -                   atmel          at91
+ top9000eval_xe               arm         arm926ejs   top9000             emk            at91        top9000:EVAL9000
+ top9000su_xe                 arm         arm926ejs   top9000             emk            at91        top9000:SU9000
  meesc                        arm         arm926ejs   -                   esd            at91
  otc570                       arm         arm926ejs   -                   esd            at91
  pm9261                       arm         arm926ejs   -                   ronetix        at91
@@@ -402,10 -405,10 +405,10 @@@ vme8349                      powerp
  MPC8308RDB                   powerpc     mpc83xx     mpc8308rdb          freescale
  MPC8313ERDB_33               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ
  MPC8313ERDB_66               powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ
 -MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
 -MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
 +MPC8313ERDB_NAND_33          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT
 +MPC8313ERDB_NAND_66          powerpc     mpc83xx     mpc8313erdb         freescale      -           MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT
  MPC8315ERDB                  powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB
 -MPC8315ERDB_NAND             powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB:NAND
 +MPC8315ERDB_NAND             powerpc     mpc83xx     mpc8315erdb         freescale      -           MPC8315ERDB:NAND_U_BOOT
  MPC8323ERDB                  powerpc     mpc83xx     mpc8323erdb         freescale
  MPC832XEMDS                  powerpc     mpc83xx     mpc832xemds         freescale      -           MPC832XEMDS:
  MPC832XEMDS_ATM              powerpc     mpc83xx     mpc832xemds         freescale      -           MPC832XEMDS:PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
Pandora U-Boot Repository