]> 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>
Wed, 11 Sep 2013 07:59:27 +0000 (09:59 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 11 Sep 2013 07:59:27 +0000 (09:59 +0200)
Conflicts:
tools/Makefile

1  2 
MAINTAINERS
Makefile
board/samsung/goni/goni.c
boards.cfg
include/configs/exynos5250-dt.h
tools/Makefile

diff --combined MAINTAINERS
index 0807727703cf23f7928a2bed236297e25c2da5cf,9700ec9e8043c5d1d40e592150379face78c3034..86a5ce402eb46d11d28e2e90f868955bc6a98456
@@@ -184,6 -184,7 +184,6 @@@ Matthias Fuchs <matthias.fuchs@esd-elec
        APC405          PPC405GP
        AR405           PPC405GP
        ASH405          PPC405EP
 -      CANBT           PPC405CR
        CPCI2DP         PPC405GP
        CPCI405         PPC405GP
        CPCI4052        PPC405GP
@@@ -464,6 -465,10 +464,10 @@@ Andre Schwarz <andre.schwarz@matrix-vis
        mvblm7          MPC8343
        mvsmr           MPC5200
  
+ Inderpal Singh <inderpal.singh@linaro.org>
+       Arndale         ARM ARMV7 (EXYNOS5250 SoC)
  Jon Smirl <jonsmirl@gmail.com>
  
        pcm030          MPC5200
@@@ -472,10 -477,6 +476,10 @@@ Ira W. Snyder <iws@ovro.caltech.edu
  
        P2020COME       P2020
  
 +York Sun <yorksun@freescale.com>
 +
 +      T4240EMU        T4240
 +
  Timur Tabi <timur@freescale.com>
  
        MPC8349E-mITX   MPC8349
@@@ -543,10 -544,6 +547,10 @@@ Detlev Zundel <dzu@denx.de
  
        inka4x0         MPC5200
  
 +Po Liu <po.liu@freescale.com>
 +
 +      C29XPCIE        C29X
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1094,11 -1091,6 +1098,11 @@@ Sergey Yanovich <ynvich@gmail.com
  
        lp8x4x          xscale/pxa
  
 +Roger Meier <r.meier@siemens.com>
 +      dxr2                    ARM ARMV7 (AM335x SoC)
 +      pxm2                    ARM ARMV7 (AM335x SoC)
 +      rut                     ARM ARMV7 (AM335x SoC)
 +
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:
@@@ -1375,7 -1367,7 +1379,7 @@@ Dimitar Penev <dpn@switchfin.org
  #     Board           CPU                                             #
  #########################################################################
  
 -Macpaul Lin <macpaul@andestech.com>
 +Andes <uboot@andestech.com>
  
        ADP-AG101       N1213 (AG101 SoC)
        ADP-AG101P      N1213 (AG101P XC5 FPGA)
diff --combined Makefile
index ed48279acd130613dc2a684ece2265a42b999f84,488db8af947f6c31b3ffd789278973b6538757e3..5de84b6474ef406a6925b54f907bb907e894b4c9
+++ b/Makefile
@@@ -6,9 -6,9 +6,9 @@@
  #
  
  VERSION = 2013
 -PATCHLEVEL = 07
 +PATCHLEVEL = 10
  SUBLEVEL =
 -EXTRAVERSION =
 +EXTRAVERSION = -rc2
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -102,11 -102,10 +102,11 @@@ endif # ifneq ($(BUILD_DIR),
  
  OBJTREE               := $(if $(BUILD_DIR),$(BUILD_DIR),$(CURDIR))
  SPLTREE               := $(OBJTREE)/spl
 +TPLTREE               := $(OBJTREE)/tpl
  SRCTREE               := $(CURDIR)
  TOPDIR                := $(SRCTREE)
  LNDIR         := $(OBJTREE)
 -export        TOPDIR SRCTREE OBJTREE SPLTREE
 +export        TOPDIR SRCTREE OBJTREE SPLTREE TPLTREE
  
  MKCONFIG      := $(SRCTREE)/mkconfig
  export MKCONFIG
@@@ -398,7 -397,6 +398,7 @@@ ALL-y += $(obj)u-boot.srec $(obj)u-boot
  ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
  ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
  ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
 +ALL-$(CONFIG_TPL) += $(obj)tpl/u-boot-tpl.bin
  ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
  ifneq ($(CONFIG_SPL_TARGET),)
  ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
@@@ -415,7 -413,7 +415,7 @@@ endi
  
  all:          $(ALL-y) $(SUBDIR_EXAMPLES)
  
 -$(obj)u-boot.dtb:     $(obj)u-boot
 +$(obj)u-boot.dtb:     checkdtc $(obj)u-boot
                $(MAKE) -C dts binary
                mv $(obj)dts/dt.dtb $@
  
@@@ -477,25 -475,13 +477,25 @@@ $(obj)u-boot.sha1:      $(obj)u-boot.bi
  $(obj)u-boot.dis:     $(obj)u-boot
                $(OBJDUMP) -d $< > $@
  
 +# $@ is output, $(1) and $(2) are inputs, $(3) is padded intermediate,
 +# $(4) is pad-to
 +SPL_PAD_APPEND = \
 +              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(4) -I binary -O binary \
 +              $(1) $(obj)$(3); \
 +              cat $(obj)$(3) $(2) > $@; \
 +              rm $(obj)$(3)
  
 +ifdef CONFIG_TPL
 +SPL_PAYLOAD := $(obj)tpl/u-boot-with-tpl.bin
 +else
 +SPL_PAYLOAD := $(obj)u-boot.bin
 +endif
  
 -$(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 -              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \
 -                      -I binary -O binary $< $(obj)spl/u-boot-spl-pad.bin
 -              cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
 -              rm $(obj)spl/u-boot-spl-pad.bin
 +$(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(SPL_PAYLOAD)
 +              $(call SPL_PAD_APPEND,$<,$(SPL_PAYLOAD),spl/u-boot-spl-pad.bin,$(CONFIG_SPL_PAD_TO))
 +
 +$(obj)tpl/u-boot-with-tpl.bin: $(obj)tpl/u-boot-tpl.bin $(obj)u-boot.bin
 +              $(call SPL_PAD_APPEND,$<,$(obj)u-boot.bin,tpl/u-boot-tpl-pad.bin,$(CONFIG_TPL_PAD_TO))
  
  $(obj)u-boot-with-spl.imx: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
                $(MAKE) -C $(SRCTREE)/arch/arm/imx-common \
@@@ -621,17 -607,12 +621,17 @@@ $(obj)u-boot-nand.bin:  nand_spl $(obj)u
  $(obj)spl/u-boot-spl.bin:     $(SUBDIR_TOOLS) depend
                $(MAKE) -C spl all
  
 +$(obj)tpl/u-boot-tpl.bin:     $(SUBDIR_TOOLS) depend
 +              $(MAKE) -C spl all CONFIG_TPL_BUILD=y
 +
  updater:
                $(MAKE) -C tools/updater all
  
  # Explicitly make _depend in subdirs containing multiple targets to prevent
  # parallel sub-makes creating .depend files simultaneously.
  depend dep:   $(TIMESTAMP_FILE) $(VERSION_FILE) \
 +              $(obj)include/spl-autoconf.mk \
 +              $(obj)include/tpl-autoconf.mk \
                $(obj)include/autoconf.mk \
                $(obj)include/generated/generic-asm-offsets.h \
                $(obj)include/generated/asm-offsets.h
@@@ -686,12 -667,6 +686,12 @@@ checkgcc4
                false; \
        fi
  
 +checkdtc:
 +      @if test $(call dtc-version) -lt 0104; then \
 +              echo '*** Your dtc is too old, please upgrade to dtc 1.4 or newer'; \
 +              false; \
 +      fi
 +
  #
  # Auto-generate the autoconf.mk file (which is included by all makefiles)
  #
@@@ -713,34 -688,12 +713,34 @@@ $(obj)include/autoconf.mk: $(obj)includ
                sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
        mv $@.tmp $@
  
 +# Auto-generate the spl-autoconf.mk file (which is included by all makefiles for SPL)
 +$(obj)include/tpl-autoconf.mk: $(obj)include/config.h
 +      @$(XECHO) Generating $@ ; \
 +      set -e ; \
 +      : Extract the config macros ; \
 +      $(CPP) $(CFLAGS) -DCONFIG_TPL_BUILD  -DCONFIG_SPL_BUILD\
 +                      -DDO_DEPS_ONLY -dM include/common.h | \
 +      sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
 +      mv $@.tmp $@
 +
 +$(obj)include/spl-autoconf.mk: $(obj)include/config.h
 +      @$(XECHO) Generating $@ ; \
 +      set -e ; \
 +      : Extract the config macros ; \
 +      $(CPP) $(CFLAGS) -DCONFIG_SPL_BUILD -DDO_DEPS_ONLY -dM include/common.h | \
 +      sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
 +      mv $@.tmp $@
 +
  $(obj)include/generated/generic-asm-offsets.h:        $(obj)include/autoconf.mk.dep \
 +      $(obj)include/spl-autoconf.mk \
 +      $(obj)include/tpl-autoconf.mk \
        $(obj)lib/asm-offsets.s
        @$(XECHO) Generating $@
        tools/scripts/make-asm-offsets $(obj)lib/asm-offsets.s $@
  
  $(obj)lib/asm-offsets.s:      $(obj)include/autoconf.mk.dep \
 +      $(obj)include/spl-autoconf.mk \
 +      $(obj)include/tpl-autoconf.mk \
        $(src)lib/asm-offsets.c
        @mkdir -p $(obj)lib
        $(CC) -DDO_DEPS_ONLY \
                -o $@ $(src)lib/asm-offsets.c -c -S
  
  $(obj)include/generated/asm-offsets.h:        $(obj)include/autoconf.mk.dep \
 +      $(obj)include/spl-autoconf.mk \
 +      $(obj)include/tpl-autoconf.mk \
        $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
        @$(XECHO) Generating $@
        tools/scripts/make-asm-offsets $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s $@
  
 -$(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep
 +$(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep \
 +      $(obj)include/spl-autoconf.mk \
 +      $(obj)include/tpl-autoconf.mk
        @mkdir -p $(obj)$(CPUDIR)/$(SOC)
        if [ -f $(src)$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
                $(CC) -DDO_DEPS_ONLY \
@@@ -828,9 -777,7 +828,9 @@@ include/license.h: tools/bin2header COP
  unconfig:
        @rm -f $(obj)include/config.h $(obj)include/config.mk \
                $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
 -              $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
 +              $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep \
 +              $(obj)include/spl-autoconf.mk \
 +              $(obj)include/tpl-autoconf.mk
  
  %_config::    unconfig
        @$(MKCONFIG) -A $(@:_config=)
@@@ -866,7 -813,7 +866,7 @@@ clean
               $(obj)tools/gdb/{astest,gdbcont,gdbsend}                   \
               $(obj)tools/gen_eth_addr    $(obj)tools/img2srec           \
               $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk         \
-              $(obj)tools/mk{smdk5250,}spl                               \
+              $(obj)tools/mk{$(BOARD),}spl                               \
               $(obj)tools/mxsboot                                        \
               $(obj)tools/ncb             $(obj)tools/ubsha1             \
               $(obj)tools/kernel-doc/docproc                             \
@@@ -916,8 -863,6 +916,8 @@@ clobber:   tid
        @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
        @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map}
        @rm -f $(obj)spl/u-boot-spl.lds
 +      @rm -f $(obj)tpl/{u-boot-tpl,u-boot-tpl.bin,u-boot-tpl.map}
 +      @rm -f $(obj)tpl/u-boot-spl.lds
        @rm -f $(obj)MLO MLO.byteswap
        @rm -f $(obj)SPL
        @rm -f $(obj)tools/xway-swap-bytes
index 5b3d6ef853bfa11a5cb3a6d7ccb6013f595188d3,4ddff04f41d62824830119e5f33eb610e3ba4408..366f648d32004037c204040226899934e8fc05dc
@@@ -32,11 -32,7 +32,11 @@@ int power_init_board(void
  {
        int ret;
  
 -      ret = pmic_init(I2C_5);
 +      /*
 +       * For PMIC the I2C bus is named as I2C5, but it is connected
 +       * to logical I2C adapter 0
 +       */
 +      ret = pmic_init(I2C_0);
        if (ret)
                return ret;
  
@@@ -72,7 -68,7 +72,7 @@@ int checkboard(void
  #ifdef CONFIG_GENERIC_MMC
  int board_mmc_init(bd_t *bis)
  {
-       int i;
+       int i, ret, ret_sd = 0;
  
        /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
        s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
                s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
        }
  
-       return s5p_mmc_init(0, 4);
+       ret = s5p_mmc_init(0, 4);
+       if (ret)
+               error("MMC: Failed to init MMC:0.\n");
+       /*
+        * SD card (T_FLASH) detect and init
+        * T_FLASH_DETECT: EINT28: GPH3[4] input mode
+        */
+       s5p_gpio_cfg_pin(&s5pc110_gpio->h3, 4, GPIO_INPUT);
+       s5p_gpio_set_pull(&s5pc110_gpio->h3, 4, GPIO_PULL_UP);
+       if (!s5p_gpio_get_value(&s5pc110_gpio->h3, 4)) {
+               for (i = 0; i < 7; i++) {
+                       if (i == 2)
+                               continue;
+                       /* GPG2[0:6] special function 2 */
+                       s5p_gpio_cfg_pin(&s5pc110_gpio->g2, i, 0x2);
+                       /* GPG2[0:6] pull disable */
+                       s5p_gpio_set_pull(&s5pc110_gpio->g2, i, GPIO_PULL_NONE);
+                       /* GPG2[0:6] drv 4x */
+                       s5p_gpio_set_drv(&s5pc110_gpio->g2, i, GPIO_DRV_4X);
+               }
+               ret_sd = s5p_mmc_init(2, 4);
+               if (ret_sd)
+                       error("MMC: Failed to init SD card (MMC:2).\n");
+       }
+       return ret & ret_sd;
  }
  #endif
  
diff --combined boards.cfg
index 48aa0bf1021258dd22e1fecc27a277dcae96306a,598561be2921be18ff95fd5b9a0f89a9c8ae51d2..b4297e568d78672ac315de109dd95d0388e76a36
@@@ -204,7 -204,6 +204,7 @@@ mx23evk                      ar
  m28evk                       arm         arm926ejs   m28evk              denx           mxs           m28evk
  mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk:ENV_IS_IN_MMC
  mx28evk_nand                 arm         arm926ejs   mx28evk             freescale      mxs           mx28evk:ENV_IS_IN_NAND
 +mx28evk_auart_console        arm         arm926ejs   mx28evk             freescale      mxs           mx28evk:MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC
  sc_sps_1                     arm         arm926ejs   sc_sps_1            schulercontrol mxs
  nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
  nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
@@@ -255,9 -254,6 +255,9 @@@ am335x_evm_uart5             ar
  am335x_evm_usbspl            arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,NAND,SPL_USBETH_SUPPORT
  am335x_boneblack             arm         armv7       am335x              ti             am33xx      am335x_evm:SERIAL1,CONS_INDEX=1,EMMC_BOOT
  am43xx_evm                   arm         armv7       am43xx              ti             am33xx      am43xx_evm:SERIAL1,CONS_INDEX=1
 +dxr2                         arm         armv7       dxr2                siemens        am33xx
 +pxm2                         arm         armv7       pxm2                siemens        am33xx
 +rut                          arm         armv7       rut                 siemens        am33xx
  ti814x_evm                   arm         armv7       ti814x              ti             am33xx
  ti816x_evm                   arm         armv7       ti816x              ti             am33xx
  pcm051                       arm         armv7       pcm051              phytec         am33xx      pcm051
@@@ -327,6 -323,7 +327,7 @@@ omap5_uevm                   ar
  dra7xx_evm                 arm         armv7       dra7xx              ti             omap5
  s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
  smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
+ arndale                            arm         armv7       arndale             samsung        exynos
  origen                             arm         armv7       origen              samsung        exynos
  s5pc210_universal            arm         armv7       universal_c210      samsung        exynos
  snow                       arm         armv7       smdk5250            samsung        exynos
@@@ -785,8 -782,6 +786,8 @@@ MPC8569MDS_NAND              powerp
  MPC8572DS                    powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS
  MPC8572DS_36BIT              powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:36BIT
  MPC8572DS_NAND               powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:NAND
 +C29XPCIE                     powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT
 +C29XPCIE_SPIFLASH            powerpc     mpc85xx     c29xpcie            freescale      -           C29XPCIE:C29XPCIE,36BIT,SPIFLASH
  P1010RDB_36BIT_NAND          powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND
  P1010RDB_36BIT_NAND_SECBOOT  powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT
  P1010RDB_36BIT_NOR           powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT
@@@ -817,20 -812,16 +818,20 @@@ P1020RDB_36BIT               powerp
  P1020RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SDCARD
  P1020RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SPIFLASH
  P1020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,NAND
 -P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB
 -P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT
 -P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,NAND
 -P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SDCARD
 -P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SPIFLASH
 -P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,NAND
 -P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SDCARD
 -P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SPIFLASH
 +P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC
 +P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT
 +P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,NAND
 +P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SDCARD
 +P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,36BIT,SPIFLASH
 +P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,NAND
 +P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SDCARD
 +P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PC,SPIFLASH
  P1020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SDCARD
  P1020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SPIFLASH
 +P1020RDB-PD                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD
 +P1020RDB-PD_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,NAND
 +P1020RDB-PD_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SDCARD
 +P1020RDB-PD_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB_PD,SPIFLASH
  P1020UTM-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM
  P1020UTM-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT
  P1020UTM-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD
@@@ -864,7 -855,6 +865,7 @@@ P1025RDB_36BIT               powerp
  P1025RDB_NAND                powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,NAND
  P1025RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SDCARD
  P1025RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1025RDB,SPIFLASH
 +TWR-P1025                    powerpc     mpc85xx     p1_twr              freescale      -           p1_twr:TWR_P1025
  P2010RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB
  P2010RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT
  P2010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,36BIT,SDCARD
@@@ -941,7 -931,6 +942,7 @@@ stxgp3                       powerp
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
  stxssa_4M                    powerpc     mpc85xx     stxssa              stx            -           stxssa:STXSSA_4M
  T4240QDS                     powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240
 +T4240EMU                     powerpc     mpc85xx     t4qds               freescale      -           T4240EMU:PPC_T4240
  T4240QDS_SDCARD              powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SPIFLASH            powerpc     mpc85xx     t4qds               freescale    -           T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
  T4240QDS_SRIO_PCIE_BOOT            powerpc     mpc85xx     t4qds               freescale      -           T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
@@@ -1126,6 -1115,7 +1127,6 @@@ PPChameleonEVB_ME_33         powerp
  APC405                       powerpc     ppc4xx      apc405              esd
  AR405                        powerpc     ppc4xx      ar405               esd
  ASH405                       powerpc     ppc4xx      ash405              esd
 -CANBT                        powerpc     ppc4xx      canbt               esd
  CMS700                       powerpc     ppc4xx      cms700              esd
  CPCI2DP                      powerpc     ppc4xx      cpci2dp             esd
  CPCI405                      powerpc     ppc4xx      cpci405             esd
index 8f8f85f4403ae71c3717a4e37cdba3bcb1cdc364,2b93a458cbdf6d48352314e407966e7d263af0e0..8c21909d634f600f64f9c0376ea8819cc272f5e6
@@@ -13,7 -13,7 +13,7 @@@
  #define CONFIG_SAMSUNG                        /* in a SAMSUNG core */
  #define CONFIG_S5P                    /* S5P Family */
  #define CONFIG_EXYNOS5                        /* which is in a Exynos5 Family */
- #define CONFIG_SMDK5250                       /* which is in a SMDK5250 */
+ #define CONFIG_EXYNOS5250
  
  #include <asm/arch/cpu.h>             /* get chip and board defs */
  
@@@ -23,6 -23,7 +23,6 @@@
  #define CONFIG_DISPLAY_BOARDINFO
  
  /* Enable fdt support for Exynos5250 */
 -#define CONFIG_ARCH_DEVICE_TREE               exynos5250
  #define CONFIG_OF_CONTROL
  #define CONFIG_OF_SEPARATE
  
diff --combined tools/Makefile
index 0a29147847451be688fbaa041ecabc000c0eb37a,b94119202c85597cad3027420ac93f8f8564aed3..c36cde200745b0da9959d280606ca76ccd498798
@@@ -52,7 -52,7 +52,7 @@@ BIN_FILES-$(CONFIG_CMD_LOADS) += img2sr
  BIN_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX)
  BIN_FILES-y += mkenvimage$(SFX)
  BIN_FILES-y += mkimage$(SFX)
- BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX)
+ BIN_FILES-$(CONFIG_EXYNOS5250) += mk$(BOARD)spl$(SFX)
  BIN_FILES-$(CONFIG_MX23) += mxsboot$(SFX)
  BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX)
  BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
@@@ -70,32 -70,31 +70,33 @@@ EXT_OBJ_FILES-y += lib/md5.
  EXT_OBJ_FILES-y += lib/sha1.o
  
  # Source files located in the tools directory
 -OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
 -OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
 +NOPED_OBJ_FILES-y += aisimage.o
  NOPED_OBJ_FILES-y += default_image.o
 -NOPED_OBJ_FILES-y += proftool.o
 -OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
  NOPED_OBJ_FILES-y += fit_image.o
 -OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
 -OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 -OBJ_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes.o
 -NOPED_OBJ_FILES-y += aisimage.o
 -NOPED_OBJ_FILES-y += kwbimage.o
 -NOPED_OBJ_FILES-y += pblimage.o
 -NOPED_OBJ_FILES-y += imximage.o
  NOPED_OBJ_FILES-y += image-host.o
 -NOPED_OBJ_FILES-y += omapimage.o
 +NOPED_OBJ_FILES-y += imximage.o
 +NOPED_OBJ_FILES-y += kwbimage.o
  NOPED_OBJ_FILES-y += mkenvimage.o
  NOPED_OBJ_FILES-y += mkimage.o
 +NOPED_OBJ_FILES-y += mxsimage.o
 +NOPED_OBJ_FILES-y += omapimage.o
 +NOPED_OBJ_FILES-y += os_support.o
 +NOPED_OBJ_FILES-y += pblimage.o
 +NOPED_OBJ_FILES-y += proftool.o
 +NOPED_OBJ_FILES-y += ublimage.o
 +OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
 +OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 +OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
+ OBJ_FILES-$(CONFIG_EXYNOS5250) += mkexynosspl.o
 +OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o
 +OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
  OBJ_FILES-$(CONFIG_MX23) += mxsboot.o
  OBJ_FILES-$(CONFIG_MX28) += mxsboot.o
  OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o
 -NOPED_OBJ_FILES-y += os_support.o
  OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o
 -NOPED_OBJ_FILES-y += ublimage.o
 -OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o
 +OBJ_FILES-$(CONFIG_SMDK5250) += mkexynosspl.o
 +OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
 +OBJ_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes.o
  
  # Don't build by default
  #ifeq ($(ARCH),ppc)
@@@ -155,7 -154,6 +156,7 @@@ NOPEDOBJS := $(addprefix $(obj),$(NOPED
  #
  # Use native tools and options
  # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
 +# Define _GNU_SOURCE to obtain the getline prototype from stdio.h
  #
  HOSTCPPFLAGS =        -include $(SRCTREE)/include/libfdt_env.h \
                -idirafter $(SRCTREE)/include \
                -I $(SRCTREE)/tools \
                -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \
                -DUSE_HOSTCC \
 -              -D__KERNEL_STRICT_NAMES
 +              -D__KERNEL_STRICT_NAMES \
 +              -D_GNU_SOURCE
  
  
  all:  $(obj).depend $(BINS) $(LOGO-y) subdirs
@@@ -204,21 -201,20 +205,21 @@@ $(obj)mkenvimage$(SFX): $(obj)crc32.o $
        $(HOSTSTRIP) $@
  
  $(obj)mkimage$(SFX):  $(obj)aisimage.o \
 +                      $(FIT_SIG_OBJS) \
                        $(obj)crc32.o \
                        $(obj)default_image.o \
                        $(obj)fit_image.o \
                        $(obj)image-fit.o \
 -                      $(obj)image.o \
                        $(obj)image-host.o \
 -                      $(FIT_SIG_OBJS) \
 +                      $(obj)image.o \
                        $(obj)imximage.o \
                        $(obj)kwbimage.o \
 -                      $(obj)pblimage.o \
                        $(obj)md5.o \
                        $(obj)mkimage.o \
 -                      $(obj)os_support.o \
 +                      $(obj)mxsimage.o \
                        $(obj)omapimage.o \
 +                      $(obj)os_support.o \
 +                      $(obj)pblimage.o \
                        $(obj)sha1.o \
                        $(obj)ublimage.o \
                        $(LIBFDT_OBJS) \