]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge branch 'v2010.09' of /home/bhill/work/u-boot/u-boot into pele-peep6
authorBrian Hill <brian.hill@xilinx.com>
Mon, 8 Nov 2010 22:30:55 +0000 (15:30 -0700)
committerBrian Hill <brian.hill@xilinx.com>
Mon, 8 Nov 2010 22:30:55 +0000 (15:30 -0700)
Conflicts:
Makefile
cpu/arm_cortexa8/start.S
cpu/arm_cortexa8/u-boot.lds

1  2 
Makefile
arch/arm/cpu/armv7/omap-common/config.mk
arch/arm/cpu/armv7/pele/Makefile
arch/arm/cpu/armv7/pele/config.mk
arch/arm/cpu/armv7/pele/timer.c
arch/arm/cpu/armv7/pele/xscutimer_hw.h
boards.cfg
drivers/mtd/cfi_flash.c
drivers/mtd/nand/nand_base.c
drivers/rtc/Makefile
drivers/serial/Makefile

diff --cc Makefile
index 734601465b4390a5207a1a50e851faecf22b8796,fa1bddf5e305ba7ccd1a68759b531abd1e7b98b0..f0be08da15383a8cfeec66680303bb7a3dd04640
+++ b/Makefile
@@@ -3105,77 -2167,6 +2167,10 @@@ versatileab_config    
  versatilepb_config :  unconfig
        @board/armltd/versatile/split_by_variant.sh $@
  
- voiceblue_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
- #########################################################################
- ## S3C44B0 Systems
- #########################################################################
- B2_config     :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm s3c44b0 B2 dave
- #########################################################################
- ## ARM720T Systems
- #########################################################################
- armadillo_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t armadillo
- ep7312_config :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t ep7312
- impa7_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t impa7
- modnet50_config :     unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t modnet50
- evb4510_config :      unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t evb4510 NULL s3c4510b
- lpc2292sodimm_config: unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm NULL lpc2292
- SMN42_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
- #########################################################################
- ## ARM CORTEX Systems
- #########################################################################
- devkit8000_config :   unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3
- omap3_beagle_config : unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3
- omap3_overo_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3
- omap3_evm_config :    unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3
- omap3_pandora_config :        unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3
- omap3_sdp3430_config :        unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3
- omap3_zoom1_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3
- omap3_zoom2_config :  unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
- smdkc100_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
 +xpele_config:         unconfig
 +      @mkdir -p $(obj)include $(obj)board/xilinx/dfe
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 dfe xilinx pele
++      @$(MKCONFIG) $(@:_config=) arm armv7 dfe xilinx pele
 +
  #########################################################################
  ## XScale Systems
  #########################################################################
