karo: tx6: add support for TX6-V2 (eMMC)

[karo-tx-uboot.git] / board / karo / common / splashimage.c

diff --git a/board/karo/common/splashimage.c b/board/karo/common/splashimage.c
index 35e6ac14875ce9da5c72763c21568cfcc49a2054..e39d8d56c95d3cb4693735a2df18059b5d1286dd 100644 (file)
--- a/board/karo/common/splashimage.c
+++ b/board/karo/common/splashimage.c
@@ -21,52 +21,9 @@
 #include <nand.h>
 #include <jffs2/load_kernel.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-static int karo_load_part(const char *part, void *addr, size_t len)
-{
-       int ret;
-       struct mtd_device *dev;
-       struct part_info *part_info;
-       u8 part_num;
-       size_t actual;
+#include "karo.h"
 
-       debug("Initializing mtd_parts\n");
-       ret = mtdparts_init();
-       if (ret)
-               return ret;
-
-       debug("Trying to find NAND partition '%s'\n", part);
-       ret = find_dev_and_part(part, &dev, &part_num,
-                               &part_info);
-       if (ret) {
-               printf("Failed to find flash partition '%s': %d\n",
-                       part, ret);
-
-               return ret;
-       }
-       debug("Found partition '%s': offset=%08x size=%08x\n",
-               part, part_info->offset, part_info->size);
-       if (part_info->size < len) {
-               printf("Warning: partition '%s' smaller than requested size: %u; truncating data to %u byte\n",
-                       part, len, part_info->size);
-               len = part_info->size;
-       }
-       debug("Reading NAND partition '%s' to %p\n", part, addr);
-       ret = nand_read_skip_bad(&nand_info[0], part_info->offset, &len,
-                               &actual, len, addr);
-       if (ret) {
-               printf("Failed to load partition '%s' to %p\n", part, addr);
-               return ret;
-       }
-       if (actual < len)
-               printf("Read only %u of %u bytes due to bad blocks\n",
-                       actual, len);
-
-       debug("Read %u byte from partition '%s' @ offset %08x\n",
-               len, part, part_info->offset);
-       return 0;
-}
+DECLARE_GLOBAL_DATA_PTR;
 
 static ulong calc_fbsize(void)
 {
@@ -77,7 +34,6 @@ static ulong calc_fbsize(void)
 int karo_load_splashimage(int mode)
 {
        int ret;
-       int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
        unsigned long la = gd->fb_base;
        char *splashimage = getenv("splashimage");
        ulong fbsize = calc_fbsize();
@@ -106,87 +62,3 @@ int karo_load_splashimage(int mode)
        }
        return 0;
 }
-
-static int erase_flash(loff_t offs, size_t len)
-{
-       nand_erase_options_t nand_erase_options;
-
-       memset(&nand_erase_options, 0, sizeof(nand_erase_options));
-       nand_erase_options.length = len;
-       nand_erase_options.offset = offs;
-
-       return nand_erase_opts(&nand_info[0], &nand_erase_options);
-}
-
-int do_fbdump(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
-       int ret;
-       size_t fbsize = calc_fbsize();
-       const char *part = "logo";
-       struct mtd_device *dev;
-       struct part_info *part_info;
-       u8 part_num;
-       u_char *addr = (u_char *)gd->fb_base;
-       size_t actual;
-
-       if (argc > 2)
-               return CMD_RET_USAGE;
-
-       if (argc == 2)
-               part = argv[1];
-
-       if (!addr) {
-               printf("fb address unknown\n");
-               return CMD_RET_FAILURE;
-       }
-
-       debug("Initializing mtd_parts\n");
-       ret = mtdparts_init();
-       if (ret)
-               return ret;
-
-       debug("Trying to find NAND partition '%s'\n", part);
-       ret = find_dev_and_part(part, &dev, &part_num,
-                               &part_info);
-       if (ret) {
-               printf("Failed to find flash partition '%s': %d\n",
-                       part, ret);
-
-               return ret;
-       }
-       debug("Found partition '%s': offset=%08x size=%08x\n",
-               part, part_info->offset, part_info->size);
-       if (part_info->size < fbsize) {
-               printf("Error: partition '%s' smaller than frame buffer size: %u\n",
-                       part, fbsize);
-               return CMD_RET_FAILURE;
-       }
-       debug("Writing framebuffer %p to NAND partition '%s'\n",
-               addr, part);
-
-       ret = erase_flash(part_info->offset, fbsize);
-       if (ret) {
-               printf("Failed to erase partition '%s'\n", part);
-               return CMD_RET_FAILURE;
-       }
-
-       ret = nand_write_skip_bad(&nand_info[0], part_info->offset,
-                               &fbsize, &actual, part_info->size,
-                               addr, WITH_DROP_FFS);
-       if (ret) {
-               printf("Failed to write partition '%s'\n", part);
-               return ret;
-       }
-       if (actual < fbsize)
-               printf("Wrote only %u of %u bytes due to bad blocks\n",
-                       actual, fbsize);
-
-       debug("Wrote %u byte from %p to partition '%s' @ offset %08x\n",
-               fbsize, addr, part, part_info->offset);
-
-       return CMD_RET_SUCCESS;
-}
-
-U_BOOT_CMD(fbdump, 2, 0, do_fbdump, "dump framebuffer contents to flash",
-       "[partition name]\n"
-       "       default partition name: 'logo'\n");