diff options
| author | Tom Rini | 2014-10-06 15:17:13 -0400 |
|---|---|---|
| committer | Tom Rini | 2014-10-06 15:17:13 -0400 |
| commit | 04de09f89bbc647d5b72db3512d1af1475a13bbd (patch) | |
| tree | 601e5dbe3def2dee6f7b3dfee680b3aee372d35f /common | |
| parent | 91693055995733e268874ae75568ae316233e116 (diff) | |
| parent | 2f210639c4f003b0d5310273979441f1bfc88eae (diff) | |
Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga
Fix a trivial conflict in dw_mmc.c after talking with Marek.
Conflicts:
drivers/mmc/dw_mmc.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/image.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/image.c b/common/image.c index 38b56e3deb5..085771c7639 100644 --- a/common/image.c +++ b/common/image.c @@ -138,6 +138,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_PBLIMAGE, "pblimage", "Freescale PBL Boot Image",}, { IH_TYPE_RAMDISK, "ramdisk", "RAMDisk Image", }, { IH_TYPE_SCRIPT, "script", "Script", }, + { IH_TYPE_SOCFPGAIMAGE, "socfpgaimage", "Altera SOCFPGA preloader",}, { IH_TYPE_STANDALONE, "standalone", "Standalone Program", }, { IH_TYPE_UBLIMAGE, "ublimage", "Davinci UBL image",}, { IH_TYPE_MXSIMAGE, "mxsimage", "Freescale MXS Boot Image",}, |