video: ipu: initialize g_ipu_clk, g_ldb_clk statically

[karo-tx-uboot.git] / common / fb_mmc.c

diff --git a/common/fb_mmc.c b/common/fb_mmc.c
index 6ea3938d83f29467feb874c8156a200b4641b2a7..0c48cf929f8fd568d4d06095ede231ab81a97a6a 100644 (file)
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -10,6 +10,7 @@
 #include <part.h>
 #include <aboot.h>
 #include <sparse_format.h>
+#include <mmc.h>
 
 #ifndef CONFIG_FASTBOOT_GPT_NAME
 #define CONFIG_FASTBOOT_GPT_NAME GPT_ENTRY_NAME
@@ -22,16 +23,38 @@ static char *response_str;
 
 void fastboot_fail(const char *s)
 {
-       strncpy(response_str, "FAIL", 4);
+       strncpy(response_str, "FAIL\0", 5);
        strncat(response_str, s, RESPONSE_LEN - 4 - 1);
 }
 
 void fastboot_okay(const char *s)
 {
-       strncpy(response_str, "OKAY", 4);
+       strncpy(response_str, "OKAY\0", 5);
        strncat(response_str, s, RESPONSE_LEN - 4 - 1);
 }
 
+static int get_partition_info_efi_by_name_or_alias(block_dev_desc_t *dev_desc,
+               const char *name, disk_partition_t *info)
+{
+       int ret;
+
+       ret = get_partition_info_efi_by_name(dev_desc, name, info);
+       if (ret) {
+               /* strlen("fastboot_partition_alias_") + 32(part_name) + 1 */
+               char env_alias_name[25 + 32 + 1];
+               char *aliased_part_name;
+
+               /* check for alias */
+               strcpy(env_alias_name, "fastboot_partition_alias_");
+               strncat(env_alias_name, name, 32);
+               aliased_part_name = getenv(env_alias_name);
+               if (aliased_part_name != NULL)
+                       ret = get_partition_info_efi_by_name(dev_desc,
+                                       aliased_part_name, info);
+       }
+       return ret;
+}
+
 static void write_raw_image(block_dev_desc_t *dev_desc, disk_partition_t *info,
                const char *part_name, void *buffer,
                unsigned int download_bytes)
@@ -97,7 +120,7 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
                printf("........ success\n");
                fastboot_okay("");
                return;
-       } else if (get_partition_info_efi_by_name(dev_desc, cmd, &info)) {
+       } else if (get_partition_info_efi_by_name_or_alias(dev_desc, cmd, &info)) {
                error("cannot find partition: '%s'\n", cmd);
                fastboot_fail("cannot find partition");
                return;
@@ -110,3 +133,58 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer,
                write_raw_image(dev_desc, &info, cmd, download_buffer,
                                download_bytes);
 }
+
+void fb_mmc_erase(const char *cmd, char *response)
+{
+       int ret;
+       block_dev_desc_t *dev_desc;
+       disk_partition_t info;
+       lbaint_t blks, blks_start, blks_size, grp_size;
+       struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV);
+
+       if (mmc == NULL) {
+               error("invalid mmc device");
+               fastboot_fail("invalid mmc device");
+               return;
+       }
+
+       /* initialize the response buffer */
+       response_str = response;
+
+       dev_desc = get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV);
+       if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) {
+               error("invalid mmc device");
+               fastboot_fail("invalid mmc device");
+               return;
+       }
+
+       ret = get_partition_info_efi_by_name_or_alias(dev_desc, cmd, &info);
+       if (ret) {
+               error("cannot find partition: '%s'", cmd);
+               fastboot_fail("cannot find partition");
+               return;
+       }
+
+       /* Align blocks to erase group size to avoid erasing other partitions */
+       grp_size = mmc->erase_grp_size;
+       blks_start = (info.start + grp_size - 1) & ~(grp_size - 1);
+       if (info.size >= grp_size)
+               blks_size = (info.size - (blks_start - info.start)) &
+                               (~(grp_size - 1));
+       else
+               blks_size = 0;
+
+       printf("Erasing blocks " LBAFU " to " LBAFU " due to alignment\n",
+              blks_start, blks_start + blks_size);
+
+       blks = dev_desc->block_erase(dev_desc->dev, blks_start, blks_size);
+       if (blks != blks_size) {
+               error("failed erasing from device %d", dev_desc->dev);
+               fastboot_fail("failed erasing from device");
+               return;
+       }
+
+       printf("........ erased " LBAFU " bytes from '%s'\n",
+              blks_size * info.blksz, cmd);
+       fastboot_okay("");
+}