index 2864405549a9ec0b206ceb5e7693a8e9111fe805,0000000000000000000000000000000000000000..2864405549a9ec0b206ceb5e7693a8e9111fe805
mode 100644,000000..100644
--- /dev/null
index 541c73df6b3a89b93abf0921d6e3f15997f3eada,0000000000000000000000000000000000000000..541c73df6b3a89b93abf0921d6e3f15997f3eada
mode 100644,000000..100644
--- /dev/null
index 48433b524bf3dedfb76c840b550ac534bc689cf3,0000000000000000000000000000000000000000..dccb864d3e712988d1b4d7bd3c599c8fa6f89cef
mode 100644,000000..100644
--- /dev/null
@@@ -1,175 -1,0 +1,175 @@@
- void udelay(unsigned long usec)
 +/*
 + * (C) Copyright 2003
 + * Texas Instruments <www.ti.com>
 + *
 + * (C) Copyright 2002
 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
 + * Marius Groeger <mgroeger@sysgo.de>
 + *
 + * (C) Copyright 2002
 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
 + * Alex Zuepke <azu@sysgo.de>
 + *
 + * (C) Copyright 2002-2004
 + * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
 + *
 + * (C) Copyright 2004
 + * Philippe Robin, ARM Ltd. <philippe.robin@arm.com>
 + *
 + * (C) Copyright 2008
 + * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>
 + *
 + * And thoroughly mangled into dragonfire form, probably never to escape Xilinx.
 + *
 + * See file CREDITS for list of people who contributed to this
 + * project.
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License as
 + * published by the Free Software Foundation; either version 2 of
 + * the License, or (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software
 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 + * MA 02111-1307 USA
 + */
 +
 +#include <common.h>
 +#include <asm/proc-armv/ptrace.h>
 +#include <div64.h>
 +
 +#include "xparameters.h"
 +#include "xscutimer_hw.h"
 +
 +#define TIMER_LOAD_VAL 0xFFFFFFFF
 +
 +/* Internal tick units */
 +/* Last decremneter snapshot */
 +static unsigned long lastdec;
 +/* Monotonic incrementing timer */
 +static unsigned long long timestamp;
 +
 +static void XScuTimer_WriteReg (u32 Reg, u32 Data)
 +{
 +      *(volatile u32 *) (XPAR_SCUTIMER_BASEADDR + Reg) = Data;
 +}
 +
 +static u32 XScuTimer_ReadReg (u32 Reg)
 +{
 +      return *(u32 *) (XPAR_SCUTIMER_BASEADDR + Reg);
 +}
 +
 +#define XScuTimer_GetCounterValue()                          \
 +        XScuTimer_ReadReg(XSCUTIMER_COUNTER_OFFSET)
 +
 +
 +int timer_init()
 +{
 +      u32 val;
 +
 +      /*
 +       * Load the timer counter register.
 +       */
 +      XScuTimer_WriteReg(XSCUTIMER_LOAD_OFFSET, 0xFFFFFFFF);
 +
 +      /*
 +       * Start the A9Timer device.
 +       */
 +      val = XScuTimer_ReadReg(XSCUTIMER_CONTROL_OFFSET);
 +      /* Enable Auto reload mode.  */
 +      val |= XSCUTIMER_CONTROL_AUTO_RELOAD_MASK;
 +      /* Clear prescaler control bits */
 +      val &= ~XSCUTIMER_CONTROL_PRESCALER_MASK;
 +      /* Set prescaler value */
 +      val |= (0xFF << XSCUTIMER_CONTROL_PRESCALER_SHIFT);
 +      /* Enable the decrementer */
 +      val |= XSCUTIMER_CONTROL_ENABLE_MASK;
 +      XScuTimer_WriteReg(XSCUTIMER_CONTROL_OFFSET, val);
 +      
 +      reset_timer_masked();
 +
 +      return 0;
 +}
 +
 +/*
 + * timer without interrupts
 + */
 +
 +/*
 + * This function is derived from PowerPC code (read timebase as long long).
 + * On ARM it just returns the timer value.
 + */
 +unsigned long long get_ticks(void)
 +{
 +      ulong now;
 +
 +      now = XScuTimer_GetCounterValue();
 +
 +      if (lastdec >= now) {
 +              /* normal mode */
 +              timestamp += lastdec - now;
 +      } else {
 +              /* we have an overflow ... */
 +              timestamp += lastdec + TIMER_LOAD_VAL - now;
 +      }
 +      lastdec = now;
 +
 +      return timestamp;
 +}
 +
 +/*
 + * This function is derived from PowerPC code (timebase clock frequency).
 + * On ARM it returns the number of timer ticks per second.
 + */
 +ulong get_tbclk(void)
 +{
 +      /* We overrun in 100s */
 +      return (ulong)(TIMER_LOAD_VAL / 100);
 +}
 +
 +void reset_timer_masked(void)
 +{
 +      /* reset time */
 +      lastdec = XScuTimer_GetCounterValue();
 +      timestamp = 0;
 +}
 +
 +void reset_timer(void)
 +{
 +      reset_timer_masked();
 +}
 +
 +ulong get_timer_masked(void)
 +{
 +      unsigned long long res = get_ticks();
 +      do_div (res, (CONFIG_SYS_HZ / 1000000) );
 +      return res;
 +}
 +
 +ulong get_timer(ulong base)
 +{
 +      return get_timer_masked() - base;
 +}
 +
 +void set_timer(ulong t)
 +{
 +      timestamp = t * (TIMER_LOAD_VAL / (100 * CONFIG_SYS_HZ));
 +}
 +
++void __udelay(unsigned long usec)
 +{
 +      unsigned long long tmp;
 +      ulong tmo;
 +
 +      tmo = (usec + 9) / 10;
 +      tmp = get_ticks() + tmo;        /* get current timestamp */
 +
 +      while (get_ticks() < tmp)/* loop till event */
 +               /*NOP*/;
 +}
