]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
committerTom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
1  2 
Makefile
README
boards.cfg
common/image.c

diff --combined Makefile
index e3a27c624939d10c584781582e83749378cfa594,02b2ede92a7ff4f7e7b6652ed6679b22887f8d20..cbab5716df3c8e0dcad6ac5e4d2fa078ce539c55
+++ b/Makefile
@@@ -22,9 -22,9 +22,9 @@@
  #
  
  VERSION = 2012
 -PATCHLEVEL = 07
 +PATCHLEVEL = 10
  SUBLEVEL =
 -EXTRAVERSION =
 +EXTRAVERSION = -rc1
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -242,20 -242,13 +242,20 @@@ LIBS-y += arch/arm/cpu/ixp/npe/libnpe.
  endif
  LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
  LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
 -LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \
 -      fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \
 -      fs/ubifs/libubifs.o fs/zfs/libzfs.o
 +LIBS-y += fs/cramfs/libcramfs.o \
 +      fs/ext4/libext4fs.o \
 +      fs/fat/libfat.o \
 +      fs/fdos/libfdos.o \
 +      fs/jffs2/libjffs2.o \
 +      fs/reiserfs/libreiserfs.o \
 +      fs/ubifs/libubifs.o \
 +      fs/yaffs2/libyaffs2.o \
 +      fs/zfs/libzfs.o
  LIBS-y += net/libnet.o
  LIBS-y += disk/libdisk.o
  LIBS-y += drivers/bios_emulator/libatibiosemu.o
  LIBS-y += drivers/block/libblock.o
 +LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o
  LIBS-y += drivers/dma/libdma.o
  LIBS-y += drivers/fpga/libfpga.o
  LIBS-y += drivers/gpio/libgpio.o
@@@ -275,7 -268,6 +275,7 @@@ LIBS-y += drivers/pci/libpci.
  LIBS-y += drivers/pcmcia/libpcmcia.o
  LIBS-y += drivers/power/libpower.o
  LIBS-y += drivers/spi/libspi.o
 +LIBS-y += drivers/dfu/libdfu.o
  ifeq ($(CPU),mpc83xx)
  LIBS-y += drivers/qe/libqe.o
  LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
@@@ -313,8 -305,11 +313,8 @@@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34X
  LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
  endif
  
 -ifeq ($(SOC),mx5)
 -LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
 -endif
 -ifeq ($(SOC),mx6)
 -LIBS-y += $(CPUDIR)/imx-common/libimx-common.o
 +ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
 +LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
  endif
  
  ifeq ($(SOC),s5pc1xx)
@@@ -323,9 -318,6 +323,9 @@@ endi
  ifeq ($(SOC),exynos)
  LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
  endif
 +ifeq ($(SOC),tegra20)
 +LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
 +endif
  
  LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
  .PHONY : $(LIBS)
@@@ -381,18 -373,10 +381,18 @@@ 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
 -ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
  ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
  ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
  
 +# enable combined SPL/u-boot/dtb rules for tegra
 +ifeq ($(SOC),tegra20)
 +ifeq ($(CONFIG_OF_SEPARATE),y)
 +ALL-y += $(obj)u-boot-dtb-tegra.bin
 +else
 +ALL-y += $(obj)u-boot-nodtb-tegra.bin
 +endif
 +endif
 +
  all:          $(ALL-y) $(SUBDIR_EXAMPLES)
  
  $(obj)u-boot.dtb:     $(obj)u-boot
@@@ -438,6 -422,11 +438,11 @@@ $(obj)u-boot.kwb:       $(obj)u-boot.bi
                $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
                -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
  
+ $(obj)u-boot.pbl:     $(obj)u-boot.bin
+               $(obj)tools/mkimage -n $(CONFIG_PBLRCW_CONFIG) \
+               -R $(CONFIG_PBLPBI_CONFIG) -T pblimage \
+               -d $< $@
  $(obj)u-boot.sha1:    $(obj)u-boot.bin
                $(obj)tools/ubsha1 $(obj)u-boot.bin
  
