Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

diff --combined board/freescale/t104xrdb/MAINTAINERS
index a4775c02e621f2b795c4be7c71578dd394338005,62aae2f91ee8e6d78ac6ee70716d3af62b5589ef..b61e1c025404d673f9c6e0056055868225b66635
--- 1/board/freescale/t104xrdb/MAINTAINERS
--- 2/board/freescale/t104xrdb/MAINTAINERS
+++ b/board/freescale/t104xrdb/MAINTAINERS
@@@ -6,12 -6,13 +6,13 @@@ F:    include/configs/T104xRDB.
  F:    configs/T1040RDB_defconfig
  F:    configs/T1040RDB_NAND_defconfig
  F:    configs/T1040RDB_SPIFLASH_defconfig
+ F:    configs/T1042RDB_defconfig
  F:    configs/T1042RDB_PI_defconfig
  F:    configs/T1042RDB_PI_NAND_defconfig
  F:    configs/T1042RDB_PI_SPIFLASH_defconfig
  
  T1040RDB_SDCARD BOARD
 -M:    -
 +#M:   -
  S:    Maintained
  F:    configs/T1040RDB_SDCARD_defconfig
  F:    configs/T1042RDB_PI_SDCARD_defconfig

diff --combined include/configs/T104xRDB.h
index d4c6f588b62b8b64330dd84599c560f7d7b1728e,9001fcbc92ee7eb4b300ba4c45db63e498f9427c..5e2c100d9309b1b86cbc1ffa06e43031c0ddb076
--- 1/include/configs/T104xRDB.h
--- 2/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@@ -19,6 -19,9 +19,9 @@@
  #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1040_rcw.cfg
  #endif
  #ifdef CONFIG_T1042RDB_PI
+ #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_rcw.cfg
+ #endif
+ #ifdef CONFIG_T1042RDB
  #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg
  #endif
  
@@@ -477,7 -480,7 +480,7 @@@
  
  /* I2C bus multiplexer */
  #define I2C_MUX_PCA_ADDR                0x70
- #ifdef CONFIG_T1040RDB
+ #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
  #define I2C_MUX_CH_DEFAULT      0x8
  #endif
  
@@@ -503,7 -506,6 +506,7 @@@
  #define CONFIG_FSL_ESPI
  #define CONFIG_SPI_FLASH
  #define CONFIG_SPI_FLASH_STMICRO
 +#define CONFIG_SPI_FLASH_BAR
  #define CONFIG_CMD_SF
  #define CONFIG_SF_DEFAULT_SPEED         10000000
  #define CONFIG_SF_DEFAULT_MODE          0
@@@ -634,7 -636,7 +637,7 @@@
  #define CONFIG_SYS_DPAA_FMAN
  #define CONFIG_SYS_DPAA_PME
  
- #ifdef CONFIG_T1040RDB
+ #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
  #define CONFIG_QE
  #define CONFIG_U_QE
  #endif
@@@ -663,7 -665,7 +666,7 @@@
  #define CONFIG_SYS_FMAN_FW_ADDR               0xEFF00000
  #endif
  
- #ifdef CONFIG_T1040RDB
+ #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
  #if defined(CONFIG_SPIFLASH)
  #define CONFIG_SYS_QE_FW_ADDR         0x130000
  #elif defined(CONFIG_SDCARD)
@@@ -687,7 -689,7 +690,7 @@@
  #endif
  
  #ifdef CONFIG_FMAN_ENET
- #ifdef CONFIG_T1040RDB
+ #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB)
  #define CONFIG_SYS_SGMII1_PHY_ADDR            0x03
  #endif
  #define CONFIG_SYS_RGMII1_PHY_ADDR            0x01
@@@ -789,13 -791,14 +792,14 @@@
  #define CONFIG_BAUDRATE       115200
  
  #define __USB_PHY_TYPE        utmi
+ #define RAMDISKFILE   "t104xrdb/ramdisk.uboot"
  
  #ifdef CONFIG_T1040RDB
  #define FDTFILE               "t1040rdb/t1040rdb.dtb"
- #define RAMDISKFILE   "t1040rdb/ramdisk.uboot"
- #elif CONFIG_T1042RDB_PI
- #define FDTFILE               "t1040rdb_pi/t1040rdb_pi.dtb"
- #define RAMDISKFILE   "t1040rdb_pi/ramdisk.uboot"
+ #elif defined(CONFIG_T1042RDB_PI)
+ #define FDTFILE               "t1042rdb_pi/t1042rdb_pi.dtb"
+ #elif defined(CONFIG_T1042RDB)
+ #define FDTFILE               "t1042rdb/t1042rdb.dtb"
  #endif
  
  #ifdef CONFIG_FSL_DIU_FB