powerpc/p1010rdb: add p1010rdb-pb support with updating p1010rdb-pa
authorShengzhou Liu <Shengzhou.Liu@freescale.com>
Fri, 13 Sep 2013 06:46:03 +0000 (14:46 +0800)
committerYork Sun <yorksun@freescale.com>
Wed, 16 Oct 2013 23:15:17 +0000 (16:15 -0700)
- Rename old P1010RDB board as P1010RDB-PA.
- Add support for new P1010RDB-PB board.
- Some optimization.

For more details, see board/freescale/p1010rdb/README.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
[York Sun: fix conflicts in boards.cfg]
Acked-by: York Sun <yorksun@freescale.com>
board/freescale/p1010rdb/p1010rdb.c
boards.cfg
include/configs/P1010RDB.h

index ae8ba45e69d125b96241570aacdafeaa788fdf0c..e940d2275e972a15f982423c358fd76d2bcca529 100644 (file)
@@ -38,12 +38,23 @@ DECLARE_GLOBAL_DATA_PTR;
 enum {
        MUX_TYPE_IFC,
        MUX_TYPE_SDHC,
+       MUX_TYPE_SPIFLASH,
+       MUX_TYPE_TDM,
+       MUX_TYPE_CAN,
+       MUX_TYPE_CS0_NOR,
+       MUX_TYPE_CS0_NAND,
+};
+
+enum {
+       I2C_READ_BANK,
+       I2C_READ_PCB_VER,
 };
 
 static uint sd_ifc_mux;
 
 struct cpld_data {
        u8 cpld_ver; /* cpld revision */
+#if defined(CONFIG_P1010RDB_PA)
        u8 pcba_ver; /* pcb revision number */
        u8 twindie_ddr3;
        u8 res1[6];
@@ -58,6 +69,9 @@ struct cpld_data {
        u8 por1; /* POR Options */
        u8 por2; /* POR Options */
        u8 por3; /* POR Options */
+#elif defined(CONFIG_P1010RDB_PB)
+       u8 rom_loc;
+#endif
 };
 
 int board_early_init_f(void)
@@ -116,6 +130,9 @@ int config_board_mux(int ctrl_type)
        ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
        u8 tmp;
 
+#if defined(CONFIG_P1010RDB_PA)
+       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+
        switch (ctrl_type) {
        case MUX_TYPE_IFC:
                i2c_set_bus_num(I2C_PCA9557_BUS_NUM);
@@ -136,25 +153,171 @@ int config_board_mux(int ctrl_type)
                clrsetbits_be32(&gur->pmuxcr, PMUXCR1_SDHC_MASK,
                                PMUXCR1_SDHC_ENABLE);
                break;
+       case MUX_TYPE_SPIFLASH:
+               out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_FLASH);
+               break;
+       case MUX_TYPE_TDM:
+               out_8(&cpld_data->tdm_can_sel, MUX_CPLD_TDM);
+               out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_SLIC);
+               break;
+       case MUX_TYPE_CAN:
+               out_8(&cpld_data->tdm_can_sel, MUX_CPLD_CAN_UART);
+               break;
        default:
                break;
        }
+#elif defined(CONFIG_P1010RDB_PB)
+       uint orig_bus = i2c_get_bus_num();
+       i2c_set_bus_num(I2C_PCA9557_BUS_NUM);
 
+       switch (ctrl_type) {
+       case MUX_TYPE_IFC:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x04);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x04);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               sd_ifc_mux = MUX_TYPE_IFC;
+               clrbits_be32(&gur->pmuxcr, PMUXCR1_IFC_MASK);
+               break;
+       case MUX_TYPE_SDHC:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               setbits_8(&tmp, 0x04);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x04);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               sd_ifc_mux = MUX_TYPE_SDHC;
+               clrsetbits_be32(&gur->pmuxcr, PMUXCR1_SDHC_MASK,
+                               PMUXCR1_SDHC_ENABLE);
+               break;
+       case MUX_TYPE_SPIFLASH:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x80);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x80);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               break;
+       case MUX_TYPE_TDM:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               setbits_8(&tmp, 0x82);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x82);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               break;
+       case MUX_TYPE_CAN:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x02);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x02);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               break;
+       case MUX_TYPE_CS0_NOR:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x08);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x08);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               break;
+       case MUX_TYPE_CS0_NAND:
+               i2c_read(I2C_PCA9557_ADDR2, 0, 1, &tmp, 1);
+               setbits_8(&tmp, 0x08);
+               i2c_write(I2C_PCA9557_ADDR2, 1, 1, &tmp, 1);
+               i2c_read(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               clrbits_8(&tmp, 0x08);
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &tmp, 1);
+               break;
+       default:
+               break;
+       }
+       i2c_set_bus_num(orig_bus);
+#endif
        return 0;
 }
 
