projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e3c52f2 bb474b8)
Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Thu, 20 Dec 2012 17:53:20 +0000 (10:53 -0700)
committerTom Rini <trini@ti.com>
Thu, 20 Dec 2012 17:53:20 +0000 (10:53 -0700)
1  2 
boards.cfg patch | diff1 | diff2 | blob | history

diff --combined boards.cfg
index a7cdf6cd15d2b1d6b573ed83a03dfc594e9d5de3,1d042ecdc46e5241970874703be4a74a47fbc0fd..2acc941de4f1d11b8a1af71bebe35915a980faf7
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -373,8 -373,8 +373,8 @@@ M5235EVB                     m68
  M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
  cobra5272                    m68k        mcf52x2     cobra5272           -
  idmr                         m68k        mcf52x2
 -eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000
 -eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000
 +eb_cpu5282                   m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400
 +eb_cpu5282_internal          m68k        mcf52x2     eb_cpu5282          BuS            -           eb_cpu5282:SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418
  TASREG                       m68k        mcf52x2     tasreg              esd
  M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale
  M5249EVB                     m68k        mcf52x2     m5249evb            freescale
@@@ -1089,6 -1089,7 +1089,7 @@@ ecovec                       s
  MigoR                        sh          sh4         MigoR               renesas        -
  r2dplus                      sh          sh4         r2dplus             renesas        -
  r7780mp                      sh          sh4         r7780mp             renesas        -
+ sh7752evb                    sh          sh4         sh7752evb           renesas        -
  sh7757lcr                    sh          sh4         sh7757lcr           renesas        -
  sh7763rdp                    sh          sh4         sh7763rdp           renesas        -
  sh7785lcr                    sh          sh4         sh7785lcr           renesas        -
Unnamed repository; edit this file 'description' to name the repository.