Merge branch 'master' of git://88.191.163.10/u-boot-arm

Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
	arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --combined .gitignore
index 43e957ac0b79a97f52992c2af8c2032b59242cb2,d1282e790e43d56bfd9aa444db5d740d7ff133a4..255d89f8933c9a6fd9bf9456d110bb005bede67c
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -16,7 -16,6 +16,7 @@@
  *.patch
  *.bin
  *.cfgtmp
 +*.dts.tmp
  
  # Build tree
  /build-*
@@@ -25,7 -24,7 +25,7 @@@
  # Top-level generic files
  #
  
- /MLO
+ /MLO*
  /SPL
  /System.map
  /u-boot

diff --combined MAINTAINERS
index 4297fe1ce2fcd0e159bd3be17b028cd5971d6eb4,23965a8d3359f7325cc449b23e21f527222f0446..6e50fc4802fa1aab4177f7c3c606dc3fbdd90c5d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -448,6 -448,7 +448,7 @@@ Heiko Schocher <hs@denx.de
        cam_enc_4xx     davinci/ARM926EJS
        charon          MPC5200
        ids8247         MPC8247
+       ipam390         davinci/ARM926EJS
        jupiter         MPC5200
        kmsupx5         MPC8321
        mucmc52         MPC5200
@@@ -472,10 -473,6 +473,10 @@@ Ira W. Snyder <iws@ovro.caltech.edu
  
        P2020COME       P2020
  
 +York Sun <yorksun@freescale.com>
 +
 +      T4240EMU        T4240
 +
  Timur Tabi <timur@freescale.com>
  
        MPC8349E-mITX   MPC8349
@@@ -543,10 -540,6 +544,10 @@@ Detlev Zundel <dzu@denx.de
  
        inka4x0         MPC5200
  
 +Po Liu <po.liu@freescale.com>
 +
 +      C29XPCIE        C29X
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -609,7 -602,6 +610,6 @@@ Jason Liu <r64343@freescale.com
        mx53evk         i.MX53
        mx53loco        i.MX53
        mx6qarm2        i.MX6Q
-       mx6qsabrelite   i.MX6Q
  
  Enric Balletbo i Serra <eballetbo@iseebcn.com>
  
@@@ -952,6 -944,10 +952,10 @@@ Lucas Stach <dev@lynxeye.de
  
        colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
  
+ Antoine Tenart <atenart@adeneo-embedded.com>
+ 
+       TI816X          ARM ARMV7 (TI816x Soc)
+ 
  Nick Thompson <nick.thompson@gefanuc.com>
  
        da830evm        ARM926EJS (DA830/OMAP-L137)
@@@ -1075,6 -1071,7 +1079,7 @@@ Pali Rohár <pali.rohar@gmail.com
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
  
  Eric Nelson <eric.nelson@boundarydevices.com>
+       mx6qsabrelite           i.MX6Q          1GB
        nitrogen6dl             i.MX6DL         1GB
        nitrogen6dl2g           i.MX6DL         2GB
        nitrogen6q              i.MX6Q/6D       1GB
@@@ -1366,7 -1363,7 +1371,7 @@@ Dimitar Penev <dpn@switchfin.org
  #     Board           CPU                                             #
  #########################################################################
  
 -Macpaul Lin <macpaul@andestech.com>
 +Andes <uboot@andestech.com>
  
        ADP-AG101       N1213 (AG101 SoC)
        ADP-AG101P      N1213 (AG101P XC5 FPGA)

diff --combined Makefile
index d545d306fde14faae567cb65c7706933ee04fe93,5461a21b5a06528056b1980bc33887248214e9cf..332706218f3f021abd35d8d6cf8b864efb9a0c52
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -322,7 -322,7 +322,7 @@@ LIBS-y += api/libapi.
  LIBS-y += post/libpost.o
  LIBS-y += test/libtest.o
  
- ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ ifneq ($(CONFIG_OMAP_COMMON),)
  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
  endif
  
@@@ -413,7 -413,7 +413,7 @@@ endi
  
  all:          $(ALL-y) $(SUBDIR_EXAMPLES)
  
 -$(obj)u-boot.dtb:     $(obj)u-boot
 +$(obj)u-boot.dtb:     checkdtc $(obj)u-boot
                $(MAKE) -C dts binary
                mv $(obj)dts/dt.dtb $@
  
@@@ -667,12 -667,6 +667,12 @@@ checkgcc4
                false; \
        fi
  
 +checkdtc:
 +      @if test $(call dtc-version) -lt 0104; then \
 +              echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \
 +              false; \
 +      fi
 +
  #
  # Auto-generate the autoconf.mk file (which is included by all makefiles)
  #