+#ifdef CONFIG_P1010RDB_PB
+int i2c_pca9557_read(int type)
+{
+       u8 val;
+
+       i2c_set_bus_num(I2C_PCA9557_BUS_NUM);
+       i2c_read(I2C_PCA9557_ADDR2, 0, 1, &val, 1);
+
+       switch (type) {
+       case I2C_READ_BANK:
+               val = (val & 0x10) >> 4;
+               break;
+       case I2C_READ_PCB_VER:
+               val = ((val & 0x60) >> 5) + 1;
+               break;
+       default:
+               break;
+       }
+
+       return val;
+}
+#endif
+
 int checkboard(void)
 {
        struct cpu_type *cpu;
+       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
+       u8 val;
 
        cpu = gd->arch.cpu;
-       printf("Board: %sRDB\n", cpu->name);
+#if defined(CONFIG_P1010RDB_PA)
+       printf("Board: %sRDB-PA, ", cpu->name);
+#elif defined(CONFIG_P1010RDB_PB)
+       printf("Board: %sRDB-PB, ", cpu->name);
+       i2c_set_bus_num(I2C_PCA9557_BUS_NUM);
+       i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_FSL_I2C_SLAVE);
+       val = 0x0;  /* no polarity inversion */
+       i2c_write(I2C_PCA9557_ADDR2, 2, 1, &val, 1);
+#endif
 
 #ifdef CONFIG_SDCARD
        /* switch to IFC to read info from CPLD */
        config_board_mux(MUX_TYPE_IFC);
 #endif
 
+#if defined(CONFIG_P1010RDB_PA)
+       val = (in_8(&cpld_data->pcba_ver) & 0xf);
+       printf("PCB: v%x.0\n", val);
+#elif defined(CONFIG_P1010RDB_PB)
+       val = in_8(&cpld_data->cpld_ver);
+       printf("CPLD: v%x.%x, ", val >> 4, val & 0xf);
+       printf("PCB: v%x.0, ", i2c_pca9557_read(I2C_READ_PCB_VER));
+       val = in_8(&cpld_data->rom_loc) & 0xf;
+       puts("Boot from: ");
+       switch (val) {
+       case 0xf:
+               config_board_mux(MUX_TYPE_CS0_NOR);
+               printf("NOR vBank%d\n", i2c_pca9557_read(I2C_READ_BANK));
+               break;
+       case 0xe:
+               puts("SDHC\n");
+               val = 0x60; /* set pca9557 pin input/output */
+               i2c_write(I2C_PCA9557_ADDR2, 3, 1, &val, 1);
+               break;
+       case 0x5:
+               config_board_mux(MUX_TYPE_IFC);
+               config_board_mux(MUX_TYPE_CS0_NAND);
+               puts("NAND\n");
+               break;
+       case 0x6:
+               config_board_mux(MUX_TYPE_IFC);
+               puts("SPI\n");
+               break;
+       default:
+               puts("unknown\n");
+               break;
+       }
+#endif
        return 0;
 }
 
@@ -348,7 +511,6 @@ void board_reset(void)
 
 int misc_init_r(void)
 {
-       struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE);
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
 
        if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "can")) {
@@ -356,7 +518,7 @@ int misc_init_r(void)
                                MPC85xx_PMUXCR_CAN1_UART |
                                MPC85xx_PMUXCR_CAN2_TDM |
                                MPC85xx_PMUXCR_CAN2_UART);
-               out_8(&cpld_data->tdm_can_sel, MUX_CPLD_CAN_UART);
+               config_board_mux(MUX_TYPE_CAN);
        } else if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "tdm")) {
                clrbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_CAN2_UART |
                                MPC85xx_PMUXCR_CAN1_UART);
@@ -364,11 +526,10 @@ int misc_init_r(void)
                                MPC85xx_PMUXCR_CAN1_TDM);
                clrbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_UART_GPIO);
                setbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_UART_TDM);
