emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashcp: new applet by Stefan Seyfried. +900 bytes

Browse Source 
Signed-off-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Stefan Seyfried 2009-11-21 18:32:19 +01:00 committed by Denys Vlasenko
parent 102ff76c84
commit d095fd4d95
5 changed files with 169 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/applets.h
View File

@ -160,6 +160,7 @@ IF_FINDFS(APPLET(findfs, _BB_DIR_SBIN, _BB_SUID_MAYBE))
IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP))

11
include/usage.h
View File

@ -1286,8 +1286,15 @@
#define flash_eraseall_full_usage "\n\n" \
"Erase an MTD device\n" \
"\nOptions:" \
"\n -j format the device for jffs2" \
"\n -q don't display progress messages"
"\n -j Format the device for jffs2" \
"\n -q Don't display progress messages" \
#define flashcp_trivial_usage \
"-v FILE MTD_DEVICE"
#define flashcp_full_usage "\n\n" \
"Copy an image to MTD device\n" \
"\nOptions:" \
"\n -v Verbose" \
#define fold_trivial_usage \
"[-bs] [-w WIDTH] [FILE]"

7
miscutils/Config.in
View File

@ -272,6 +272,13 @@ config FBSPLASH
"NN" (ASCII decimal number) - percentage to show on progress bar
"exit" - well you guessed it
config FLASHCP
bool "flashcp"
default n
help
The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
This utility is used to copy images into a MTD device.
config FLASH_LOCK
bool "flash_lock"
default n

1
miscutils/Kbuild
View File

@ -17,6 +17,7 @@ lib-$(CONFIG_DEVFSD) += devfsd.o
lib-$(CONFIG_DEVMEM) += devmem.o
lib-$(CONFIG_EJECT) += eject.o
lib-$(CONFIG_FBSPLASH) += fbsplash.o
lib-$(CONFIG_FLASHCP) += flashcp.o
lib-$(CONFIG_FLASH_ERASEALL) += flash_eraseall.o
lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o
lib-$(CONFIG_FLASH_UNLOCK) += flash_lock_unlock.o

151
miscutils/flashcp.c Normal file
View File

@ -0,0 +1,151 @@
/* vi: set sw=4 ts=4: */
/*
* busybox reimplementation of flashcp
*
* (C) 2009 Stefan Seyfried <seife@sphairon.com>
*
* Licensed under GPLv2, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
#include <mtd/mtd-user.h>
#define MTD_DEBUG 0
#define OPT_v (1 << 0)
#define BUFSIZE (8 * 1024)
static void progress(int mode, uoff_t count, uoff_t total)
{
uoff_t percent;
if (!option_mask32) //if (!(option_mask32 & OPT_v))
return;
percent = count * 100;
if (total)
percent = (unsigned) (percent / total);
printf("\r%s: %"OFF_FMT"u/%"OFF_FMT"u (%u%%) ",
(mode == 0) ? "Erasing block" : ((mode == 1) ? "Writing kb" : "Verifying kb"),
count, total, (unsigned)percent);
fflush_all();
}
static void progress_newline(void)
{
if (!option_mask32) //if (!(option_mask32 & OPT_v))
return;
bb_putchar('\n');
}
int flashcp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int flashcp_main(int argc UNUSED_PARAM, char **argv)
{
int fd_f, fd_d; /* input file and mtd device file descriptors */
int i;
uoff_t erase_count;
unsigned opts;
struct mtd_info_user mtd;
struct erase_info_user e;
struct stat statb;
// const char *filename, *devicename;
RESERVE_CONFIG_UBUFFER(buf, BUFSIZE);
RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE);
opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */
opts = getopt32(argv, "v");
argv += optind;
// filename = *argv++;
// devicename = *argv;
#define filename argv[0]
#define devicename argv[1]
/* open input file and mtd device and do sanity checks */
fd_f = xopen(filename, O_RDONLY);
fstat(fd_f, &statb);
fd_d = xopen(devicename, O_SYNC | O_RDWR);
#if !MTD_DEBUG
if (ioctl(fd_d, MEMGETINFO, &mtd) < 0) {
bb_error_msg_and_die("%s is not a MTD flash device", devicename);
}
if (statb.st_size > mtd.size) {
bb_error_msg_and_die("%s bigger than %s", filename, devicename);
}
#else
mtd.erasesize = 64 * 1024;
#endif
/* always erase a complete block */
erase_count = (uoff_t)(statb.st_size + mtd.erasesize - 1) / mtd.erasesize;
/* erase 1 block at a time to be able to give verbose output */
e.length = mtd.erasesize;
#if 0
/* (1) bloat
* (2) will it work for multi-gigabyte devices?
* (3) worse wrt error detection granularity
*/
/* optimization: if not verbose, erase in one go */
if (!opts) { // if (!(opts & OPT_v))
e.length = mtd.erasesize * erase_count;
erase_count = 1;
}
#endif
e.start = 0;
for (i = 1; i <= erase_count; i++) {
progress(0, i, erase_count);
errno = 0;
#if !MTD_DEBUG
if (ioctl(fd_d, MEMERASE, &e) < 0) {
bb_perror_msg_and_die("erase error at 0x%llx on %s",
(long long)e.start, devicename);
}
#else
usleep(100*1000);
#endif
e.start += mtd.erasesize;
}
progress_newline();
/* doing this outer loop gives significantly smaller code
* than doing two separate loops for writing and verifying */
for (i = 1; i <= 2; i++) {
uoff_t done;
unsigned count;
xlseek(fd_f, 0, SEEK_SET);
xlseek(fd_d, 0, SEEK_SET);
done = 0;
count = BUFSIZE;
while (1) {
uoff_t rem = statb.st_size - done;
if (rem == 0)
break;
if (rem < BUFSIZE)
count = rem;
progress(i, done / 1024, (uoff_t)statb.st_size / 1024);
xread(fd_f, buf, count);
if (i == 1) {
int ret;
errno = 0;
ret = full_write(fd_d, buf, count);
if (ret != count) {
bb_perror_msg_and_die("write error at 0x%"OFF_FMT"x on %s, "
"write returned %d",
done, devicename, ret);
}
} else { /* i == 2 */
xread(fd_d, buf2, count);
if (memcmp(buf, buf2, count)) {
bb_error_msg_and_die("verification mismatch at 0x%"OFF_FMT"x", done);
}
}
done += count;
}
progress_newline();
}
/* we won't come here if there was an error */
return EXIT_SUCCESS;
}