]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Fri, 14 Sep 2012 14:15:48 +0000 (07:15 -0700)
committerTom Rini <trini@ti.com>
Fri, 14 Sep 2012 14:15:48 +0000 (07:15 -0700)
1  2 
boards.cfg

diff --combined boards.cfg
index e1239045e593aa6e6683b8231f68734c8108a47a,6b54941fe1fad654607d929b0776c55b5880823c..ea5c7a9b75d5687b312787693a01399297ba6817
@@@ -53,7 -53,6 +53,7 @@@ mx35pdk                      ar
  apollon                            arm         arm1136     apollon             -              omap24xx
  omap2420h4                   arm         arm1136     -                   ti             omap24xx
  tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
 +rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
  integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
  integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap:CM920T
  integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp:CM920T
@@@ -95,8 -94,6 +95,8 @@@ at91sam9g20ek_nandflash      ar
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
  at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
  at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 +at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
 +at91sam9x5ek_spiflash        arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH
  at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
  at91sam9xeek_dataflash_cs1   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1
  at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
@@@ -128,13 -125,10 +128,13 @@@ cpu9G20_nand_128M            ar
  pm9261                       arm         arm926ejs   pm9261              ronetix        at91        pm9261:AT91SAM9261
  pm9263                       arm         arm926ejs   pm9263              ronetix        at91        pm9263:AT91SAM9263
  pm9g45                       arm         arm926ejs   pm9g45              ronetix        at91        pm9g45:AT91SAM9G45
 +portuxg20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20,PORTUXG20
 +stamp9g20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20
  cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
  da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
  da850_am18xxevm              arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
  da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH
 +da850evm_direct_nor          arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT
  davinci_dm355evm             arm         arm926ejs   dm355evm            davinci        davinci
  davinci_dm355leopard         arm         arm926ejs   dm355leopard        davinci        davinci
  davinci_dm365evm             arm         arm926ejs   dm365evm            davinci        davinci
@@@ -181,10 -175,8 +181,10 @@@ tx25                         ar
  zmx25                        arm         arm926ejs   zmx25               syteco         mx25
  imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
  magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
 -m28evk                       arm         arm926ejs   -                   denx           mx28
 -mx28evk                      arm         arm926ejs   -                   freescale      mx28
 +apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs           apx4devkit
 +m28evk                       arm         arm926ejs   m28evk              denx           mxs           m28evk
 +mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk
 +sc_sps_1                     arm         arm926ejs   sc_sps_1            schulercontrol mxs
  nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
  nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
  omap5912osk                  arm         arm926ejs   -                   ti             omap
@@@ -221,8 -213,8 +221,8 @@@ integratorcp_cm946es         ar
  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
  am335x_evm                   arm         armv7       am335x              ti             am33xx
  highbank                     arm         armv7       highbank            -              highbank
 -efikamx                      arm         armv7       efikamx             -              mx5           efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
 -efikasb                      arm         armv7       efikamx             -              mx5           efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg
 +mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
 +mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
  mx51evk                      arm         armv7       mx51evk             freescale      mx5           mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
  mx53ard                      arm         armv7       mx53ard             freescale      mx5           mx53ard:IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg
  mx53evk                      arm         armv7       mx53evk             freescale      mx5           mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg
@@@ -236,10 -228,8 +236,10 @@@ cm_t35                       ar
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
  dig297                       arm         armv7       dig297              comelit        omap3
 -igep0020                     arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020
 -igep0030                     arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030
 +igep0020                     arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND
 +igep0020_nand                arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND
 +igep0030                     arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
 +igep0030_nand                arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND
  am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
  mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
  omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