-               out_8(&cpld_data->tdm_can_sel, MUX_CPLD_TDM);
-               out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_SLIC);
+               config_board_mux(MUX_TYPE_TDM);
        } else {
                /* defaultly spi_cs_sel to flash */
-               out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_FLASH);
+               config_board_mux(MUX_TYPE_SPIFLASH);
        }
 
        if (hwconfig("esdhc"))
@@ -376,6 +537,9 @@ int misc_init_r(void)
        else if (hwconfig("ifc"))
                config_board_mux(MUX_TYPE_IFC);
 
+#ifdef CONFIG_P1010RDB_PB
+       setbits_be32(&gur->pmuxcr2, MPC85xx_PMUXCR2_GPIO01_DRVVBUS);
+#endif
        return 0;
 }
 
index 29eefd8aab5ed9536d31e8ea090455993226a28e..56af10246fa347f974d03b63c64129c8e23ba388 100644 (file)
@@ -826,20 +826,34 @@ Active  powerpc     mpc85xx        -           freescale       mpc8569mds
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS                            MPC8572DS                                                                                                                         -
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_36BIT                      MPC8572DS:36BIT                                                                                                                   -
 Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_NAND                       MPC8572DS:NAND                                                                                                                    -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NAND                  P1010RDB:P1010RDB,36BIT,NAND                                                                                                      -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NAND_SECBOOT          P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                                  -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NOR                   P1010RDB:P1010RDB,36BIT                                                                                                           -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NOR_SECBOOT           P1010RDB:P1010RDB,36BIT,SECURE_BOOT                                                                                               -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SDCARD                P1010RDB:P1010RDB,36BIT,SDCARD                                                                                                    -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SPIFLASH              P1010RDB:P1010RDB,36BIT,SPIFLASH                                                                                                  -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SPIFLASH_SECBOOT      P1010RDB:P1010RDB,36BIT,SPIFLASH,SECURE_BOOT                                                                                      -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NAND                        P1010RDB:P1010RDB,NAND                                                                                                            -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NAND_SECBOOT                P1010RDB:P1010RDB,NAND_SECBOOT,SECURE_BOOT                                                                                        -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NOR                         P1010RDB:P1010RDB                                                                                                                 -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NOR_SECBOOT                 P1010RDB:P1010RDB,SECURE_BOOT                                                                                                     -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SDCARD                      P1010RDB:P1010RDB,SDCARD                                                                                                          -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SPIFLASH                    P1010RDB:P1010RDB,SPIFLASH                                                                                                        -
-Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SPIFLASH_SECBOOT            P1010RDB:P1010RDB,SPIFLASH,SECURE_BOOT                                                                                            -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND               P1010RDB:P1010RDB_PA,36BIT,NAND                                                                                                   -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND_SECBOOT       P1010RDB:P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                               -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NOR                P1010RDB:P1010RDB_PA,36BIT                                                                                                        -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NOR_SECBOOT        P1010RDB:P1010RDB_PA,36BIT,SECURE_BOOT                                                                                            -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SDCARD             P1010RDB:P1010RDB_PA,36BIT,SDCARD                                                                                                 -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SPIFLASH           P1010RDB:P1010RDB_PA,36BIT,SPIFLASH                                                                                               -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SPIFLASH_SECBOOT   P1010RDB:P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT                                                                                   -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NAND                     P1010RDB:P1010RDB_PA,NAND                                                                                                         -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NAND_SECBOOT             P1010RDB:P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT                                                                                     -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NOR                      P1010RDB:P1010RDB_PA                                                                                                              -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NOR_SECBOOT              P1010RDB:P1010RDB_PA,SECURE_BOOT                                                                                                  -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SDCARD                   P1010RDB:P1010RDB_PA,SDCARD                                                                                                       -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SPIFLASH                 P1010RDB:P1010RDB_PA,SPIFLASH                                                                                                     -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SPIFLASH_SECBOOT         P1010RDB:P1010RDB_PA,SPIFLASH,SECURE_BOOT                                                                                         -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NAND               P1010RDB:P1010RDB_PB,36BIT,NAND                                                                                                   -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NAND_SECBOOT       P1010RDB:P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                               -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NOR                P1010RDB:P1010RDB_PB,36BIT                                                                                                        -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NOR_SECBOOT        P1010RDB:P1010RDB_PB,36BIT,SECURE_BOOT                                                                                            -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SDCARD             P1010RDB:P1010RDB_PB,36BIT,SDCARD                                                                                                 -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SPIFLASH           P1010RDB:P1010RDB_PB,36BIT,SPIFLASH                                                                                               -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SPIFLASH_SECBOOT   P1010RDB:P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT                                                                                   -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NAND                     P1010RDB:P1010RDB_PB,NAND                                                                                                         -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NAND_SECBOOT             P1010RDB:P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT                                                                                     -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NOR                      P1010RDB:P1010RDB_PB                                                                                                              -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NOR_SECBOOT              P1010RDB:P1010RDB_PB,SECURE_BOOT                                                                                                  -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SDCARD                   P1010RDB:P1010RDB_PB,SDCARD                                                                                                       -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SPIFLASH                 P1010RDB:P1010RDB_PB,SPIFLASH                                                                                                     -
+Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SPIFLASH_SECBOOT         P1010RDB:P1010RDB_PB,SPIFLASH,SECURE_BOOT                                                                                         -
 Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS                              -                                                                                                                                 Timur Tabi <timur@freescale.com>
 Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS_36BIT                        P1022DS:36BIT                                                                                                                     Timur Tabi <timur@freescale.com>
 Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS_36BIT_NAND                   P1022DS:36BIT,NAND                                                                                                                Timur Tabi <timur@freescale.com>