diff --combined README
index 96cc4668e0c219731c318d0bb577012d6c8d08a4,78aa5a518031e47c917b85ca3ebb65cc9325d823..953ff179006dcf6bd3913657335469cc66c17019
--- 1/README
--- 2/README
+++ b/README
@@@ -406,25 -406,13 +406,25 @@@ The following options need to be config
                This is the value to write into CCSR offset 0x18600
                according to the A004510 workaround.
  
 +              CONFIG_SYS_FSL_DSP_DDR_ADDR
 +              This value denotes start offset of DDR memory which is
 +              connected exclusively to the DSP cores.
 +
                CONFIG_SYS_FSL_DSP_M2_RAM_ADDR
                This value denotes start offset of M2 memory
                which is directly connected to the DSP core.
  
 +              CONFIG_SYS_FSL_DSP_M3_RAM_ADDR
 +              This value denotes start offset of M3 memory which is directly
 +              connected to the DSP core.
 +
                CONFIG_SYS_FSL_DSP_CCSRBAR_DEFAULT
                This value denotes start offset of DSP CCSR space.
  
 +              CONFIG_SYS_FSL_DDR_EMU
 +              Specify emulator support for DDR. Some DDR features such as
 +              deskew training are not available.
 +
  - Generic CPU options:
                CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN
  
@@@ -2641,6 -2629,21 +2641,21 @@@ CBFS (Coreboot Filesystem) suppor
                Note: There is also a sha1sum command, which should perhaps
                be deprecated in favour of 'hash sha1'.
  
+ - Freescale i.MX specific commands:
+               CONFIG_CMD_HDMIDETECT
+               This enables 'hdmidet' command which returns true if an
+               HDMI monitor is detected.  This command is i.MX 6 specific.
+ 
+               CONFIG_CMD_BMODE
+               This enables the 'bmode' (bootmode) command for forcing
+               a boot from specific media.
+ 
+               This is useful for forcing the ROM's usb downloader to
+               activate upon a watchdog reset which is nice when iterating
+               on U-Boot.  Using the reset button or running bmode normal
+               will set it back to normal.  This command currently
+               supports i.MX53 and i.MX6.
+ 
  - Signing support:
                CONFIG_RSA
  