@@@ -266,12 -256,11 +266,12 @@@ s5pc210_universal            ar
  smdk5250                   arm         armv7       smdk5250            samsung        exynos
  smdkv310                   arm         armv7       smdkv310            samsung        exynos
  trats                        arm         armv7       trats               samsung        exynos
 -harmony                      arm         armv7       harmony             nvidia         tegra2
 -seaboard                     arm         armv7       seaboard            nvidia         tegra2
 -ventana                      arm         armv7       ventana             nvidia         tegra2
 -whistler                     arm         armv7       whistler            nvidia         tegra2
 +harmony                      arm         armv7:arm720t harmony           nvidia         tegra20
 +seaboard                     arm         armv7:arm720t seaboard          nvidia         tegra20
 +ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
 +whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
 +snowball                     arm         armv7       snowball               st-ericsson    u8500
  actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
  actux1_4_32                  arm         ixp         actux1              -              -           actux1:FLASH2X2,RAM_32MB
  actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
@@@ -296,13 -285,12 +296,13 @@@ xaeniax                      ar
  zipitz2                      arm         pxa
  colibri_pxa270               arm         pxa         -                   toradex
  jornada                      arm         sa1100
 -plutux                       arm         armv7       plutux              avionic-design tegra2
 -medcom                       arm         armv7       medcom              avionic-design tegra2
 -tec                          arm         armv7       tec                 avionic-design tegra2
 -paz00                        arm         armv7       paz00               compal         tegra2
 -trimslice                    arm         armv7       trimslice           compulab       tegra2
 +plutux                       arm         armv7:arm720t plutux            avionic-design tegra20
 +medcom                       arm         armv7:arm720t medcom            avionic-design tegra20
 +tec                          arm         armv7:arm720t tec               avionic-design tegra20
 +paz00                        arm         armv7:arm720t paz00             compal         tegra20
 +trimslice                    arm         armv7:arm720t trimslice         compulab       tegra20
  atngw100                     avr32       at32ap      -                   atmel          at32ap700x
 +atngw100mkii                 avr32       at32ap      -                   atmel          at32ap700x
  atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
  atstk1003                    avr32       at32ap      atstk1000           atmel          at32ap700x
  atstk1004                    avr32       at32ap      atstk1000           atmel          at32ap700x
@@@ -390,7 -378,8 +390,8 @@@ M5485FFE                m68k        mcf547x_8x  m548xe
  M5485GFE                   m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64
  M5485HFE                   m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
- qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips
+ qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
+ qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -474,6 -463,7 +475,6 @@@ mcc200_highboot_SDRAM        powerp
  mcc200_SDRAM                 powerpc     mpc5xxx     mcc200              -              -           mcc200:MCC200_SDRAM
  motionpro                    powerpc     mpc5xxx
  munices                      powerpc     mpc5xxx
 -o2dnt                        powerpc     mpc5xxx
  PM520                        powerpc     mpc5xxx     pm520
  PM520_DDR                    powerpc     mpc5xxx     pm520               -              -           PM520:MPC5200_DDR
  PM520_ROMBOOT                powerpc     mpc5xxx     pm520               -              -           PM520:BOOT_ROM
@@@ -493,16 -483,6 +494,16 @@@ TOP5200                      powerp
  cpci5200                     powerpc     mpc5xxx     -                   esd
  mecp5200                     powerpc     mpc5xxx     -                   esd
  pf5200                       powerpc     mpc5xxx     -                   esd
 +O2D                          powerpc     mpc5xxx     o2dnt2              ifm            -           o2d
 +O2D300                       powerpc     mpc5xxx     o2dnt2              ifm            -           o2d300
 +O2DNT2                       powerpc     mpc5xxx     o2dnt2              ifm            -           o2dnt2
 +O2DNT2_RAMBOOT               powerpc     mpc5xxx     o2dnt2              ifm            -           o2dnt2:SYS_TEXT_BASE=0x00100000
 +O2I                          powerpc     mpc5xxx     o2dnt2              ifm            -           o2i
 +O2MNT                        powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt
 +O2MNT_O2M110                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M110"
 +O2MNT_O2M112                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M112"
 +O2MNT_O2M113                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M113"
 +O3DNT                        powerpc     mpc5xxx     o2dnt2              ifm            -           o3dnt
  digsy_mtc                    powerpc     mpc5xxx     digsy_mtc           intercontrol
  digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000
  digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:DIGSY_REV5