index 13d61185b5254760f1f3abdb17c515e54762322f,0000000000000000000000000000000000000000..13d61185b5254760f1f3abdb17c515e54762322f
mode 100644,000000..100644
--- /dev/null
diff --cc boards.cfg
index 0000000000000000000000000000000000000000,0bf9c9362e14a1c99c6e84381c1b25626f30e6c9..9595b4b94a2cfd8d55beb8783a07055c489a5651
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,373 +1,374 @@@
+ #
+ # List of boards
+ #
+ # Syntax:
+ #     white-space separated list of entries;
+ #     each entry has the following fields:
+ #
+ #     Targetname  Architecture  CPU  Boardname  Vendor  SoC
+ #
+ #     Unused fields can be specified as "-", or omitted if they
+ #     are the last field on the line.
+ #
+ #     Lines starting with '#' are comments.
+ #     Blank lines are ignored.
+ #
+ # To keep the list sorted, use something like
+ #
+ #     :.,$! sort -f -k2,2 -k3,3 -k6,6 -k5,5 -k1,1
+ #
+ # Target      ARCH    CPU             Board name      Vendor          SoC
+ ###########################################################################
+ qong          arm     arm1136         -               davedenx        mx31
+ mx31ads               arm     arm1136         -               freescale       mx31
+ ep7312                arm     arm720t
+ impa7         arm     arm720t
+ SMN42         arm     arm720t         -               siemens         lpc2292
+ evb4510               arm     arm720t         -               -               s3c4510b
+ a320evb               arm     arm920t         -               faraday         a320
+ cmc_pu2               arm     arm920t         -               -               at91rm9200
+ csb637                arm     arm920t         -               -               at91rm9200
+ kb9202                arm     arm920t         -               -               at91rm9200
+ m501sk                arm     arm920t         -               -               at91rm9200
+ mp2usb                arm     arm920t         -               -               at91rm9200
+ mx1ads                arm     arm920t         -               -               imx
+ mx1fs2                arm     arm920t         -               -               imx
+ scb9328               arm     arm920t         -               -               imx
+ cm4008                arm     arm920t         -               -               ks8695
+ cm41xx                arm     arm920t         -               -               ks8695
+ VCMA9         arm     arm920t         vcma9           mpl             s3c24x0
+ netstar               arm     arm925t
+ meesc         arm     arm926ejs       -               esd             at91
+ otc570                arm     arm926ejs       -               esd             at91
+ pm9261                arm     arm926ejs       -               ronetix         at91
+ pm9263                arm     arm926ejs       -               ronetix         at91
+ jadecpu               arm     arm926ejs       jadecpu         syteco          mb86r0x
+ suen3         arm     arm926ejs       km_arm          keymile         kirkwood
+ rd6281a               arm     arm926ejs       -               Marvell         kirkwood
+ mx51evk               arm     armv7           mx51evk         freescale       mx51
+ actux1                arm     ixp
+ actux2                arm     ixp
+ actux3                arm     ixp
+ actux4                arm     ixp
+ ixdp425               arm     ixp
+ cerf250               arm     pxa
+ colibri_pxa270        arm     pxa
+ cradle                arm     pxa
+ csb226                arm     pxa
+ delta         arm     pxa
+ innokom               arm     pxa
+ logodl                arm     pxa
+ lubbock               arm     pxa
+ pleb2         arm     pxa
+ xaeniax               arm     pxa
+ xm250         arm     pxa
+ zipitz2               arm     pxa
+ B2            arm     s3c44b0         -               dave
+ assabet               arm     sa1100
+ dnp1110               arm     sa1100
+ gcplus                arm     sa1100
+ lart          arm     sa1100
+ shannon               arm     sa1100
+ mimc200               avr32   at32ap          -               mimc            at32ap700x
+ eNET          i386    i386            -               -               sc520
+ idmr          m68k    mcf52x2
+ TASREG                m68k    mcf52x2         tasreg          esd
+ M5272C3               m68k    mcf52x2         m5272c3         freescale
+ EP2500                m68k    mcf52x2         ep2500          Mercury
+ purple                mips    mips
+ tb0229                mips    mips
+ PCI5441               nios2   nios2           pci5441         psyent
+ PK1C20                nios2   nios2           pk1c20          psyent
+ P3G4          powerpc 74xx_7xx        evb64260
+ ppmc7xx               powerpc 74xx_7xx
+ ZUMA          powerpc 74xx_7xx        evb64260
+ BAB7xx                powerpc 74xx_7xx        bab7xx          eltec
+ ELPPC         powerpc 74xx_7xx        elppc           eltec
+ CPCI750               powerpc 74xx_7xx        cpci750         esd
+ DB64360               powerpc 74xx_7xx        db64360         Marvell
+ DB64460               powerpc 74xx_7xx        db64460         Marvell
+ aria          powerpc mpc512x         -               davedenx
+ PATI          powerpc mpc5xx          pati            mpl
+ BC3450                powerpc mpc5xxx         bc3450
+ canmb         powerpc mpc5xxx
+ cm5200                powerpc mpc5xxx
+ hmi1001               powerpc mpc5xxx
+ inka4x0               powerpc mpc5xxx
+ ipek01                powerpc mpc5xxx
+ jupiter               powerpc mpc5xxx
+ mucmc52               powerpc mpc5xxx
+ munices               powerpc mpc5xxx
+ o2dnt         powerpc mpc5xxx
+ 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
+ BMW           powerpc mpc824x         bmw
+ CU824         powerpc mpc824x         cu824
+ MOUSSE                powerpc mpc824x         mousse
+ MUSENKI               powerpc mpc824x         musenki
+ MVBLUE                powerpc mpc824x         mvblue
+ OXC           powerpc mpc824x         oxc
+ PN62          powerpc mpc824x         pn62
+ sbc8240               powerpc mpc824x
+ utx8245               powerpc mpc824x
+ debris                powerpc mpc824x         -               etin
+ kvme080               powerpc mpc824x         -               etin
+ atc           powerpc mpc8260
+ ep8260                powerpc mpc8260
+ ep82xxm               powerpc mpc8260
+ gw8260                powerpc mpc8260
+ hymod         powerpc mpc8260
+ IDS8247               powerpc mpc8260         ids8247
+ sacsng                powerpc mpc8260
+ sbc8260               powerpc mpc8260
+ ZPC1900               powerpc mpc8260         zpc1900
+ mgcoge                powerpc mpc8260         -               keymile
+ SCM           powerpc mpc8260         -               siemens
+ TQM8272               powerpc mpc8260         tqm8272         tqc
+ ve8313                powerpc mpc83xx         ve8313
+ kmeter1               powerpc mpc83xx         kmeter1         keymile
+ MVBLM7                powerpc mpc83xx         mvblm7          matrix_vision
+ TQM834x               powerpc mpc83xx         tqm834x         tqc
+ PM854         powerpc mpc85xx         pm854
+ PM856         powerpc mpc85xx         pm856
+ stxgp3                powerpc mpc85xx         stxgp3          stx
+ c2mon         powerpc mpc8xx
+ EP88x         powerpc mpc8xx          ep88x
+ ETX094                powerpc mpc8xx          etx094
+ FLAGADM               powerpc mpc8xx          flagadm
+ GENIETV               powerpc mpc8xx          genietv
+ hermes                powerpc mpc8xx
+ IP860         powerpc mpc8xx          ip860
+ LANTEC                powerpc mpc8xx          lantec
+ lwmon         powerpc mpc8xx
+ NX823         powerpc mpc8xx          nx823
+ quantum               powerpc mpc8xx
+ R360MPI               powerpc mpc8xx          r360mpi
+ RBC823                powerpc mpc8xx          rbc823
+ rmu           powerpc mpc8xx
+ RPXlite               powerpc mpc8xx
+ spc1920               powerpc mpc8xx
+ uc100         powerpc mpc8xx
+ MHPC          powerpc mpc8xx          mhpc            eltec
+ TOP860                powerpc mpc8xx          top860          emk
+ kmsupx4               powerpc mpc8xx          km8xx           keymile
+ mgsuvd                powerpc mpc8xx          km8xx           keymile
+ KUP4K         powerpc mpc8xx          kup4k           kup
+ KUP4X         powerpc mpc8xx          kup4x           kup
+ ELPT860               powerpc mpc8xx          elpt860         LEOX
+ CCM           powerpc mpc8xx          -               siemens
+ IAD210                powerpc mpc8xx          -               siemens
+ pcu_e         powerpc mpc8xx          -               siemens
+ 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
+ csb472                powerpc ppc4xx
+ ERIC          powerpc ppc4xx          eric
+ G2000         powerpc ppc4xx          g2000
+ JSE           powerpc ppc4xx          jse
+ korat         powerpc ppc4xx
+ lwmon5                powerpc ppc4xx
+ ML2           powerpc ppc4xx          ml2
+ sbc405                powerpc ppc4xx
+ sc3           powerpc ppc4xx
+ t3corp                powerpc ppc4xx
+ zeus          powerpc ppc4xx
+ acadia                powerpc ppc4xx          -               amcc
+ bamboo                powerpc ppc4xx          -               amcc
+ bubinga               powerpc ppc4xx          -               amcc
+ ebony         powerpc ppc4xx          -               amcc
+ katmai                powerpc ppc4xx          -               amcc
+ luan          powerpc ppc4xx          -               amcc
+ makalu                powerpc ppc4xx          -               amcc
+ ocotea                powerpc ppc4xx          -               amcc
+ redwood               powerpc ppc4xx          -               amcc
+ taihu         powerpc ppc4xx          -               amcc
+ taishan               powerpc ppc4xx          -               amcc
+ yucca         powerpc ppc4xx          -               amcc
+ AP1000                powerpc ppc4xx          ap1000          amirix
+ CRAYL1                powerpc ppc4xx          L1              cray
+ ADCIOP                powerpc ppc4xx          adciop          esd
+ APC405                powerpc ppc4xx          apc405          esd
+ AR405         powerpc ppc4xx          ar405           esd
+ ASH405                powerpc ppc4xx          ash405          esd
+ CANBT         powerpc ppc4xx          canbt           esd
+ CMS700                powerpc ppc4xx          cms700          esd
+ CPCI2DP               powerpc ppc4xx          cpci2dp         esd
+ DP405         powerpc ppc4xx          dp405           esd
+ DU405         powerpc ppc4xx          du405           esd
+ DU440         powerpc ppc4xx          du440           esd
+ HH405         powerpc ppc4xx          hh405           esd
+ HUB405                powerpc ppc4xx          hub405          esd
+ PCI405                powerpc ppc4xx          pci405          esd
+ PLU405                powerpc ppc4xx          plu405          esd
+ PMC405                powerpc ppc4xx          pmc405          esd
+ PMC440                powerpc ppc4xx          pmc440          esd
+ VOH405                powerpc ppc4xx          voh405          esd
+ VOM405                powerpc ppc4xx          vom405          esd
+ WUH405                powerpc ppc4xx          wuh405          esd
+ neo           powerpc ppc4xx          -               gdsys
+ icon          powerpc ppc4xx          -               mosaixtech
+ MIP405                powerpc ppc4xx          mip405          mpl
+ PIP405                powerpc ppc4xx          pip405          mpl
+ alpr          powerpc ppc4xx          -               prodrive
+ p3p440                powerpc ppc4xx          -               prodrive
+ KAREF         powerpc ppc4xx          karef           sandburst
+ grsim         sparc   leon3           -               gaisler
+ imx31_litekit arm     arm1136         -               logicpd         mx31
+ omap2420h4    arm     arm1136         -               ti              omap24xx
+ tnetv107x_evm arm     arm1176         tnetv107xevm    ti              tnetv107x
+ armadillo     arm     arm720t
+ modnet50      arm     arm720t
+ lpc2292sodimm arm     arm720t         -               -               lpc2292
+ eb_cpux9k2    arm     arm920t         -               BuS             at91
+ at91rm9200dk  arm     arm920t         -               atmel           at91rm9200
+ at91rm9200ek  arm     arm920t         -               atmel           at91rm9200
+ sbc2410x      arm     arm920t         -               -               s3c24x0
+ smdk2400      arm     arm920t         -               samsung         s3c24x0
+ smdk2410      arm     arm920t         -               samsung         s3c24x0
+ voiceblue     arm     arm925t
+ omap1510inn   arm     arm925t         -               ti
+ afeb9260      arm     arm926ejs       -               -               at91
+ at91cap9adk   arm     arm926ejs       -               atmel           at91
+ davinci_dvevm arm     arm926ejs       dvevm           davinci         davinci
+ davinci_sffsdr        arm     arm926ejs       sffsdr          davinci         davinci
+ davinci_sonata        arm     arm926ejs       sonata          davinci         davinci
+ da830evm      arm     arm926ejs       da8xxevm        davinci         davinci
+ da850evm      arm     arm926ejs       da8xxevm        davinci         davinci
+ guruplug      arm     arm926ejs       -               Marvell         kirkwood
+ mv88f6281gtw_ge       arm     arm926ejs       -               Marvell         kirkwood
+ openrd_base   arm     arm926ejs       -               Marvell         kirkwood
+ sheevaplug    arm     arm926ejs       -               Marvell         kirkwood
+ imx27lite     arm     arm926ejs       imx27lite       logicpd         mx27
+ magnesium     arm     arm926ejs       imx27lite       logicpd         mx27
+ omap5912osk   arm     arm926ejs       -               ti              omap
+ edminiv2      arm     arm926ejs       -               LaCie           orion5x
+ omap3_overo   arm     armv7           overo           -               omap3
+ omap3_pandora arm     armv7           pandora         -               omap3
+ omap3_zoom1   arm     armv7           zoom1           logicpd         omap3
+ omap3_zoom2   arm     armv7           zoom2           logicpd         omap3
+ omap3_beagle  arm     armv7           beagle          ti              omap3
+ omap3_evm     arm     armv7           evm             ti              omap3
+ omap3_sdp3430 arm     armv7           sdp3430         ti              omap3
+ omap4_panda   arm     armv7           panda           ti              omap4
+ omap4_sdp4430 arm     armv7           sdp4430         ti              omap4
++xpele         arm     armv7           dfe             xilinx          pele
+ am3517_evm    arm     armv7           am3517evm       logicpd         omap3
+ devkit8000    arm     armv7           devkit8000      timll           omap3
+ s5p_goni      arm     armv7           goni            samsung         s5pc1xx
+ smdkc100      arm     armv7           smdkc100        samsung         s5pc1xx
+ ixdpg425      arm     ixp
+ lpd7a400      arm     lh7a40x         lpd7a40x
+ lpd7a404      arm     lh7a40x         lpd7a40x
+ pxa255_idp    arm     pxa
+ wepep250      arm     pxa
+ xsengine      arm     pxa
+ zylonite      arm     pxa
+ atngw100      avr32   at32ap          -               atmel           at32ap700x
+ atstk1002     avr32   at32ap          atstk1000       atmel           at32ap700x
+ atstk1003     avr32   at32ap          atstk1000       atmel           at32ap700x
+ atstk1004     avr32   at32ap          atstk1000       atmel           at32ap700x
+ atstk1006     avr32   at32ap          atstk1000       atmel           at32ap700x
+ favr-32-ezkit avr32   at32ap          -               earthlcd        at32ap700x
+ hammerhead    avr32   at32ap          -               miromico        at32ap700x
+ bf518f-ezbrd  blackfin        blackfin
+ bf526-ezbrd   blackfin        blackfin
+ bf527-ad7160-eval blackfin    blackfin
+ bf527-ezkit   blackfin        blackfin
+ bf533-ezkit   blackfin        blackfin
+ bf533-stamp   blackfin        blackfin
+ bf537-minotaur        blackfin        blackfin
+ bf537-pnav    blackfin        blackfin
+ bf537-srv1    blackfin        blackfin
+ bf537-stamp   blackfin        blackfin
+ bf538f-ezkit  blackfin        blackfin
+ bf548-ezkit   blackfin        blackfin
+ bf561-acvilon blackfin        blackfin
+ bf561-ezkit   blackfin        blackfin
+ blackstamp    blackfin        blackfin
+ cm-bf527      blackfin        blackfin
+ cm-bf533      blackfin        blackfin
+ cm-bf537e     blackfin        blackfin
+ cm-bf537u     blackfin        blackfin
+ cm-bf548      blackfin        blackfin
+ cm-bf561      blackfin        blackfin
+ ibf-dsp561    blackfin        blackfin
+ ip04  blackfin        blackfin
+ tcm-bf518     blackfin        blackfin
+ tcm-bf537     blackfin        blackfin
+ M5208EVBE     m68k    mcf52x2         m5208evbe       freescale
+ M5249EVB      m68k    mcf52x2         m5249evb        freescale
+ M5253DEMO     m68k    mcf52x2         m5253demo       freescale
+ M5253EVBE     m68k    mcf52x2         m5253evbe       freescale
+ M5271EVB      m68k    mcf52x2         m5271evb        freescale
+ M5275EVB      m68k    mcf52x2         m5275evb        freescale
+ M5282EVB      m68k    mcf52x2         m5282evb        freescale
+ M53017EVB     m68k    mcf52x2         m53017evb       freescale
+ microblaze-generic    microblaze      microblaze      microblaze-generic      xilinx
+ mpc7448hpc2   powerpc 74xx_7xx        mpc7448hpc2     freescale
+ pdm360ng      powerpc mpc512x
+ mecp5123      powerpc mpc512x         -               esd
+ cmi_mpc5xx    powerpc mpc5xx          cmi
+ motionpro     powerpc mpc5xxx
+ cpci5200      powerpc mpc5xxx         -               esd
+ mecp5200      powerpc mpc5xxx         -               esd
+ Alaska8220    powerpc mpc8220         alaska
+ Yukon8220     powerpc mpc8220         alaska
+ HIDDEN_DRAGON powerpc mpc824x         hidden_dragon
+ IPHASE4539    powerpc mpc8260         iphase4539
+ ppmc8260      powerpc mpc8260
+ RPXsuper      powerpc mpc8260         rpxsuper
+ rsdproto      powerpc mpc8260
+ MPC8266ADS    powerpc mpc8260         mpc8266ads      freescale
+ MPC8308RDB    powerpc mpc83xx         mpc8308rdb      freescale
+ MPC8323ERDB   powerpc mpc83xx         mpc8323erdb     freescale
+ MPC8349EMDS   powerpc mpc83xx         mpc8349emds     freescale
+ MPC837XERDB   powerpc mpc83xx         mpc837xerdb     freescale
+ ATUM8548      powerpc mpc85xx         atum8548
+ socrates      powerpc mpc85xx         socrates
+ MPC8540ADS    powerpc mpc85xx         mpc8540ads      freescale
+ MPC8544DS     powerpc mpc85xx         mpc8544ds       freescale
+ MPC8560ADS    powerpc mpc85xx         mpc8560ads      freescale
+ MPC8568MDS    powerpc mpc85xx         mpc8568mds      freescale
+ P4080DS               powerpc mpc85xx         corenet_ds      freescale
+ XPEDITE5200   powerpc mpc85xx         xpedite5200     xes
+ XPEDITE5370   powerpc mpc85xx         xpedite5370     xes
+ P1022DS               powerpc mpc85xx         p1022ds         freescale
+ sbc8641d      powerpc mpc86xx
+ MPC8610HPCD   powerpc mpc86xx         mpc8610hpcd     freescale
+ XPEDITE5170   powerpc mpc86xx         xpedite5170     xes
+ cogent_mpc8xx powerpc mpc8xx          cogent
+ ESTEEM192E    powerpc mpc8xx          esteem192e
+ RPXClassic    powerpc mpc8xx
+ RRvision      powerpc mpc8xx
+ svm_sc8xx     powerpc mpc8xx
+ pcs440ep      powerpc ppc4xx
+ quad100hd     powerpc ppc4xx
+ dlvision      powerpc ppc4xx          -               gdsys
+ gdppc440etx   powerpc ppc4xx          -               gdsys
+ CPCIISER4     powerpc ppc4xx          cpciiser4       esd
+ DASA_SIM      powerpc ppc4xx          dasa_sim        esd
+ PMC405DE      powerpc ppc4xx          pmc405de        esd
+ METROBOX      powerpc ppc4xx          metrobox        sandburst
+ XPEDITE1000   powerpc ppc4xx          xpedite1000     xes
+ grsim_leon2   sparc   leon2           -               gaisler
+ gr_cpci_ax2000        sparc   leon3           -               gaisler
+ gr_ep2s60     sparc   leon3           -               gaisler
+ gr_xc3s_1500  sparc   leon3           -               gaisler
+ davinci_dm355evm arm  arm926ejs       dm355evm        davinci         davinci
+ davinci_dm365evm arm  arm926ejs       dm365evm        davinci         davinci
+ davinci_dm6467evm arm arm926ejs       dm6467evm       davinci         davinci
+ davinci_schmoogie arm arm926ejs       schmoogie       davinci         davinci
+ davinci_dm355leopard arm arm926ejs    dm355leopard    davinci         davinci
Simple merge
Simple merge
Simple merge
Simple merge