index 032c07877360e3d04e6fe15178aafab0abb30607..c6b9acac3bad17373533e7fdd1ff7d85df5b221c 100644 (file)
 #endif
 
 /* controller 2, Slot 2, tgtid 2, Base address 9000 */
+#if defined(CONFIG_P1010RDB_PA)
 #define CONFIG_SYS_PCIE2_NAME          "PCIe Slot"
+#elif defined(CONFIG_P1010RDB_PB)
+#define CONFIG_SYS_PCIE2_NAME          "mini PCIe Slot"
+#endif
 #define CONFIG_SYS_PCIE2_MEM_VIRT      0xa0000000
 #ifdef CONFIG_PHYS_64BIT
 #define CONFIG_SYS_PCIE2_MEM_BUS       0xc0000000
@@ -200,25 +204,24 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_DDR_INIT_ADDR       0x00000000
 #define CONFIG_SYS_DDR_INIT_EXT_ADDR   0x00000000
 #define CONFIG_SYS_DDR_MODE_CONTROL    0x00000000
-
 #define CONFIG_SYS_DDR_ZQ_CONTROL      0x89080600
 #define CONFIG_SYS_DDR_SR_CNTR         0x00000000
 #define CONFIG_SYS_DDR_RCW_1           0x00000000
 #define CONFIG_SYS_DDR_RCW_2           0x00000000
-#define CONFIG_SYS_DDR_CONTROL         0x470C0000      /* Type = DDR3  */
-#define CONFIG_SYS_DDR_CONTROL_2       0x04401010
+#define CONFIG_SYS_DDR_CONTROL         0xc70c0008      /* Type = DDR3  */
+#define CONFIG_SYS_DDR_CONTROL_2       0x24401000
 #define CONFIG_SYS_DDR_TIMING_4                0x00000001
 #define CONFIG_SYS_DDR_TIMING_5                0x03402400
 
-#define CONFIG_SYS_DDR_TIMING_3_800    0x00020000
-#define CONFIG_SYS_DDR_TIMING_0_800    0x00330004
-#define CONFIG_SYS_DDR_TIMING_1_800    0x6f6B4644
+#define CONFIG_SYS_DDR_TIMING_3_800    0x00030000
+#define CONFIG_SYS_DDR_TIMING_0_800    0x00110104
+#define CONFIG_SYS_DDR_TIMING_1_800    0x6f6b8644
 #define CONFIG_SYS_DDR_TIMING_2_800    0x0FA888CF
 #define CONFIG_SYS_DDR_CLK_CTRL_800    0x03000000
-#define CONFIG_SYS_DDR_MODE_1_800      0x40461520
-#define CONFIG_SYS_DDR_MODE_2_800      0x8000c000
+#define CONFIG_SYS_DDR_MODE_1_800      0x00441420
+#define CONFIG_SYS_DDR_MODE_2_800      0x00000000
 #define CONFIG_SYS_DDR_INTERVAL_800    0x0C300100
-#define CONFIG_SYS_DDR_WRLVL_CONTROL_800       0x8655A608
+#define CONFIG_SYS_DDR_WRLVL_CONTROL_800 0x8675f608
 
 /* settings for DDR3 at 667MT/s */
 #define CONFIG_SYS_DDR_TIMING_3_667            0x00010000
