]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 15 May 2014 14:36:02 +0000 (16:36 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 15 May 2014 14:36:02 +0000 (16:36 +0200)
1  2 
board/samsung/trats/trats.c
board/samsung/trats2/trats2.c
board/samsung/universal_c210/universal.c
boards.cfg
include/configs/trats.h
include/configs/trats2.h

index ab0ad1d6505b9ae94e5f98fc0bec824092b7a100,f8b290800237dbfa5f7a32956657b6e5a59d5323..fec72d4c54223dfdd653809533addd934c7db3b1
@@@ -54,8 -54,6 +54,6 @@@ int exynos_init(void
  void i2c_init_board(void)
  {
        int err;
-       struct exynos4_gpio_part2 *gpio2 =
-               (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
  
        /* I2C_5 -> PMIC */
        err = exynos_pinmux_config(PERIPH_ID_I2C5, PINMUX_FLAG_NONE);
@@@ -65,8 -63,8 +63,8 @@@
        }
  
        /* I2C_8 -> FG */
-       s5p_gpio_direction_output(&gpio2->y4, 0, 1);
-       s5p_gpio_direction_output(&gpio2->y4, 1, 1);
+       gpio_direction_output(EXYNOS4_GPIO_Y40, 1);
+       gpio_direction_output(EXYNOS4_GPIO_Y41, 1);
  }
  
  static void trats_low_power_mode(void)
@@@ -347,21 -345,19 +345,19 @@@ int exynos_power_init(void
  
  static unsigned int get_hw_revision(void)
  {
-       struct exynos4_gpio_part1 *gpio =
-               (struct exynos4_gpio_part1 *)samsung_get_base_gpio_part1();
        int hwrev = 0;
        int i;
  
        /* hw_rev[3:0] == GPE1[3:0] */
-       for (i = 0; i < 4; i++) {
-               s5p_gpio_cfg_pin(&gpio->e1, i, GPIO_INPUT);
-               s5p_gpio_set_pull(&gpio->e1, i, GPIO_PULL_NONE);
+       for (i = EXYNOS4_GPIO_E10; i < EXYNOS4_GPIO_E14; i++) {
+               gpio_cfg_pin(i, S5P_GPIO_INPUT);
+               gpio_set_pull(i, S5P_GPIO_PULL_NONE);
        }
  
        udelay(1);
  
        for (i = 0; i < 4; i++)
-               hwrev |= (s5p_gpio_get_value(&gpio->e1, i) << i);
+               hwrev |= (gpio_get_value(EXYNOS4_GPIO_E10 + i) << i);
  
        debug("hwrev 0x%x\n", hwrev);
  
@@@ -430,7 -426,8 +426,7 @@@ int board_usb_init(int index, enum usb_
        return s3c_udc_probe(&s5pc210_otg_data);
  }
  
 -#ifdef CONFIG_USB_CABLE_CHECK
 -int usb_cable_connected(void)
 +int g_dnl_board_usb_cable_connected(void)
  {
        struct pmic *muic = pmic_get("MAX8997_MUIC");
        if (!muic)
        return !!muic->chrg->chrg_type(muic);
  }
  #endif
 -#endif
  
  static void pmic_reset(void)
  {
-       struct exynos4_gpio_part2 *gpio =
-               (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
-       s5p_gpio_direction_output(&gpio->x0, 7, 1);
-       s5p_gpio_set_pull(&gpio->x2, 7, GPIO_PULL_NONE);
+       gpio_direction_output(EXYNOS4_GPIO_X07, 1);
+       gpio_set_pull(EXYNOS4_GPIO_X27, S5P_GPIO_PULL_NONE);
  }
  
  static void board_clock_init(void)
@@@ -523,12 -518,9 +516,9 @@@ static void board_power_init(void
  
  static void exynos_uart_init(void)
  {
-       struct exynos4_gpio_part2 *gpio2 =
-               (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
        /* UART_SEL GPY4[7] (part2) at EXYNOS4 */
-       s5p_gpio_set_pull(&gpio2->y4, 7, GPIO_PULL_UP);
-       s5p_gpio_direction_output(&gpio2->y4, 7, 1);
+       gpio_set_pull(EXYNOS4_GPIO_Y47, S5P_GPIO_PULL_UP);
+       gpio_direction_output(EXYNOS4_GPIO_Y47, 1);
  }
  
  int exynos_early_init_f(void)
  
  void exynos_reset_lcd(void)
  {
-       struct exynos4_gpio_part2 *gpio2 =
-               (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
-       s5p_gpio_direction_output(&gpio2->y4, 5, 1);
+       gpio_direction_output(EXYNOS4_GPIO_Y45, 1);
        udelay(10000);
-       s5p_gpio_direction_output(&gpio2->y4, 5, 0);
+       gpio_direction_output(EXYNOS4_GPIO_Y45, 0);
        udelay(10000);
-       s5p_gpio_direction_output(&gpio2->y4, 5, 1);
+       gpio_direction_output(EXYNOS4_GPIO_Y45, 1);
  }
  
  int lcd_power(void)
index 47095252a7522e82256f832ce35267001808436f,d4d5926d8140e6d78e902c2495085957dbf500e7..e4987ce8b4fe45cf73431d7a4b36611942b73d66
@@@ -25,9 -25,6 +25,6 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
- static struct exynos4x12_gpio_part1 *gpio1;
- static struct exynos4x12_gpio_part2 *gpio2;
  static unsigned int board_rev = -1;
  
  static inline u32 get_model_rev(void);
@@@ -37,26 -34,24 +34,24 @@@ static void check_hw_revision(void
        int modelrev = 0;
        int i;
  
-       gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2();
        /*
         * GPM1[1:0]: MODEL_REV[1:0]
         * Don't set as pull-none for these N/C pin.
         * TRM say that it may cause unexcepted state and leakage current.
         * and pull-none is only for output function.
         */
-       for (i = 0; i < 2; i++)
-               s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT);
+       for (i = EXYNOS4X12_GPIO_M10; i < EXYNOS4X12_GPIO_M12; i++)
+               gpio_cfg_pin(i, S5P_GPIO_INPUT);
  
        /* GPM1[5:2]: HW_REV[3:0] */
-       for (i = 2; i < 6; i++) {
-               s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT);
-               s5p_gpio_set_pull(&gpio2->m1, i, GPIO_PULL_NONE);
+       for (i = EXYNOS4X12_GPIO_M12; i < EXYNOS4X12_GPIO_M16; i++) {
+               gpio_cfg_pin(i, S5P_GPIO_INPUT);
+               gpio_set_pull(i, S5P_GPIO_PULL_NONE);
        }
  
        /* GPM1[1:0]: MODEL_REV[1:0] */
        for (i = 0; i < 2; i++)
-               modelrev |= (s5p_gpio_get_value(&gpio2->m1, i) << i);
+               modelrev |= (gpio_get_value(EXYNOS4X12_GPIO_M10 + i) << i);
  
        /* board_rev[15:8] = model */
        board_rev = modelrev << 8;
@@@ -74,26 -69,24 +69,24 @@@ static inline u32 get_model_rev(void
  
  static void board_external_gpio_init(void)
  {
-       gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2();
        /*
         * some pins which in alive block are connected with external pull-up
         * but it's default setting is pull-down.
         * if that pin set as input then that floated
         */
  
-       s5p_gpio_set_pull(&gpio2->x0, 2, GPIO_PULL_NONE);       /* PS_ALS_INT */
-       s5p_gpio_set_pull(&gpio2->x0, 4, GPIO_PULL_NONE);       /* TSP_nINT */
-       s5p_gpio_set_pull(&gpio2->x0, 7, GPIO_PULL_NONE);       /* AP_PMIC_IRQ*/
-       s5p_gpio_set_pull(&gpio2->x1, 5, GPIO_PULL_NONE);       /* IF_PMIC_IRQ*/
-       s5p_gpio_set_pull(&gpio2->x2, 0, GPIO_PULL_NONE);       /* VOL_UP */
-       s5p_gpio_set_pull(&gpio2->x2, 1, GPIO_PULL_NONE);       /* VOL_DOWN */
-       s5p_gpio_set_pull(&gpio2->x2, 3, GPIO_PULL_NONE);       /* FUEL_ALERT */
-       s5p_gpio_set_pull(&gpio2->x2, 4, GPIO_PULL_NONE);       /* ADC_INT */
-       s5p_gpio_set_pull(&gpio2->x2, 7, GPIO_PULL_NONE);       /* nPOWER */
-       s5p_gpio_set_pull(&gpio2->x3, 0, GPIO_PULL_NONE);       /* WPC_INT */
-       s5p_gpio_set_pull(&gpio2->x3, 5, GPIO_PULL_NONE);       /* OK_KEY */
-       s5p_gpio_set_pull(&gpio2->x3, 7, GPIO_PULL_NONE);       /* HDMI_HPD */
+       gpio_set_pull(EXYNOS4X12_GPIO_X02, S5P_GPIO_PULL_NONE); /* PS_ALS_INT */
+       gpio_set_pull(EXYNOS4X12_GPIO_X04, S5P_GPIO_PULL_NONE); /* TSP_nINT */
+       gpio_set_pull(EXYNOS4X12_GPIO_X07, S5P_GPIO_PULL_NONE); /* AP_PMIC_IRQ*/
+       gpio_set_pull(EXYNOS4X12_GPIO_X15, S5P_GPIO_PULL_NONE); /* IF_PMIC_IRQ*/
+       gpio_set_pull(EXYNOS4X12_GPIO_X20, S5P_GPIO_PULL_NONE); /* VOL_UP */
+       gpio_set_pull(EXYNOS4X12_GPIO_X21, S5P_GPIO_PULL_NONE); /* VOL_DOWN */
+       gpio_set_pull(EXYNOS4X12_GPIO_X23, S5P_GPIO_PULL_NONE); /* FUEL_ALERT */
+       gpio_set_pull(EXYNOS4X12_GPIO_X24, S5P_GPIO_PULL_NONE); /* ADC_INT */
+       gpio_set_pull(EXYNOS4X12_GPIO_X27, S5P_GPIO_PULL_NONE); /* nPOWER */
+       gpio_set_pull(EXYNOS4X12_GPIO_X30, S5P_GPIO_PULL_NONE); /* WPC_INT */
+       gpio_set_pull(EXYNOS4X12_GPIO_X35, S5P_GPIO_PULL_NONE); /* OK_KEY */
+       gpio_set_pull(EXYNOS4X12_GPIO_X37, S5P_GPIO_PULL_NONE); /* HDMI_HPD */
  }
  
  #ifdef CONFIG_SYS_I2C_INIT_BOARD
@@@ -101,9 -94,6 +94,6 @@@ static void board_init_i2c(void
  {
        int err;
  
-       gpio1 = (struct exynos4x12_gpio_part1 *)samsung_get_base_gpio_part1();
-       gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2();
        /* I2C_7 */
        err = exynos_pinmux_config(PERIPH_ID_I2C7, PINMUX_FLAG_NONE);
        if (err) {
        }
  
        /* I2C_8 */
-       s5p_gpio_direction_output(&gpio1->f1, 4, 1);
-       s5p_gpio_direction_output(&gpio1->f1, 5, 1);
+       gpio_direction_output(EXYNOS4X12_GPIO_F14, 1);
+       gpio_direction_output(EXYNOS4X12_GPIO_F15, 1);
  
        /* I2C_9 */
-       s5p_gpio_direction_output(&gpio2->m2, 1, 1);
-       s5p_gpio_direction_output(&gpio2->m2, 0, 1);
+       gpio_direction_output(EXYNOS4X12_GPIO_M21, 1);
+       gpio_direction_output(EXYNOS4X12_GPIO_M20, 1);
  }
  #endif
  
  int get_soft_i2c_scl_pin(void)
  {
        if (I2C_ADAP_HWNR)
-               return exynos4x12_gpio_get(2, m2, 1); /* I2C9 */
+               return EXYNOS4X12_GPIO_M21; /* I2C9 */
        else
-               return exynos4x12_gpio_get(1, f1, 4); /* I2C8 */
+               return EXYNOS4X12_GPIO_F14; /* I2C8 */
  }
  
  int get_soft_i2c_sda_pin(void)
  {
        if (I2C_ADAP_HWNR)
-               return exynos4x12_gpio_get(2, m2, 0); /* I2C9 */
+               return EXYNOS4X12_GPIO_M20; /* I2C9 */
        else
-               return exynos4x12_gpio_get(1, f1, 5); /* I2C8 */
+               return EXYNOS4X12_GPIO_F15; /* I2C8 */
  }
  #endif
  
@@@ -312,7 -302,8 +302,7 @@@ int board_usb_init(int index, enum usb_
        return s3c_udc_probe(&s5pc210_otg_data);
  }
  
 -#ifdef CONFIG_USB_CABLE_CHECK
 -int usb_cable_connected(void)
 +int g_dnl_board_usb_cable_connected(void)
  {
        struct pmic *muic = pmic_get("MAX77693_MUIC");
        if (!muic)
        return !!muic->chrg->chrg_type(muic);
  }
  #endif
 -#endif
  
  static int pmic_init_max77686(void)
  {
@@@ -396,11 -388,9 +386,9 @@@ void exynos_lcd_power_on(void
  {
        struct pmic *p = pmic_get("MAX77686_PMIC");
  
-       gpio1 = (struct exynos4x12_gpio_part1 *)samsung_get_base_gpio_part1();
        /* LCD_2.2V_EN: GPC0[1] */
-       s5p_gpio_set_pull(&gpio1->c0, 1, GPIO_PULL_UP);
-       s5p_gpio_direction_output(&gpio1->c0, 1, 1);
+       gpio_set_pull(EXYNOS4X12_GPIO_C01, S5P_GPIO_PULL_UP);
+       gpio_direction_output(EXYNOS4X12_GPIO_C01, 1);
  
        /* LDO25 VCC_3.1V_LCD */
        pmic_probe(p);
  
  void exynos_reset_lcd(void)
  {
-       gpio1 = (struct exynos4x12_gpio_part1 *)samsung_get_base_gpio_part1();
        /* reset lcd */
-       s5p_gpio_direction_output(&gpio1->f2, 1, 0);
+       gpio_direction_output(EXYNOS4X12_GPIO_F21, 0);
        udelay(10);
-       s5p_gpio_set_value(&gpio1->f2, 1, 1);
+       gpio_set_value(EXYNOS4X12_GPIO_F21, 1);
  }
  
  void exynos_lcd_misc_init(vidinfo_t *vid)
index 8e49195fe1c05d005d24f51baebebe17c5c065c8,25f2a935b710b2d562b116a421a27a220ce52dfd..47e7f538d65b7cd35943328d91ecb44385096961
@@@ -27,8 -27,6 +27,6 @@@
  
  DECLARE_GLOBAL_DATA_PTR;
  
- struct exynos4_gpio_part1 *gpio1;
- struct exynos4_gpio_part2 *gpio2;
  unsigned int board_rev;
  
  u32 get_board_rev(void)
@@@ -197,6 -195,13 +195,6 @@@ int board_usb_init(int index, enum usb_
        return s3c_udc_probe(&s5pc210_otg_data);
  }
  
 -#ifdef CONFIG_USB_CABLE_CHECK
 -int usb_cable_connected(void)
 -{
 -      return 0;
 -}
 -#endif
 -
  int exynos_early_init_f(void)
  {
        wdt_stop();
@@@ -305,35 -310,35 +303,35 @@@ void exynos_cfg_lcd_gpio(void
  
        for (i = 0; i < 8; i++) {
                /* set GPF0,1,2[0:7] for RGB Interface and Data lines (32bit) */
-               s5p_gpio_cfg_pin(&gpio1->f0, i, GPIO_FUNC(2));
-               s5p_gpio_cfg_pin(&gpio1->f1, i, GPIO_FUNC(2));
-               s5p_gpio_cfg_pin(&gpio1->f2, i, GPIO_FUNC(2));
+               gpio_cfg_pin(EXYNOS4_GPIO_F00 + i, S5P_GPIO_FUNC(2));
+               gpio_cfg_pin(EXYNOS4_GPIO_F10 + i, S5P_GPIO_FUNC(2));
+               gpio_cfg_pin(EXYNOS4_GPIO_F20 + i, S5P_GPIO_FUNC(2));
                /* pull-up/down disable */
-               s5p_gpio_set_pull(&gpio1->f0, i, GPIO_PULL_NONE);
-               s5p_gpio_set_pull(&gpio1->f1, i, GPIO_PULL_NONE);
-               s5p_gpio_set_pull(&gpio1->f2, i, GPIO_PULL_NONE);
+               gpio_set_pull(EXYNOS4_GPIO_F00 + i, S5P_GPIO_PULL_NONE);
+               gpio_set_pull(EXYNOS4_GPIO_F10 + i, S5P_GPIO_PULL_NONE);
+               gpio_set_pull(EXYNOS4_GPIO_F20 + i, S5P_GPIO_PULL_NONE);
  
                /* drive strength to max (24bit) */
-               s5p_gpio_set_drv(&gpio1->f0, i, GPIO_DRV_4X);
-               s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
-               s5p_gpio_set_drv(&gpio1->f1, i, GPIO_DRV_4X);
-               s5p_gpio_set_rate(&gpio1->f1, i, GPIO_DRV_SLOW);
-               s5p_gpio_set_drv(&gpio1->f2, i, GPIO_DRV_4X);
-               s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
+               gpio_set_drv(EXYNOS4_GPIO_F00 + i, S5P_GPIO_DRV_4X);
+               gpio_set_rate(EXYNOS4_GPIO_F00 + i, S5P_GPIO_DRV_SLOW);
+               gpio_set_drv(EXYNOS4_GPIO_F10 + i, S5P_GPIO_DRV_4X);
+               gpio_set_rate(EXYNOS4_GPIO_F10 + i, S5P_GPIO_DRV_SLOW);
+               gpio_set_drv(EXYNOS4_GPIO_F20 + i, S5P_GPIO_DRV_4X);
+               gpio_set_rate(EXYNOS4_GPIO_F00 + i, S5P_GPIO_DRV_SLOW);
        }
  
-       for (i = 0; i < f3_end; i++) {
+       for (i = EXYNOS4_GPIO_F30; i < (EXYNOS4_GPIO_F30 + f3_end); i++) {
                /* set GPF3[0:3] for RGB Interface and Data lines (32bit) */
-               s5p_gpio_cfg_pin(&gpio1->f3, i, GPIO_FUNC(2));
+               gpio_cfg_pin(i, S5P_GPIO_FUNC(2));
                /* pull-up/down disable */
-               s5p_gpio_set_pull(&gpio1->f3, i, GPIO_PULL_NONE);
+               gpio_set_pull(i, S5P_GPIO_PULL_NONE);
                /* drive strength to max (24bit) */
-               s5p_gpio_set_drv(&gpio1->f3, i, GPIO_DRV_4X);
-               s5p_gpio_set_rate(&gpio1->f3, i, GPIO_DRV_SLOW);
+               gpio_set_drv(i, S5P_GPIO_DRV_4X);
+               gpio_set_rate(i, S5P_GPIO_DRV_SLOW);
        }
  
        /* gpio pad configuration for LCD reset. */
-       s5p_gpio_cfg_pin(&gpio2->y4, 5, GPIO_OUTPUT);
+       gpio_cfg_pin(EXYNOS4_GPIO_Y45, S5P_GPIO_OUTPUT);
  
        spi_init();
  }
@@@ -345,11 -350,11 +343,11 @@@ int mipi_power(void
  
  void exynos_reset_lcd(void)
  {
-       s5p_gpio_set_value(&gpio2->y4, 5, 1);
+       gpio_set_value(EXYNOS4_GPIO_Y45, 1);
        udelay(10000);
-       s5p_gpio_set_value(&gpio2->y4, 5, 0);
+       gpio_set_value(EXYNOS4_GPIO_Y45, 0);
        udelay(10000);
-       s5p_gpio_set_value(&gpio2->y4, 5, 1);
+       gpio_set_value(EXYNOS4_GPIO_Y45, 1);
        udelay(100);
  }
  
@@@ -379,9 -384,6 +377,6 @@@ void exynos_enable_ldo(unsigned int ono
  
  int exynos_init(void)
  {
-       gpio1 = (struct exynos4_gpio_part1 *) EXYNOS4_GPIO_PART1_BASE;
-       gpio2 = (struct exynos4_gpio_part2 *) EXYNOS4_GPIO_PART2_BASE;
        gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
  
        switch (get_hwrev()) {
                 * you should set it HIGH since it removes the inverter
                 */
                /* MASSMEMORY_EN: XMDMDATA_6: GPE3[6] */
-               s5p_gpio_direction_output(&gpio1->e3, 6, 0);
+               gpio_direction_output(EXYNOS4_GPIO_E36, 0);
                break;
        default:
                /*
                 * But set it as HIGH to ensure
                 */
                /* MASSMEMORY_EN: XMDMADDR_3: GPE1[3] */
-               s5p_gpio_direction_output(&gpio1->e1, 3, 1);
+               gpio_direction_output(EXYNOS4_GPIO_E13, 1);
                break;
        }
  
diff --combined boards.cfg
index 2eadd0d9720e6785daf7ddd9eb8919938efbaeaa,89334f658569e4a767ff49a893a85d7eb373ecb2..880d972523b9eb81c7e99065b904937c0fdaa6d8
@@@ -370,7 -370,7 +370,7 @@@ Active  arm         armv7          rmob
  Active  arm         armv7          rmobile     renesas         koelsch             koelsch_nor                          koelsch:NORFLASH                                                                                                                  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  Active  arm         armv7          rmobile     renesas         lager               lager                                -                                                                                                                                 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  Active  arm         armv7          rmobile     renesas         lager               lager_nor                            lager:NORFLASH                                                                                                                    Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
- Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                             -                                                                                                                                 Mateusz Zalega <m.zalega@samsung.com>
+ Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                             -                                                                                                                                 Przemyslaw Marczak <p.marczak@samsung.com>
  Active  arm         armv7          s5pc1xx     samsung         smdkc100            smdkc100                             -                                                                                                                                 Minkyu Kang <mk7.kang@samsung.com>
  Active  arm         armv7          socfpga     altera          socfpga             socfpga_cyclone5                     -                                                                                                                                 -
  Active  arm         armv7          u8500       st-ericsson     snowball            snowball                             -                                                                                                                                 Mathieu Poirier <mathieu.poirier@linaro.org>
@@@ -522,6 -522,10 +522,6 @@@ Active  mips        mips32         au1x
  Active  mips        mips32         au1x00      -               dbau1x00            dbau1550                             dbau1x00:DBAU1550                                                                                                                 Thomas Lange <thomas@corelatus.se>
  Active  mips        mips32         au1x00      -               dbau1x00            dbau1550_el                          dbau1x00:DBAU1550,SYS_LITTLE_ENDIAN                                                                                               Thomas Lange <thomas@corelatus.se>
  Active  mips        mips32         au1x00      -               pb1x00              pb1000                               pb1x00:PB1000                                                                                                                     -
 -Active  mips        mips32         incaip      -               incaip              incaip                               -                                                                                                                                 Wolfgang Denk <wd@denx.de>
 -Active  mips        mips32         incaip      -               incaip              incaip_100MHz                        incaip:CPU_CLOCK_RATE=100000000                                                                                                   Wolfgang Denk <wd@denx.de>
 -Active  mips        mips32         incaip      -               incaip              incaip_133MHz                        incaip:CPU_CLOCK_RATE=133000000                                                                                                   Wolfgang Denk <wd@denx.de>
 -Active  mips        mips32         incaip      -               incaip              incaip_150MHz                        incaip:CPU_CLOCK_RATE=150000000                                                                                                   Wolfgang Denk <wd@denx.de>
  Active  mips        mips64         -           -               qemu-mips           qemu_mips64                          qemu-mips64:SYS_BIG_ENDIAN                                                                                                        -
  Active  mips        mips64         -           -               qemu-mips           qemu_mips64el                        qemu-mips64:SYS_LITTLE_ENDIAN                                                                                                     -
  Active  nds32       n1213          ag101       AndesTech       adp-ag101           adp-ag101                            -                                                                                                                                 Andes <uboot@andestech.com>
@@@ -533,6 -537,7 +533,6 @@@ Active  nios2       nios2          
  Active  openrisc    or1200         -           openrisc        openrisc-generic    openrisc-generic                     -                                                                                                                                 Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
  Active  powerpc     74xx_7xx       -           -               -                   ppmc7xx                              -                                                                                                                                 -
  Active  powerpc     74xx_7xx       -           -               evb64260            P3G4                                 -                                                                                                                                 Wolfgang Denk <wd@denx.de>
 -Active  powerpc     74xx_7xx       -           -               evb64260            ZUMA                                 -                                                                                                                                 Nye Liu <nyet@zumanetworks.com>
  Active  powerpc     74xx_7xx       -           eltec           elppc               ELPPC                                -                                                                                                                                 -
  Active  powerpc     74xx_7xx       -           esd             cpci750             CPCI750                              -                                                                                                                                 Reinhard Arlt <reinhard.arlt@esd-electronics.com>
  Active  powerpc     74xx_7xx       -           freescale       mpc7448hpc2         mpc7448hpc2                          -                                                                                                                                 Roy Zang <tie-fei.zang@freescale.com>
@@@ -639,21 -644,23 +639,21 @@@ Active  powerpc     mpc824x        
  Active  powerpc     mpc824x        -           -               cpc45               CPC45_ROMBOOT                        CPC45:BOOT_ROM                                                                                                                    Josef Wagner <Wagner@Microsys.de>
  Active  powerpc     mpc824x        -           -               cu824               CU824                                -                                                                                                                                 Wolfgang Denk <wd@denx.de>
  Active  powerpc     mpc824x        -           -               eXalion             eXalion                              -                                                                                                                                 Torsten Demke <torsten.demke@fci.com>
 -Active  powerpc     mpc824x        -           -               musenki             MUSENKI                              -                                                                                                                                 Jim Thompson <jim@musenki.com>
  Active  powerpc     mpc824x        -           -               mvblue              MVBLUE                               -                                                                                                                                 -
  Active  powerpc     mpc824x        -           -               sandpoint           Sandpoint8240                        -                                                                                                                                 Wolfgang Denk <wd@denx.de>
 -Active  powerpc     mpc824x        -           -               sandpoint           Sandpoint8245                        -                                                                                                                                 Jim Thompson <jim@musenki.com>
  Active  powerpc     mpc8260        -           -               -                   atc                                  -                                                                                                                                 Wolfgang Denk <wd@denx.de>
  Active  powerpc     mpc8260        -           -               -                   ep8260                               -                                                                                                                                 Frank Panno <fpanno@delphintech.com>
  Active  powerpc     mpc8260        -           -               -                   ep82xxm                              -                                                                                                                                 -
  Active  powerpc     mpc8260        -           -               -                   gw8260                               -                                                                                                                                 Oliver Brown <obrown@adventnetworks.com>
  Active  powerpc     mpc8260        -           -               -                   hymod                                -                                                                                                                                 Murray Jensen <Murray.Jensen@csiro.au>
 -Active  powerpc     mpc8260        -           -               -                   ppmc8260                             -                                                                                                                                 Brad Kemp <Brad.Kemp@seranoa.com>
  Active  powerpc     mpc8260        -           -               -                   sacsng                               -                                                                                                                                 Jerry Van Baren <gerald.vanbaren@smiths-aerospace.com>
  Active  powerpc     mpc8260        -           -               cogent              cogent_mpc8260                       -                                                                                                                                 Murray Jensen <Murray.Jensen@csiro.au>
  Active  powerpc     mpc8260        -           -               cpu86               CPU86                                -                                                                                                                                 Wolfgang Denk <wd@denx.de>
  Active  powerpc     mpc8260        -           -               cpu86               CPU86_ROMBOOT                        CPU86:BOOT_ROM                                                                                                                    Wolfgang Denk <wd@denx.de>
  Active  powerpc     mpc8260        -           -               cpu87               CPU87                                -                                                                                                                                 -
  Active  powerpc     mpc8260        -           -               cpu87               CPU87_ROMBOOT                        CPU87:BOOT_ROM                                                                                                                    -
 -Active  powerpc     mpc8260        -           -               ids8247             IDS8247                              -                                                                                                                                 Heiko Schocher <hs@denx.de>
 +Active  powerpc     mpc8260        -           -               ep8248              ep8248                               -                                                                                                                                 Yuli Barcohen <yuli@arabellasw.com>
 +Active  powerpc     mpc8260        -           ids             ids8247             IDS8247                              -                                                                                                                                 Heiko Schocher <hs@denx.de>
  Active  powerpc     mpc8260        -           -               iphase4539          IPHASE4539                           -                                                                                                                                 Wolfgang Grandegger <wg@denx.de>
  Active  powerpc     mpc8260        -           -               muas3001            muas3001                             -                                                                                                                                 Heiko Schocher <hs@denx.de>
  Active  powerpc     mpc8260        -           -               muas3001            muas3001_dev                         muas3001:MUAS_DEV_BOARD                                                                                                           Heiko Schocher <hs@denx.de>
@@@ -722,7 -729,6 +722,7 @@@ Active  powerpc     mpc83xx        
  Active  powerpc     mpc83xx        -           freescale       mpc837xemds         MPC837XEMDS                          -                                                                                                                                 Dave Liu <daveliu@freescale.com>
  Active  powerpc     mpc83xx        -           freescale       mpc837xemds         MPC837XEMDS_HOST                     MPC837XEMDS:PCI                                                                                                                   Dave Liu <daveliu@freescale.com>
  Active  powerpc     mpc83xx        -           freescale       mpc837xerdb         MPC837XERDB                          -                                                                                                                                 Joe D'Abbraccio <ljd015@freescale.com>
 +Active  powerpc     mpc83xx        -           ids             ids8313             ids8313                              ids8313:SYS_TEXT_BASE=0xFFF00000                                                                                                  Heiko Schocher <hs@denx.de>
  Active  powerpc     mpc83xx        -           keymile         km83xx              kmcoge5ne                            km8360:KMCOGE5NE                                                                                                                  Holger Brunck <holger.brunck@keymile.com>
  Active  powerpc     mpc83xx        -           keymile         km83xx              kmeter1                              km8360:KMETER1                                                                                                                    Holger Brunck <holger.brunck@keymile.com>
  Active  powerpc     mpc83xx        -           keymile         km83xx              kmopti2                              tuxx1:KMOPTI2                                                                                                                     Holger Brunck <holger.brunck@keymile.com>
@@@ -742,11 -748,10 +742,11 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           -               socrates            socrates                             -                                                                                                                                 -
  Active  powerpc     mpc85xx        -           exmeritus       hww1u1a             HWW1U1A                              -                                                                                                                                 Kyle Moffett <Kyle.D.Moffett@boeing.com>
  Active  powerpc     mpc85xx        -           freescale       b4860qds            B4420QDS                             B4860QDS:PPC_B4420                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       b4860qds            B4420QDS_NAND                        B4860QDS:PPC_B4420,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 +Active  powerpc     mpc85xx        -           freescale       b4860qds            B4420QDS_NAND                        B4860QDS:PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND                                                                      -
  Active  powerpc     mpc85xx        -           freescale       b4860qds            B4420QDS_SPIFLASH                    B4860QDS:PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS                             B4860QDS:PPC_B4860                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS_NAND                        B4860QDS:PPC_B4860,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 +Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS_SECURE_BOOT                 B4860QDS:PPC_B4860,SECURE_BOOT                                                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS_NAND                        B4860QDS:PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND
  Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS_SPIFLASH                    B4860QDS:PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       b4860qds            B4860QDS_SRIO_PCIE_BOOT              B4860QDS:PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       bsc9131rdb          BSC9131RDB_NAND                      BSC9131RDB:BSC9131RDB,NAND                                                                                                        Poonam Aggrwal <poonam.aggrwal@freescale.com>
@@@ -761,14 -766,6 +761,14 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SDCARD_DDRCLK133          BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133                                                                                  Naveen Burmi <NaveenBurmi@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SPIFLASH_DDRCLK100        BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100                                                                                Naveen Burmi <NaveenBurmi@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SPIFLASH_DDRCLK133        BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133                                                                                Naveen Burmi <NaveenBurmi@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_NOR_DDRCLK100_SECURE      BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT                                                                             Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_NOR_DDRCLK133_SECURE      BSC9132QDS:BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT                                                                             Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SDCARD_DDRCLK100_SECURE   BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT                                                                      Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SDCARD_DDRCLK133_SECURE   BSC9132QDS:BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT                                                                      Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_SPIFLASH_DDRCLK133_SECURE BSC9132QDS:BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_133,SECURE_BOOT                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_NAND_DDRCLK100_SECURE     BSC9132QDS:BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT                                                                Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       bsc9132qds          BSC9132QDS_NAND_DDRCLK133_SECURE     BSC9132QDS:BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT                                                                Aneesh Bansal <aneesh.bansal@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       c29xpcie            C29XPCIE                             C29XPCIE:C29XPCIE,36BIT                                                                                                           Po Liu <po.liu@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       c29xpcie            C29XPCIE_NAND                        C29XPCIE:C29XPCIE,36BIT,NAND                                                                                                      Po Liu <po.liu@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       c29xpcie            C29XPCIE_SPIFLASH                    C29XPCIE:C29XPCIE,36BIT,SPIFLASH                                                                                                  Po Liu <po.liu@freescale.com>
@@@ -943,46 -940,32 +943,46 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           freescale       p2041rdb            P2041RDB_SPIFLASH                    P2041RDB:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                            -
  Active  powerpc     mpc85xx        -           freescale       p2041rdb            P2041RDB_SRIO_PCIE_BOOT              P2041RDB:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                            -
  Active  powerpc     mpc85xx        -           freescale       t1040qds            T1040QDS                             T1040QDS:PPC_T1040                                                                                                                Poonam Aggrwal <poonam.aggrwal@freescale.com>
 -Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB                             T1040RDB:PPC_T1040                                                                                                                Poonam Aggrwal  <poonam.aggrwal@freescale.com>
 -Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1042RDB_PI                          T1042RDB_PI:PPC_T1042                                                                                                             Poonam Aggrwal  <poonam.aggrwal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t1040qds            T1040QDS_D4                          T1040QDS:PPC_T1040,SYS_FSL_DDR4                                                                                                   Poonam Aggrwal <poonam.aggrwal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t1040qds            T1040QDS_SECURE_BOOT                 T1040QDS:PPC_T1040,SECURE_BOOT                                                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB                             T104xRDB:PPC_T1040,T1040RDB                                                                                                       Priyanka Jain  <Priyanka.Jain@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB_NAND                        T104xRDB:PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND                                                                            Priyanka Jain  <Priyanka.Jain@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB_SDCARD                      T104xRDB:PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB_SECURE_BOOT                 T104xRDB:PPC_T1040,SECURE_BOOT,T1040RDB                                                                                           Aneesh Bansal  <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1040RDB_SPIFLASH                    T104xRDB:PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH                                                                        Priyanka Jain  <Priyanka.Jain@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1042RDB_PI                          T104xRDB:PPC_T1042,T1042RDB_PI                                                                                                             Priyanka Jain  <Priyanka.Jain@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1042RDB_PI_NAND                     T104xRDB:PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND                                                                         Priyanka Jain  <Priyanka.Jain@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1042RDB_PI_SDCARD                   T104xRDB:PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD
 +Active  powerpc     mpc85xx        -           freescale       t104xrdb            T1042RDB_PI_SPIFLASH                 T104xRDB:PPC_T1042,T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH                                                                     Priyanka Jain  <Priyanka.Jain@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS                             T208xQDS:PPC_T2080                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_NAND                        T208xQDS:PPC_T2080,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SDCARD                      T208xQDS:PPC_T2080,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SPIFLASH                    T208xQDS:PPC_T2080,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SECURE_BOOT                 T208xQDS:PPC_T2080,SECURE_BOOT                                                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_NAND                        T208xQDS:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SDCARD                      T208xQDS:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SPIFLASH                    T208xQDS:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2080QDS_SRIO_PCIE_BOOT              T208xQDS:PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS                             T208xQDS:PPC_T2081                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_NAND                        T208xQDS:PPC_T2081,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SDCARD                      T208xQDS:PPC_T2081,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
 -Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SPIFLASH                    T208xQDS:PPC_T2081,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_NAND                        T208xQDS:PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,NAND
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SDCARD                      T208xQDS:PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD                                                                                             -
 +Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SPIFLASH                    T208xQDS:PPC_T2081,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH                                                                                           -
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SRIO_PCIE_BOOT              T208xQDS:PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB                             T208xRDB:PPC_T2080                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_NAND                        T208xRDB:PPC_T2080,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SDCARD                      T208xRDB:PPC_T2080,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
 -Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SPIFLASH                    T208xRDB:PPC_T2080,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_NAND                        T208xRDB:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,NAND
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SDCARD                      T208xRDB:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SPIFLASH                    T208xRDB:PPC_T2080,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH
  Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SRIO_PCIE_BOOT              T208xRDB:PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS                             T4240QDS:PPC_T4160                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SDCARD                      T4240QDS:PPC_T4160,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SECURE_BOOT                 T4240QDS:PPC_T4160,SECURE_BOOT                                                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_NAND                        T4240QDS:PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,NAND                                                                    -
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SDCARD                      T4240QDS:PPC_T4160,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD                                                                    -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SPIFLASH                    T4240QDS:PPC_T4160,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240EMU                             T4240EMU:PPC_T4240                                                                                                                York Sun <yorksun@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS                             T4240QDS:PPC_T4240                                                                                                                -
 -Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_NAND                        T4240QDS:PPC_T4240,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SDCARD                      T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SECURE_BOOT                 T4240QDS:PPC_T4240,SECURE_BOOT                                                                                                    Aneesh Bansal <aneesh.bansal@freescale.com>
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_NAND                      T4240QDS:PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,NAND                                                                      -
 +Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SDCARD                      T4240QDS:PPC_T4240,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD                                                                    -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SPIFLASH                    T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SRIO_PCIE_BOOT              T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       qemu-ppce500        qemu-ppce500                         -                                                                                                                                 Alexander Graf <agraf@suse.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_36BIT_SDCARD          controlcenterd:36BIT,SDCARD                                                                                                       Dirk Eibach <eibach@gdsys.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_36BIT_SDCARD_DEVELOP  controlcenterd:36BIT,SDCARD,DEVELOP                                                                                               Dirk Eibach <eibach@gdsys.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_TRAILBLAZER           controlcenterd:TRAILBLAZER,SPIFLASH                                                                                               Dirk Eibach <eibach@gdsys.de>
@@@ -1211,11 -1194,6 +1211,11 @@@ Active  sparc       leon3          
  Active  sparc       leon3          -           gaisler         -                   gr_xc3s_1500                         -                                                                                                                                 -
  Active  sparc       leon3          -           gaisler         -                   grsim                                -                                                                                                                                 -
  Active  x86         x86            coreboot    chromebook-x86  coreboot            coreboot-x86                         coreboot:SYS_TEXT_BASE=0x01110000                                                                                                 -
 +# The following were moved to "Orphan" in April, 2014
 +Orphan  powerpc     74xx_7xx       -           -               evb64260            ZUMA                                 -                                                                                                                                 Nye Liu <nyet@zumanetworks.com>
 +Orphan  powerpc     mpc824x        -           -               musenki             MUSENKI                              -                                                                                                                                 Jim Thompson <jim@musenki.com>
 +Orphan  powerpc     mpc824x        -           -               sandpoint           Sandpoint8245                        -                                                                                                                                 Jim Thompson <jim@musenki.com>
 +Orphan  powerpc     mpc8260        -           -               -                   ppmc8260                             -                                                                                                                                 Brad Kemp <Brad.Kemp@seranoa.com>
  # The following were moved to "Orphan" in March, 2014
  Orphan  blackfin    blackfin       -           -               -                   cm-bf527                             -                                                                                                                                 Bluetechnix Tinyboards <bluetechnix@blackfin.uclinux.org>
  Orphan  blackfin    blackfin       -           -               -                   cm-bf533                             -                                                                                                                                 Bluetechnix Tinyboards <bluetechnix@blackfin.uclinux.org>
@@@ -1265,3 -1243,18 +1265,3 @@@ Orphan  powerpc     ppc4xx         
  # The following were move to "Orphan" in September, 2013
  Orphan  arm         arm1136        mx31        -               imx31_phycore       imx31_phycore_eet                    imx31_phycore:IMX31_PHYCORE_EET                                                                                                   (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  Orphan  arm         arm1136        mx31        freescale       -                   mx31ads                              -                                                                                                                                 (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 -Orphan  arm         pxa            -           -               -                   lubbock                              -                                                                                                                                 (dead address) Kyle Harris <kharris@nexus-tech.net>
 -Orphan  powerpc     74xx_7xx       -           -               evb64260            EVB64260                             -                                                                                                                                 -
 -Orphan  powerpc     mpc824x        -           -               mousse              MOUSSE                               -                                                                                                                                 -
 -Orphan  powerpc     mpc8260        -           -               -                   rsdproto                             -                                                                                                                                 -
 -Orphan  powerpc     mpc8260        -           -               rpxsuper            RPXsuper                             -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               -                   RPXClassic                           -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               -                   RPXlite                              -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               fads                ADS860                               -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               fads                FADS823                              -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               fads                FADS850SAR                           -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               fads                FADS860T                             -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               genietv             GENIETV                              -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX                                  -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX860T                              -                                                                                                                                 -
 -Orphan  powerpc     mpc8xx         -           -               nx823               NX823                                -                                                                                                                                 -
diff --combined include/configs/trats.h
index c4afecf3dab86a5e391059b87eecd11b4000f0cc,fc16911686acd4f93892539556da758c29284e6f..90f19626a39e22b5b9f4c42886f7e38a91c4b73c
@@@ -59,7 -59,7 +59,7 @@@
  
  #define CONFIG_BOOTARGS                       "Please use defined boot"
  #define CONFIG_BOOTCOMMAND            "run mmcboot"
- #define CONFIG_DEFAULT_CONSOLE                "console=ttySAC1,115200n8\0"
+ #define CONFIG_DEFAULT_CONSOLE                "console=ttySAC2,115200n8\0"
  
  #define CONFIG_SYS_INIT_SP_ADDR       (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
        "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
  
  #define CONFIG_DFU_ALT \
 -      "u-boot mmc 80 400;" \
 +      "u-boot raw 0x80 0x400;" \
        "uImage ext4 0 2;" \
        "modem.bin ext4 0 2;" \
        "exynos4210-trats.dtb ext4 0 2;" \
        ""PARTS_ROOT" part 0 5;" \
        ""PARTS_DATA" part 0 6;" \
        ""PARTS_UMS" part 0 7;" \
 -      "params.bin mmc 0x38 0x8\0"
 +      "params.bin raw 0x38 0x8\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootk=" \
                        "bootm 0x40007FC0 - ${fdtaddr};" \
                "fi;" \
                "bootm 0x40007FC0;\0" \
-       "updatemmc=" \
-               "mmc boot 0 1 1 1; mmc write 0 0x42008000 0 0x200;" \
-               "mmc boot 0 1 1 0\0" \
        "updatebackup=" \
-               "mmc boot 0 1 1 2; mmc write 0 0x42100000 0 0x200;" \
-               "mmc boot 0 1 1 0\0" \
+               "mmc dev 0 2; mmc write 0 0x42100000 0 0x200;" \
+               "mmc dev 0 0\0" \
        "updatebootb=" \
                "mmc read 0 0x42100000 0x80 0x200; run updatebackup\0" \
        "lpj=lpj=3981312\0" \
  #define CONFIG_SYS_I2C_INIT_BOARD
  
  /* I2C FG */
- #define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_get(2, y4, 1)
- #define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_get(2, y4, 0)
+ #define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_Y41
+ #define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_Y40
  
  /* POWER */
  #define CONFIG_POWER
  #define KEY_PWR_INTERRUPT_REG         MAX8997_REG_INT1
  #define KEY_PWR_INTERRUPT_MASK                (1 << 0)
  
- #define KEY_VOL_UP_GPIO                       exynos4_gpio_get(2, x2, 0)
- #define KEY_VOL_DOWN_GPIO             exynos4_gpio_get(2, x2, 1)
+ #define KEY_VOL_UP_GPIO                       EXYNOS4_GPIO_X20
+ #define KEY_VOL_DOWN_GPIO             EXYNOS4_GPIO_X21
  #endif /* __ASSEMBLY__ */
  
  /* LCD console */
diff --combined include/configs/trats2.h
index 14def7d16e8f2bbcd79532178f46c41addd5a23b,3d5f21dde07ce7557331046931d0007c9b969154..206975bcae0ec4b88ac543186c1d9d7053394df4
@@@ -52,7 -52,7 +52,7 @@@
  
  #define CONFIG_BOOTARGS                       "Please use defined boot"
  #define CONFIG_BOOTCOMMAND            "run mmcboot"
- #define CONFIG_DEFAULT_CONSOLE                "console=ttySAC1,115200n8\0"
+ #define CONFIG_DEFAULT_CONSOLE                "console=ttySAC2,115200n8\0"
  
  #define CONFIG_SYS_INIT_SP_ADDR       (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
@@@ -91,7 -91,7 +91,7 @@@
        "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
  
  #define CONFIG_DFU_ALT \
 -      "u-boot mmc 80 800;" \
 +      "u-boot raw 0x80 0x800;" \
        "uImage ext4 0 2;" \
        "modem.bin ext4 0 2;" \
        "exynos4412-trats2.dtb ext4 0 2;" \
        ""PARTS_ROOT" part 0 5;" \
        ""PARTS_DATA" part 0 6;" \
        ""PARTS_UMS" part 0 7;" \
 -      "params.bin mmc 0x38 0x8\0"
 +      "params.bin raw 0x38 0x8\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootk=" \
                        "bootm 0x40007FC0 - ${fdtaddr};" \
                "fi;" \
                "bootm 0x40007FC0;\0" \
-       "updatemmc=" \
-               "mmc boot 0 1 1 1; mmc write 0x42008000 0 0x200;" \
-               "mmc boot 0 1 1 0\0" \
        "updatebackup=" \
-               "mmc boot 0 1 1 2; mmc write 0x42100000 0 0x200;" \
-               " mmc boot 0 1 1 0\0" \
+               "mmc dev 0 2; mmc write 0x51000000 0 0x800;" \
+               " mmc dev 0 0\0" \
        "updatebootb=" \
-               "mmc read 0x51000000 0x80 0x200; run updatebackup\0" \
-       "updateuboot=" \
-               "mmc write 0x50000000 0x80 0x400\0" \
+               "mmc read 0x51000000 0x80 0x800; run updatebackup\0" \
        "mmcboot=" \
                "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
                "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
@@@ -227,8 -222,8 +222,8 @@@ int get_soft_i2c_sda_pin(void)
  #define KEY_PWR_INTERRUPT_REG         MAX77686_REG_PMIC_INT1
  #define KEY_PWR_INTERRUPT_MASK                (1 << 1)
  
- #define KEY_VOL_UP_GPIO                       exynos4x12_gpio_get(2, x2, 2)
- #define KEY_VOL_DOWN_GPIO             exynos4x12_gpio_get(2, x3, 3)
+ #define KEY_VOL_UP_GPIO                       EXYNOS4X12_GPIO_X22
+ #define KEY_VOL_DOWN_GPIO             EXYNOS4X12_GPIO_X33
  #endif /* __ASSEMBLY__ */
  
  /* LCD console */