@@@ -453,8 -442,7 +458,8 @@@ $(obj)u-boot.ubl:       $(obj)spl/u-boo
                rm $(obj)spl/u-boot-spl-pad.bin
  
  $(obj)u-boot.ais:       $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 -              $(obj)tools/mkimage -s -n /dev/null -T aisimage \
 +              $(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \
 +                      -T aisimage \
                        -e $(CONFIG_SPL_TEXT_BASE) \
                        -d $(obj)spl/u-boot-spl.bin \
                        $(obj)spl/u-boot-spl.ais
                        $(obj)spl/u-boot-spl.ais $(obj)spl/u-boot-spl-pad.ais
                cat $(obj)spl/u-boot-spl-pad.ais $(obj)u-boot.bin > \
                        $(obj)u-boot.ais
 -              rm $(obj)spl/u-boot-spl{,-pad}.ais
 +
 +# Specify the target for use in elftosb call
 +ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
  
  $(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
 -              elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
 +              elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \
                        -o $(obj)u-boot.sb
  
  # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL.
@@@ -487,20 -473,6 +492,20 @@@ $(obj)u-boot.spr:        $(obj)u-boot.img $(ob
                        conv=notrunc 2>/dev/null
                cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@
  
 +ifeq ($(SOC),tegra20)
 +ifeq ($(CONFIG_OF_SEPARATE),y)
 +$(obj)u-boot-dtb-tegra.bin:   $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot.dtb
 +              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
 +              cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin $(obj)u-boot.dtb > $@
 +              rm $(obj)spl/u-boot-spl-pad.bin
 +else
 +$(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
 +              $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(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
 +endif
 +endif
 +
  ifeq ($(CONFIG_SANDBOX),y)
  GEN_UBOOT = \
                cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
@@@ -519,7 -491,7 +524,7 @@@ $(obj)u-boot:      depend 
                $(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
                $(GEN_UBOOT)
  ifeq ($(CONFIG_KALLSYMS),y)
 -              smap=`$(call SYSTEM_MAP,u-boot) | \
 +              smap=`$(call SYSTEM_MAP,$(obj)u-boot) | \
                        awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
                $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \
                        -c common/system_map.c -o $(obj)common/system_map.o
@@@ -552,6 -524,12 +557,6 @@@ nand_spl: $(TIMESTAMP_FILE) $(VERSION_F
  $(obj)u-boot-nand.bin:        nand_spl $(obj)u-boot.bin
                cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
  
 -onenand_ipl:  $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
 -              $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
 -
 -$(obj)u-boot-onenand.bin:     onenand_ipl $(obj)u-boot.bin
 -              cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
 -
  $(obj)spl/u-boot-spl.bin:     $(SUBDIR_TOOLS) depend
                $(MAKE) -C spl all
  
@@@ -773,7 -751,6 +778,7 @@@ clean
               $(obj)tools/gen_eth_addr    $(obj)tools/img2srec           \
               $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk         \
               $(obj)tools/mk{smdk5250,}spl                               \
 +             $(obj)tools/mxsboot                                        \
               $(obj)tools/ncb             $(obj)tools/ubsha1
        @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}        \
               $(obj)board/matrix_vision/*/bootscript.img                 \
        @rm -f $(obj)include/generated/asm-offsets.h
        @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
        @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map}
 -      @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
        @rm -f $(ONENAND_BIN)
 -      @rm -f $(obj)onenand_ipl/u-boot.lds
        @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
        @rm -f $(obj)MLO
        @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
@@@ -808,6 -787,7 +813,7 @@@ clobber:   tid
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y)
        @rm -f $(obj)u-boot.kwb
+       @rm -f $(obj)u-boot.pbl
        @rm -f $(obj)u-boot.imx
        @rm -f $(obj)u-boot.ubl
        @rm -f $(obj)u-boot.ais
        @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @rm -fr $(obj)include/generated
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
 -      @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
        @rm -f $(obj)dts/*.tmp
 +      @rm -f $(obj)spl/u-boot-spl{,-pad}.ais
  
  mrproper \
  distclean:    clobber unconfig
diff --combined README
index 4428205b86aa5273c95ca6f820667ffb5d63e2d8,8197235a37206885199b308bcadd419bb2cccf14..5793b0a2069ad5c2fac40f29c7b9c9a5c4d1e5f2
--- 1/README
--- 2/README
+++ b/README
@@@ -383,6 -383,31 +383,31 @@@ The following options need to be config
                symbol should be set to the TLB1 entry to be used for this
                purpose.
  
+               CONFIG_SYS_FSL_ERRATUM_A004510
+               Enables a workaround for erratum A004510.  If set,
+               then CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV and
+               CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY must be set.
+               CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV
+               CONFIG_SYS_FSL_ERRATUM_A004510_SVR_REV2 (optional)
+               Defines one or two SoC revisions (low 8 bits of SVR)
+               for which the A004510 workaround should be applied.
+               The rest of SVR is either not relevant to the decision
+               of whether the erratum is present (e.g. p2040 versus
+               p2041) or is implied by the build target, which controls
+               whether CONFIG_SYS_FSL_ERRATUM_A004510 is set.
+               See Freescale App Note 4493 for more information about
+               this erratum.
+               CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY
+               This is the value to write into CCSR offset 0x18600
+               according to the A004510 workaround.
  - Generic CPU options:
                CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN
  
  - Monitor Functions:
                Monitor commands can be included or excluded
                from the build by using the #include files
 -              "config_cmd_all.h" and #undef'ing unwanted
 -              commands, or using "config_cmd_default.h"
 +              <config_cmd_all.h> and #undef'ing unwanted
 +              commands, or using <config_cmd_default.h>
                and augmenting with additional #define's
                for wanted commands.
  
                If this variable is defined, an environment variable
                named "ver" is created by U-Boot showing the U-Boot
                version as printed by the "version" command.
 -              This variable is readonly.
 +              Any change to this variable will be reverted at the
 +              next reset.
  
  - Real-Time Clock:
  
                commands like bootm or iminfo. This option is
                automatically enabled when you select CONFIG_CMD_DATE .
  
 -- Partition Support:
 -              CONFIG_MAC_PARTITION and/or CONFIG_DOS_PARTITION
 -              and/or CONFIG_ISO_PARTITION and/or CONFIG_EFI_PARTITION
 +- Partition Labels (disklabels) Supported:
 +              Zero or more of the following:
 +              CONFIG_MAC_PARTITION   Apple's MacOS partition table.
 +              CONFIG_DOS_PARTITION   MS Dos partition table, traditional on the
 +                                     Intel architecture, USB sticks, etc.
 +              CONFIG_ISO_PARTITION   ISO partition table, used on CDROM etc.
 +              CONFIG_EFI_PARTITION   GPT partition table, common when EFI is the
 +                                     bootloader.  Note 2TB partition limit; see
 +                                     disk/part_efi.c
 +              CONFIG_MTD_PARTITIONS  Memory Technology Device partition table.
  
                If IDE or SCSI support is enabled (CONFIG_CMD_IDE or
                CONFIG_CMD_SCSI) you must configure support for at
 -              least one partition type as well.
 +              least one non-MTD partition type as well.
  
  - IDE Reset method:
                CONFIG_IDE_RESET_ROUTINE - this is defined in several
@@@ -3100,12 -3117,12 +3125,12 @@@ to save the current settings
          These two #defines specify the address and size of the
          environment area within the remote memory space. The
          local device can get the environment from remote memory
-         space by SRIO or other links.
+         space by SRIO or PCIE links.
  
  BE CAREFUL! For some special cases, the local device can not use
  "saveenv" command. For example, the local device will get the
- environment stored in a remote NOR flash by SRIO link, but it can
not erase, write this NOR flash by SRIO interface.
+ environment stored in a remote NOR flash by SRIO or PCIE link,
but it can not erase, write this NOR flash by SRIO or PCIE interface.
  
  - CONFIG_ENV_IS_IN_NAND:
  
@@@ -3385,13 -3402,6 +3410,13 @@@ Low Level (hardware related) configurat
                Disable PCI-Express on systems where it is supported but not
                required.
  
 +- CONFIG_PCI_ENUM_ONLY
 +              Only scan through and get the devices on the busses.
 +              Don't do any setup work, presumably because someone or
 +              something has already done it, and we don't need to do it
 +              a second time.  Useful for platforms that are pre-booted
 +              by coreboot or similar.
 +
  - CONFIG_SYS_SRIO:
                Chip has SRIO or not
  
@@@ -3553,9 -3563,9 +3578,9 @@@ within that device
  - CONFIG_SYS_QE_FMAN_FW_IN_REMOTE
        Specifies that QE/FMAN firmware is located in the remote (master)
        memory space.   CONFIG_SYS_FMAN_FW_ADDR is a virtual address which
-       can be mapped from slave TLB->slave LAW->slave SRIO outbound window
-       ->master inbound window->master LAW->the ucode address in master's
-       NOR flash.
+       can be mapped from slave TLB->slave LAW->slave SRIO or PCIE outbound
+       window->master inbound window->master LAW->the ucode address in
+       master's memory space.
  
  Building the Software:
  ======================
diff --combined boards.cfg
index 091c79f5cf38df75ebdeeda9be744919cc0f6886,dce754fce1de91a4809f1e848740656dc61182d8..f789539e85806f9cd2dc89e5732e04bcd7b2d71d
@@@ -50,17 -50,16 +50,17 @@@ tt01                         ar
  imx31_litekit                arm         arm1136     -                   logicpd        mx31
  flea3                        arm         arm1136     -                   CarMediaLab    mx35
  mx35pdk                      arm         arm1136     -                   freescale      mx35
 -apollon                            arm         arm1136     apollon             -              omap24xx
  omap2420h4                   arm         arm1136     -                   ti             omap24xx
  tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
 +rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
  integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
  integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap:CM920T
  integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp:CM920T
  a320evb                      arm         arm920t     -                   faraday        a320
  at91rm9200ek                 arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek
  at91rm9200ek_ram             arm         arm920t     at91rm9200ek        atmel          at91        at91rm9200ek:RAMBOOT
 -eb_cpux9k2                   arm         arm920t     -                   BuS            at91
 +eb_cpux9k2                   arm         arm920t     eb_cpux9k2          BuS            at91        eb_cpux9k2
 +eb_cpux9k2_ram               arm         arm920t     eb_cpux9k2          BuS            at91        eb_cpux9k2:RAMBOOT
  cpuat91                      arm         arm920t     cpuat91             eukrea         at91        cpuat91
  cpuat91_ram                  arm         arm920t     cpuat91             eukrea         at91        cpuat91:RAMBOOT
  mx1ads                       arm         arm920t     -                   -              imx
@@@ -95,8 -94,6 +95,8 @@@ at91sam9g20ek_nandflash      ar
  at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
  at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
  at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 +at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
 +at91sam9x5ek_spiflash        arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_SPIFLASH
  at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
  at91sam9xeek_dataflash_cs1   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1
  at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
@@@ -128,13 -125,10 +128,13 @@@ cpu9G20_nand_128M            ar
  pm9261                       arm         arm926ejs   pm9261              ronetix        at91        pm9261:AT91SAM9261
  pm9263                       arm         arm926ejs   pm9263              ronetix        at91        pm9263:AT91SAM9263
  pm9g45                       arm         arm926ejs   pm9g45              ronetix        at91        pm9g45:AT91SAM9G45
 +portuxg20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20,PORTUXG20
 +stamp9g20                    arm         arm926ejs   stamp9g20           taskit         at91        stamp9g20:AT91SAM9G20
  cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
  da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
  da850_am18xxevm              arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
  da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH
 +da850evm_direct_nor          arm         arm926ejs   da8xxevm            davinci        davinci     da850evm:MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT
  davinci_dm355evm             arm         arm926ejs   dm355evm            davinci        davinci
  davinci_dm355leopard         arm         arm926ejs   dm355leopard        davinci        davinci
  davinci_dm365evm             arm         arm926ejs   dm365evm            davinci        davinci
@@@ -181,10 -175,8 +181,10 @@@ tx25                         ar
  zmx25                        arm         arm926ejs   zmx25               syteco         mx25
  imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
  magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
 -m28evk                       arm         arm926ejs   -                   denx           mx28
 -mx28evk                      arm         arm926ejs   -                   freescale      mx28
 +apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs           apx4devkit
 +m28evk                       arm         arm926ejs   m28evk              denx           mxs           m28evk
 +mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs           mx28evk
 +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
  omap5912osk                  arm         arm926ejs   -                   ti             omap
@@@ -221,8 -213,8 +221,8 @@@ integratorcp_cm946es         ar
  ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
  am335x_evm                   arm         armv7       am335x              ti             am33xx
  highbank                     arm         armv7       highbank            -              highbank
 -efikamx                      arm         armv7       efikamx             -              mx5           efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
 -efikasb                      arm         armv7       efikamx             -              mx5           efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg
 +mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
 +mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5           mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
  mx51evk                      arm         armv7       mx51evk             freescale      mx5           mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
  mx53ard                      arm         armv7       mx53ard             freescale      mx5           mx53ard:IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg
  mx53evk                      arm         armv7       mx53evk             freescale      mx5           mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg
@@@ -236,10 -228,8 +236,10 @@@ cm_t35                       ar
  omap3_overo                  arm         armv7       overo               -              omap3
  omap3_pandora                arm         armv7       pandora             -              omap3
  dig297                       arm         armv7       dig297              comelit        omap3
 -igep0020                     arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020
 -igep0030                     arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030
 +igep0020                     arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND
 +igep0020_nand                arm         armv7       igep0020            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND
 +igep0030                     arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND
 +igep0030_nand                arm         armv7       igep0030            isee           omap3         igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND
  am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
  mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
  omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
@@@ -266,12 -256,11 +266,12 @@@ s5pc210_universal            ar
  smdk5250                   arm         armv7       smdk5250            samsung        exynos
  smdkv310                   arm         armv7       smdkv310            samsung        exynos
  trats                        arm         armv7       trats               samsung        exynos
 -harmony                      arm         armv7       harmony             nvidia         tegra2
 -seaboard                     arm         armv7       seaboard            nvidia         tegra2
 -ventana                      arm         armv7       ventana             nvidia         tegra2
 -whistler                     arm         armv7       whistler            nvidia         tegra2
 +harmony                      arm         armv7:arm720t harmony           nvidia         tegra20
 +seaboard                     arm         armv7:arm720t seaboard          nvidia         tegra20
 +ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
 +whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
  u8500_href                   arm         armv7       u8500               st-ericsson    u8500
 +snowball                     arm         armv7       snowball               st-ericsson    u8500
  actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
  actux1_4_32                  arm         ixp         actux1              -              -           actux1:FLASH2X2,RAM_32MB
  actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
@@@ -296,13 -285,12 +296,13 @@@ xaeniax                      ar
  zipitz2                      arm         pxa
  colibri_pxa270               arm         pxa         -                   toradex
  jornada                      arm         sa1100
 -plutux                       arm         armv7       plutux              avionic-design tegra2
 -medcom                       arm         armv7       medcom              avionic-design tegra2
 -tec                          arm         armv7       tec                 avionic-design tegra2
 -paz00                        arm         armv7       paz00               compal         tegra2
 -trimslice                    arm         armv7       trimslice           compulab       tegra2
 +plutux                       arm         armv7:arm720t plutux            avionic-design tegra20
 +medcom                       arm         armv7:arm720t medcom            avionic-design tegra20
 +tec                          arm         armv7:arm720t tec               avionic-design tegra20
 +paz00                        arm         armv7:arm720t paz00             compal         tegra20
 +trimslice                    arm         armv7:arm720t trimslice         compulab       tegra20
  atngw100                     avr32       at32ap      -                   atmel          at32ap700x
 +atngw100mkii                 avr32       at32ap      -                   atmel          at32ap700x
  atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
  atstk1003                    avr32       at32ap      atstk1000           atmel          at32ap700x
  atstk1004                    avr32       at32ap      atstk1000           atmel          at32ap700x
@@@ -390,8 -378,7 +390,8 @@@ M5485FFE                m68k        mcf547x_8x  m548xe
  M5485GFE                   m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64
  M5485HFE                   m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO
  microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
 -qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips
 +qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips:SYS_BIG_ENDIAN
 +qemu_mipsel                  mips        mips32      qemu-mips           -              -           qemu-mips:SYS_LITTLE_ENDIAN
  vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
  vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
  vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
@@@ -475,6 -462,7 +475,6 @@@ mcc200_highboot_SDRAM        powerp
  mcc200_SDRAM                 powerpc     mpc5xxx     mcc200              -              -           mcc200:MCC200_SDRAM
  motionpro                    powerpc     mpc5xxx
  munices                      powerpc     mpc5xxx
 -o2dnt                        powerpc     mpc5xxx
  PM520                        powerpc     mpc5xxx     pm520
  PM520_DDR                    powerpc     mpc5xxx     pm520               -              -           PM520:MPC5200_DDR
  PM520_ROMBOOT                powerpc     mpc5xxx     pm520               -              -           PM520:BOOT_ROM
@@@ -494,16 -482,6 +494,16 @@@ TOP5200                      powerp
  cpci5200                     powerpc     mpc5xxx     -                   esd
  mecp5200                     powerpc     mpc5xxx     -                   esd
  pf5200                       powerpc     mpc5xxx     -                   esd
 +O2D                          powerpc     mpc5xxx     o2dnt2              ifm            -           o2d
 +O2D300                       powerpc     mpc5xxx     o2dnt2              ifm            -           o2d300
 +O2DNT2                       powerpc     mpc5xxx     o2dnt2              ifm            -           o2dnt2
 +O2DNT2_RAMBOOT               powerpc     mpc5xxx     o2dnt2              ifm            -           o2dnt2:SYS_TEXT_BASE=0x00100000
 +O2I                          powerpc     mpc5xxx     o2dnt2              ifm            -           o2i
 +O2MNT                        powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt
 +O2MNT_O2M110                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M110"
 +O2MNT_O2M112                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M112"
 +O2MNT_O2M113                 powerpc     mpc5xxx     o2dnt2              ifm            -           o2mnt:IFM_SENSOR_TYPE="O2M113"
 +O3DNT                        powerpc     mpc5xxx     o2dnt2              ifm            -           o3dnt
  digsy_mtc                    powerpc     mpc5xxx     digsy_mtc           intercontrol
  digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000
  digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:DIGSY_REV5
@@@ -809,29 -787,24 +809,24 @@@ P2041RDB_NAND                powerpc     
  P2041RDB_SDCARD              powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P2041RDB_SECURE_BOOT         powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:SECURE_BOOT
  P2041RDB_SPIFLASH            powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
+ P2041RDB_SRIO_PCIE_BOOT          powerpc     mpc85xx     p2041rdb          freescale      -           P2041RDB:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P3041DS                      powerpc     mpc85xx     corenet_ds          freescale
  P3041DS_NAND               powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  P3041DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P3041DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SECURE_BOOT
  P3041DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
- P3041DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SRIOBOOT_MASTER
- P3041DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SRIOBOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
- P3060QDS                   powerpc     mpc85xx     p3060qds            freescale
- P3060QDS_NAND              powerpc     mpc85xx     p3060qds            freescale      -           P3060QDS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
- P3060QDS_SECURE_BOOT         powerpc     mpc85xx     p3060qds            freescale      -           P3060QDS:SECURE_BOOT
+ P3041DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P3041DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P4080DS                      powerpc     mpc85xx     corenet_ds          freescale
  P4080DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P4080DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SECURE_BOOT
  P4080DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
- P4080DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SRIOBOOT_MASTER
- P4080DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SRIOBOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
+ P4080DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P4080DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  P5020DS                      powerpc     mpc85xx     corenet_ds          freescale
  P5020DS_NAND               powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SDCARD                     powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  P5020DS_SECURE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SECURE_BOOT
  P5020DS_SPIFLASH           powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
- P5020DS_SRIOBOOT_MASTER                    powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIOBOOT_MASTER
- P5020DS_SRIOBOOT_SLAVE          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIOBOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
+ P5020DS_SRIO_PCIE_BOOT          powerpc     mpc85xx     corenet_ds          freescale      -           P5020DS:SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000
  BSC9131RDB_SPIFLASH          powerpc     mpc85xx     bsc9131rdb          freescale      -           BSC9131RDB:BSC9131RDB,SPIFLASH
  stxgp3                       powerpc     mpc85xx     stxgp3              stx
  stxssa                       powerpc     mpc85xx     stxssa              stx            -           stxssa
diff --combined common/image.c
index 70a112d36f044254b9a876d5290939564b3219c4,0c601bbc45d6e1063b710a83a739a5d9f0bf43d5..f084d2baed3e0685937c6d4be3b73eb8e54add3a
@@@ -143,6 -143,7 +143,7 @@@ static const table_entry_t uimage_type[
        {       IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
        {       IH_TYPE_MULTI,      "multi",      "Multi-File Image",   },
        {       IH_TYPE_OMAPIMAGE,  "omapimage",  "TI OMAP SPL With GP CH",},
+       {       IH_TYPE_PBLIMAGE,   "pblimage",   "Freescale PBL Boot Image",},
        {       IH_TYPE_RAMDISK,    "ramdisk",    "RAMDisk Image",      },
        {       IH_TYPE_SCRIPT,     "script",     "Script",             },
        {       IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
@@@ -2042,13 -2043,13 +2043,13 @@@ void fit_image_print(const void *fit, i
                printf("%s  Architecture: %s\n", p, genimg_get_arch_name(arch));
        }
  
 -      if (type == IH_TYPE_KERNEL) {
 +      if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_RAMDISK)) {
                fit_image_get_os(fit, image_noffset, &os);
                printf("%s  OS:           %s\n", p, genimg_get_os_name(os));
        }
  
        if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) ||
 -              (type == IH_TYPE_FIRMWARE)) {
 +              (type == IH_TYPE_FIRMWARE) || (type == IH_TYPE_RAMDISK)) {
                ret = fit_image_get_load(fit, image_noffset, &load);
                printf("%s  Load Address: ", p);
                if (ret)
                        printf("0x%08lx\n", load);
        }
  
 -      if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE)) {
 +      if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) ||
 +              (type == IH_TYPE_RAMDISK)) {
                fit_image_get_entry(fit, image_noffset, &entry);
                printf("%s  Entry Point:  ", p);
                if (ret)