summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-09-12 15:42:39 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-12 17:16:45 +0200
commita87361dfc30a49b5dd6cbd7e13cda40af223bfd5 (patch)
treee0586044c0e1c85b464f137495a01dfd656efc4b /commands
parent4271879e3b82e2e4d52a46f7c4ef01461a786b5e (diff)
downloadbarebox-a87361dfc30a49b5dd6cbd7e13cda40af223bfd5.tar.gz
barebox-a87361dfc30a49b5dd6cbd7e13cda40af223bfd5.tar.xz
bmp: rename it to splash
so be can add more format support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/Kconfig4
-rw-r--r--commands/Makefile2
-rw-r--r--commands/splash.c (renamed from commands/bmp.c)12
3 files changed, 9 insertions, 9 deletions
diff --git a/commands/Kconfig b/commands/Kconfig
index f2756cc400..c4623fa3d5 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -535,10 +535,10 @@ config CMD_LSMOD
depends on MODULES
prompt "lsmod"
-config CMD_BMP
+config CMD_SPLASH
bool
depends on VIDEO
- prompt "bmp"
+ prompt "splash"
help
show bmp files on framebuffer devices
diff --git a/commands/Makefile b/commands/Makefile
index ccebd7f559..24bf46a80e 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -49,7 +49,7 @@ obj-$(CONFIG_CMD_VERSION) += version.o
obj-$(CONFIG_CMD_HELP) += help.o
obj-$(CONFIG_CMD_LSMOD) += lsmod.o
obj-$(CONFIG_CMD_INSMOD) += insmod.o
-obj-$(CONFIG_CMD_BMP) += bmp.o
+obj-$(CONFIG_CMD_SPLASH) += splash.o
obj-$(CONFIG_USB_GADGET_DFU) += dfu.o
obj-$(CONFIG_USB_GADGET_SERIAL) += usbserial.o
obj-$(CONFIG_CMD_GPIO) += gpio.o
diff --git a/commands/bmp.c b/commands/splash.c
index 4130474931..6526b2035c 100644
--- a/commands/bmp.c
+++ b/commands/splash.c
@@ -30,7 +30,7 @@ static inline void set_pixel(struct fb_info *info, void *adr, int r, int g, int
}
}
-static int do_bmp(int argc, char *argv[])
+static int do_splash(int argc, char *argv[])
{
int ret, opt, fd;
char *fbdev = "/dev/fb0";
@@ -194,8 +194,8 @@ failed_memmap:
return 1;
}
-BAREBOX_CMD_HELP_START(bmp)
-BAREBOX_CMD_HELP_USAGE("bmp [OPTIONS] FILE\n")
+BAREBOX_CMD_HELP_START(splash)
+BAREBOX_CMD_HELP_USAGE("splash [OPTIONS] FILE\n")
BAREBOX_CMD_HELP_SHORT("Show the bitmap FILE on the framebuffer.\n")
BAREBOX_CMD_HELP_OPT ("-f <fb>", "framebuffer device (/dev/fb0)\n")
BAREBOX_CMD_HELP_OPT ("-x <xofs>", "x offset (default center)\n")
@@ -214,8 +214,8 @@ color depth.
*/
-BAREBOX_CMD_START(bmp)
- .cmd = do_bmp,
+BAREBOX_CMD_START(splash)
+ .cmd = do_splash,
.usage = "show a bmp image",
- BAREBOX_CMD_HELP(cmd_bmp_help)
+ BAREBOX_CMD_HELP(cmd_splash_help)
BAREBOX_CMD_END