@@ -315,6 +318,8 @@ extern unsigned long get_sdram_size(void);
                                | CSPR_MSEL_NAND        \
                                | CSPR_V)
 #define CONFIG_SYS_NAND_AMASK  IFC_AMASK(64*1024)
+
+#if defined(CONFIG_P1010RDB_PA)
 #define CONFIG_SYS_NAND_CSOR   (CSOR_NAND_ECC_ENC_EN   /* ECC on encode */ \
                                | CSOR_NAND_ECC_DEC_EN  /* ECC on decode */ \
                                | CSOR_NAND_ECC_MODE_4  /* 4-bit ECC */ \
@@ -322,13 +327,26 @@ extern unsigned long get_sdram_size(void);
                                | CSOR_NAND_PGS_512     /* Page Size = 512b */ \
                                | CSOR_NAND_SPRZ_16     /* Spare size = 16 */ \
                                | CSOR_NAND_PB(32))     /* 32 Pages Per Block */
+#define CONFIG_SYS_NAND_BLOCK_SIZE     (16 * 1024)
+
+#elif defined(CONFIG_P1010RDB_PB)
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_SYS_NAND_CSOR   (CSOR_NAND_ECC_ENC_EN   /* ECC on encode */ \
+                               | CSOR_NAND_ECC_DEC_EN  /* ECC on decode */ \
+                               | CSOR_NAND_ECC_MODE_4  /* 4-bit ECC */ \
+                               | CSOR_NAND_RAL_3       /* RAL = 3Byes */ \
+                               | CSOR_NAND_PGS_4K      /* Page Size = 4K */ \
+                               | CSOR_NAND_SPRZ_224    /* Spare size = 224 */ \
+                               | CSOR_NAND_PB(128))  /*Pages Per Block = 128 */
+#define CONFIG_SYS_NAND_BLOCK_SIZE     (512 * 1024)
+#endif
 
 #define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_MTD_NAND_VERIFY_WRITE
 #define CONFIG_CMD_NAND
-#define CONFIG_SYS_NAND_BLOCK_SIZE     (16 * 1024)
 
+#if defined(CONFIG_P1010RDB_PA)
 /* NAND Flash Timing Params */
 #define CONFIG_SYS_NAND_FTIM0          FTIM0_NAND_TCCST(0x01) | \
                                        FTIM0_NAND_TWP(0x0C)   | \
@@ -343,6 +361,23 @@ extern unsigned long get_sdram_size(void);
                                        FTIM2_NAND_TWHRE(0x0f)
 #define CONFIG_SYS_NAND_FTIM3          FTIM3_NAND_TWW(0x04)
 
+#elif defined(CONFIG_P1010RDB_PB)
+/* support MT29F16G08ABABAWP 4k-pagesize 2G-bytes NAND */
+/* ONFI NAND Flash mode0 Timing Params */
+#define CONFIG_SYS_NAND_FTIM0  (FTIM0_NAND_TCCST(0x07)| \
+                                       FTIM0_NAND_TWP(0x18)   | \
+                                       FTIM0_NAND_TWCHT(0x07) | \
+                                       FTIM0_NAND_TWH(0x0a))
+#define CONFIG_SYS_NAND_FTIM1  (FTIM1_NAND_TADLE(0x32)| \
+                                       FTIM1_NAND_TWBE(0x39)  | \
+                                       FTIM1_NAND_TRR(0x0e)   | \
+                                       FTIM1_NAND_TRP(0x18))
+#define CONFIG_SYS_NAND_FTIM2  (FTIM2_NAND_TRAD(0x0f) | \
+                                       FTIM2_NAND_TREH(0x0a)  | \
+                                       FTIM2_NAND_TWHRE(0x1e))
+#define CONFIG_SYS_NAND_FTIM3  0x0
+#endif
+
 #define CONFIG_SYS_NAND_DDR_LAW                11
 
 /* Set up IFC registers for boot location NOR/NAND */
@@ -475,10 +510,20 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_FSL_I2C2_SLAVE      0x7F
 #define CONFIG_SYS_FSL_I2C2_OFFSET     0x3100
 #define I2C_PCA9557_ADDR1              0x18
+#define I2C_PCA9557_ADDR2              0x19
 #define I2C_PCA9557_BUS_NUM            0
 
 /* I2C EEPROM */
