sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-09-12 15:42:39 +02:00 committed by Sascha Hauer
parent 4271879e3b
commit a87361dfc3
23 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/commands.dox
View File

@ -18,7 +18,6 @@ available in @a Barebox:
@li @subpage _name
@li @subpage addpart_command
@li @subpage alternate
@li @subpage bmp_command
@li @subpage bootm_command
@li @subpage bootu
@li @subpage bootz
@ -95,6 +94,7 @@ available in @a Barebox:
@li @subpage sh
@li @subpage sleep
@li @subpage source
@li @subpage splash_command
@li @subpage test
@li @subpage timeout
@li @subpage true

4
arch/arm/boards/eukrea_cpuimx25/env/bin/init_board vendored
View File

@ -1,11 +1,11 @@
#!/bin/sh
if [ -f /env/logo.bmp ]; then
bmp /env/logo.bmp
splash /env/logo.bmp
fb0.enable=1
elif [ -f /env/logo.bmp.lzo ]; then
uncompress /env/logo.bmp.lzo /logo.bmp
bmp /logo.bmp
splash /logo.bmp
fb0.enable=1
fi

4
arch/arm/boards/eukrea_cpuimx27/env/bin/init vendored
View File

@ -17,11 +17,11 @@ if [ -e /dev/nand0 ]; then
fi
if [ -f /env/logo.bmp ]; then
bmp /env/logo.bmp
splash /env/logo.bmp
fb0.enable=1
elif [ -f /env/logo.bmp.lzo ]; then
uncompress /env/logo.bmp.lzo /logo.bmp
bmp /logo.bmp
splash /logo.bmp
fb0.enable=1
fi

4
arch/arm/boards/eukrea_cpuimx35/env/bin/init_board vendored
View File

@ -1,12 +1,12 @@
#!/bin/sh
if [ -f /env/logo.bmp ]; then
bmp /env/logo.bmp
splash /env/logo.bmp
fb0.enable=1
gpio_set_value 1 1
elif [ -f /env/logo.bmp.lzo ]; then
uncompress /env/logo.bmp.lzo /logo.bmp
bmp /logo.bmp
splash /logo.bmp
fb0.enable=1
gpio_set_value 1 1
fi

4
arch/arm/boards/eukrea_cpuimx51/env/bin/init_board vendored
View File

@ -1,12 +1,12 @@
#!/bin/sh
if [ -f /env/logo.bmp ]; then
bmp /env/logo.bmp
splash /env/logo.bmp
fb0.enable=1
gpio_set_value 1 1
elif [ -f /env/logo.bmp.lzo ]; then
uncompress /env/logo.bmp.lzo /logo.bmp
bmp /logo.bmp
splash /logo.bmp
fb0.enable=1
gpio_set_value 1 1
fi

2
arch/arm/boards/karo-tx25/env/bin/init_board vendored
View File

@ -1,6 +1,6 @@
if [ -e /dev/fb0 -a -e /env/splash.bmp ]; then
bmp /env/splash.bmp
splash /env/splash.bmp
fb0.enable=1
fi

2
arch/arm/boards/mioa701/env/bin/init vendored
View File

@ -12,7 +12,7 @@ led keyboard 0
sdcard_override
fb0.enable=1
bmp /dev/mtd0.barebox-logo
splash /dev/mtd0.barebox-logo
mtd_env_override
if [ $? = 0 ]; then

2
arch/arm/configs/chumbyone_defconfig
View File

@ -30,7 +30,7 @@ CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_NET=y
CONFIG_NET_DHCP=y

2
arch/arm/configs/cupid_defconfig
View File

@ -45,7 +45,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

2
arch/arm/configs/eukrea_cpuimx25_defconfig
View File

@ -43,7 +43,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_I2C=y

2
arch/arm/configs/eukrea_cpuimx27_defconfig
View File

@ -31,7 +31,7 @@ CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_I2C=y

2
arch/arm/configs/eukrea_cpuimx35_defconfig
View File

@ -44,7 +44,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_I2C=y

2
arch/arm/configs/freescale_mx35_3stack_defconfig
View File

@ -42,7 +42,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_I2C=y

2
arch/arm/configs/imx28evk_defconfig
View File

@ -33,7 +33,7 @@ CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_NET=y
CONFIG_NET_DHCP=y

2
arch/arm/configs/mioa701_defconfig
View File

@ -38,7 +38,7 @@ CONFIG_CMD_BOOTM_INITRD=y
CONFIG_CMD_RESET=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_LED=y

2
arch/arm/configs/neso_defconfig
View File

@ -45,7 +45,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

2
arch/arm/configs/pcm027_defconfig
View File

@ -43,7 +43,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

2
arch/arm/configs/pcm038_defconfig
View File

@ -49,7 +49,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

2
arch/arm/configs/tx25stk5_defconfig
View File

@ -45,7 +45,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

2
arch/arm/configs/tx28stk5_defconfig
View File

@ -41,7 +41,7 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_BMP=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_NET=y

4
commands/Kconfig
View File

@ -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

2
commands/Makefile
View File

@ -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

12
commands/bmp.c → commands/splash.c
View File

@ -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