@@@ -4627,12 -4630,6 +4642,12 @@@ List of environment variables (most lik
  
    npe_ucode   - set load address for the NPE microcode
  
 +  silent_linux  - If set then linux will be told to boot silently, by
 +                changing the console to be empty. If "yes" it will be
 +                made silent. If "no" it will not be made silent. If
 +                unset, then it will be made silent if the U-Boot console
 +                is silent.
 +
    tftpsrcport - If this is set, the value is used for TFTP's
                  UDP source port.
  

diff --combined arch/arm/include/asm/arch-am33xx/hardware.h
index 2dfcc2e65bef0297ecb0a402b421720dbc946fbe,2055b254948995da637dfe779d1ae39b50921237..ee5fce0da1caef5677d66d565c66d0b956beb61e
--- 1/arch/arm/include/asm/arch-am33xx/hardware.h
--- 2/arch/arm/include/asm/arch-am33xx/hardware.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware.h
@@@ -15,8 -15,12 +15,12 @@@
  #include <asm/arch/omap.h>
  #ifdef CONFIG_AM33XX
  #include <asm/arch/hardware_am33xx.h>
+ #elif defined(CONFIG_TI816X)
+ #include <asm/arch/hardware_ti816x.h>
  #elif defined(CONFIG_TI814X)
  #include <asm/arch/hardware_ti814x.h>
+ #elif defined(CONFIG_AM43XX)
+ #include <asm/arch/hardware_am43xx.h>
  #endif
  
  /*
@@@ -45,38 -49,23 +49,24 @@@
  #define EMIF4_1_CFG_BASE              0x4D000000
  
  /* PLL related registers */
- #define CM_PER                                0x44E00000
- #define CM_WKUP                               0x44E00400
  #define CM_DPLL                               0x44E00500
  #define CM_DEVICE                     0x44E00700
  #define CM_RTC                                0x44E00800
  #define CM_CEFUSE                     0x44E00A00
  #define PRM_DEVICE                    0x44E00F00
  
- /* VTP Base address */
- #define VTP1_CTRL_ADDR                        0x48140E10
- 
  /* DDR Base address */
  #define DDR_CTRL_ADDR                 0x44E10E04
  #define DDR_CONTROL_BASE_ADDR         0x44E11404
- #define DDR_PHY_CMD_ADDR2             0x47C0C800
- #define DDR_PHY_DATA_ADDR2            0x47C0C8C8
  
  /* UART */
  #define DEFAULT_UART_BASE             UART0_BASE
  
- #define DDRPHY_0_CONFIG_BASE          (CTRL_BASE + 0x1400)
- #define DDRPHY_CONFIG_BASE            DDRPHY_0_CONFIG_BASE
- 
  /* GPMC Base address */
  #define GPMC_BASE                     0x50000000
  
  /* CPSW Config space */
  #define CPSW_BASE                     0x4A100000
  
- /* OTG */
- #define USB0_OTG_BASE                 0x47401000
- #define USB1_OTG_BASE                 0x47401800
- 
 +int clk_get(int clk);
  #endif /* __AM33XX_HARDWARE_H */

diff --combined boards.cfg
index d6e29fa495ce696b4058ee0ba69943121b7459b3,d7c8d341b84ed0a8d1e5ffa8db37cc1d9419c895..4b1f960e180ed5186ec2a88fd696767825f6822d
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
@@@ -140,6 -140,7 +140,7 @@@ pm9g45                       ar
  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
+ ipam390                      arm         arm926ejs   ipam390             Barix          davinci
  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
@@@ -241,15 -242,20 +242,20 @@@ integratorcp_cm946es         ar
  vexpress_ca15_tc2            arm         armv7       vexpress            armltd
  vexpress_ca5x2               arm         armv7       vexpress            armltd
  vexpress_ca9x4               arm         armv7       vexpress            armltd
- am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1
+ am335x_evm                   arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND
+ am335x_evm_nor               arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND,NOR
+ am335x_evm_norboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NOR,NOR_BOOT
  am335x_evm_spiboot           arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPI_BOOT
- am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=2
- am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL3,CONS_INDEX=3
- am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=4
- am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=5
- am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=6
- am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT
+ am335x_evm_uart1             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL2,CONS_INDEX=1,NAND
+ am335x_evm_uart2             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL3,CONS_INDEX=1,NAND
+ am335x_evm_uart3             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL4,CONS_INDEX=1,NAND
+ am335x_evm_uart4             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL5,CONS_INDEX=1,NAND
+ am335x_evm_uart5             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL6,CONS_INDEX=1,NAND
+ am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT
+ am335x_boneblack             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT
+ am43xx_evm                   arm         armv7       am43xx              ti             am33xx      am43xx_evm:SERIAL1,CONS_INDEX=1
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
+ ti816x_evm                   arm         armv7       ti816x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
  sama5d3xek_mmc               arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_MMC
  sama5d3xek_nandflash         arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH
@@@ -268,7 -274,7 +274,7 @@@ vision2                      ar
  cgtqmx6qeval                           arm             armv7           cgtqmx6eval             congatec               mx6             cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
  mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6           mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
  mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6           mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q
- mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6           mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+ mx6qsabrelite                arm         armv7       nitrogen6x          boundary       mx6           nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE
  mx6dlsabresd                 arm         armv7       mx6sabresd          freescale      mx6           mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL
  mx6qsabresd                  arm         armv7       mx6sabresd          freescale      mx6           mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
  mx6slevk                     arm         armv7       mx6slevk            freescale      mx6           mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL
@@@ -337,7 -343,7 +343,7 @@@ kzm9g                        ar
  armadillo-800eva             arm         armv7       armadillo-800eva    atmark-techno  rmobile
  zynq                         arm         armv7       zynq                xilinx         zynq
  zynq_dcc                     arm         armv7       zynq                xilinx         zynq        zynq:ZYNQ_DCC
- socfpga_cyclone5                arm         armv7          socfpga_cyclone5    altera             socfpga
+ socfpga_cyclone5                arm         armv7          socfpga    altera              socfpga
  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
@@@ -775,8 -781,6 +781,8 @@@ MPC8569MDS_NAND              powerp
  MPC8572DS                    powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS
  MPC8572DS_36BIT              powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:36BIT
  MPC8572DS_NAND               powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:NAND
 +C29XPCIE                     powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT
 +C29XPCIE_SPIFLASH            powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT,SPIFLASH
  P1010RDB_36BIT_NAND          powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND
  P1010RDB_36BIT_NAND_SECBOOT  powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT
  P1010RDB_36BIT_NOR           powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT
@@@ -807,20 -811,16 +813,20 @@@ P1020RDB_36BIT               powerp
  P1020RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SDCARD
  P1020RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SPIFLASH
  P1020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,NAND
 -P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB
 -P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT
 -P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,NAND
 -P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SDCARD
 -P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SPIFLASH
 -P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,NAND
 -P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SDCARD
 -P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SPIFLASH
 +P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC
 +P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT
 +P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,NAND
 +P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SDCARD
 +P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SPIFLASH
 +P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,NAND
 +P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SDCARD
 +P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SPIFLASH
  P1020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SDCARD
  P1020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SPIFLASH
 +P1020RDB-PD                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD
 +P1020RDB-PD_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,NAND
 +P1020RDB-PD_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SDCARD
 +P1020RDB-PD_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SPIFLASH
  P1020UTM-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM
  P1020UTM-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT
  P1020UTM-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD
@@@ -854,7 -854,6 +860,7 @@@ P1025RDB_36BIT               powerp
  P1025RDB_NAND                powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,NAND
  P1025RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SDCARD
  P1025RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SPIFLASH
 +TWR-P1025                    powerpc     mpc85xx     p1_twr              freescale      -           p1_twr:TWR_P1025
  P2010RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB
  P2010RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT
  P2010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT,SDCARD
@@@ -931,7 -930,6 +937,7 @@@ stxgp3                       powerp
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
  T4240QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240
 +T4240EMU                     powerpc     mpc85xx     t4qds               freescale      -           T4240EMU:PPC_T4240
  T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SRIO_PCIE_BOOT            powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000