-#undef CONFIG_ID_EEPROM
+#if defined(CONFIG_P1010RDB_PB)
+#define CONFIG_ID_EEPROM
+#ifdef CONFIG_ID_EEPROM
+#define CONFIG_SYS_I2C_EEPROM_NXID
+#endif
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
+#define CONFIG_SYS_I2C_EEPROM_ADDR     0x57
+#define CONFIG_SYS_EEPROM_BUS_NUM      0
+#define MAX_NUM_PORTS                  9 /* for 128Bytes EEPROM */
+#endif
 /* enable read and write access to EEPROM */
 #define CONFIG_CMD_EEPROM
 #define CONFIG_SYS_I2C_MULTI_EEPROMS
@@ -602,9 +647,14 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_ENV_SIZE                0x2000
 #elif defined(CONFIG_NAND)
 #define CONFIG_ENV_IS_IN_NAND
+#if defined(CONFIG_P1010RDB_PA)
 #define CONFIG_ENV_SIZE                CONFIG_SYS_NAND_BLOCK_SIZE
+#define CONFIG_ENV_RANGE       (3 * CONFIG_ENV_SIZE) /* 3*16=48K for env */
+#elif defined(CONFIG_P1010RDB_PB)
+#define CONFIG_ENV_SIZE                (16 * 1024)
+#define CONFIG_ENV_RANGE       (32 * CONFIG_ENV_SIZE) /* new block size 512K */
+#endif
 #define CONFIG_ENV_OFFSET      ((512 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
-#define CONFIG_ENV_RANGE       (3 * CONFIG_ENV_SIZE)
 #elif defined(CONFIG_SYS_RAMBOOT)
 #define CONFIG_ENV_IS_NOWHERE          /* Store ENV in memory only */
 #define CONFIG_ENV_ADDR                        (CONFIG_SYS_MONITOR_BASE - 0x1000)
@@ -697,7 +747,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_HAS_ETH2
 #endif
 
-#define CONFIG_HOSTNAME                P1010RDB
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       u-boot.bin/* U-Boot image on TFTP server */
@@ -736,7 +785,31 @@ extern unsigned long get_sdram_size(void);
        "ext2load usb 0:4 $loadaddr $bootfile;"         \
        "ext2load usb 0:4 $fdtaddr $fdtfile;"   \
        "ext2load usb 0:4 $ramdiskaddr $ramdiskfile;"   \
-       "bootm $loadaddr $ramdiskaddr $fdtaddr\0"               \
+       "bootm $loadaddr $ramdiskaddr $fdtaddr\0"       \
+       CONFIG_BOOTMODE
+
+#if defined(CONFIG_P1010RDB_PA)
+#define CONFIG_BOOTMODE \
+       "boot_bank0=i2c dev 0; i2c mw 18 1 f1; i2c mw 18 3 f0;" \
+       "mw.b ffb00011 0; mw.b ffb00009 0; reset\0" \
+       "boot_bank1=i2c dev 0; i2c mw 18 1 f1; i2c mw 18 3 f0;" \
+       "mw.b ffb00011 0; mw.b ffb00009 1; reset\0" \
+       "boot_nand=i2c dev 0; i2c mw 18 1 f9; i2c mw 18 3 f0;" \
+       "mw.b ffb00011 0; mw.b ffb00017 1; reset\0"
+
+#elif defined(CONFIG_P1010RDB_PB)
+#define CONFIG_BOOTMODE \
+       "boot_bank0=i2c dev 0; i2c mw 18 1 fe; i2c mw 18 3 0;" \
+       "i2c mw 19 1 2; i2c mw 19 3 e1; reset\0" \
+       "boot_bank1=i2c dev 0; i2c mw 18 1 fe; i2c mw 18 3 0;" \
+       "i2c mw 19 1 12; i2c mw 19 3 e1; reset\0" \
+       "boot_nand=i2c dev 0; i2c mw 18 1 fc; i2c mw 18 3 0;" \
+       "i2c mw 19 1 8; i2c mw 19 3 f7; reset\0" \
+       "boot_spi=i2c dev 0; i2c mw 18 1 fa; i2c mw 18 3 0;" \
+       "i2c mw 19 1 0; i2c mw 19 3 f7; reset\0" \
+       "boot_sd=i2c dev 0; i2c mw 18 1 f8; i2c mw 18 3 0;" \
+       "i2c mw 19 1 4; i2c mw 19 3 f3; reset\0"
+#endif
 
 #define CONFIG_RAMBOOTCOMMAND          \
        "setenv bootargs root=/dev/ram rw "     \