serial_mxc: Fix setup of UARTx_UFCR register

[u-boot] / common / image.c

diff --git a/common/image.c b/common/image.c
index ca721c5401c29df4907576e3765b7c647afa0c5c..c36927fca8eb6beda1a9c05bab75ff1a2d33721b 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -155,6 +155,10 @@ static const table_entry_t uimage_type[] = {
        {       IH_TYPE_ATMELIMAGE, "atmelimage", "ATMEL ROM-Boot Image",},
        {       IH_TYPE_X86_SETUP,  "x86_setup",  "x86 setup.bin",    },
        {       IH_TYPE_LPC32XXIMAGE, "lpc32xximage",  "LPC32XX Boot Image", },
+       {       IH_TYPE_RKIMAGE,    "rkimage",    "Rockchip Boot Image" },
+       {       IH_TYPE_RKSD,       "rksd",       "Rockchip SD Boot Image" },
+       {       IH_TYPE_RKSPI,      "rkspi",      "Rockchip SPI Boot Image" },
+       {       IH_TYPE_ZYNQIMAGE,  "zynqimage",  "Xilinx Zynq Boot Image" },
        {       -1,                 "",           "",                   },
 };
 
@@ -164,6 +168,7 @@ static const table_entry_t uimage_comp[] = {
        {       IH_COMP_GZIP,   "gzip",         "gzip compressed",      },
        {       IH_COMP_LZMA,   "lzma",         "lzma compressed",      },
        {       IH_COMP_LZO,    "lzo",          "lzo compressed",       },
+       {       IH_COMP_LZ4,    "lz4",          "lz4 compressed",       },
        {       -1,             "",             "",                     },
 };
 
@@ -904,6 +909,15 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
        *rd_start = 0;
        *rd_end = 0;
 
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+       /*
+        * Look for an Android boot image.
+        */
+       buf = map_sysmem(images->os.start, 0);
+       if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
+               select = argv[0];
+#endif
+
        if (argc >= 2)
                select = argv[1];
 
@@ -1215,10 +1229,10 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images,
                conf_noffset = fit_conf_get_node(buf, images->fit_uname_cfg);
 
                for (loadables_index = 0;
-                    !fdt_get_string_index(buf, conf_noffset,
+                    fdt_get_string_index(buf, conf_noffset,
                                FIT_LOADABLE_PROP,
                                loadables_index,
-                               (const char **)&uname) > 0;
+                               (const char **)&uname) == 0;
                     loadables_index++)
                {
                        fit_img_result = fit_image_load(images,