diff options
| author | Hannes Petermaier <oe5hpm@oevsv.at> | 2015-04-24 14:49:38 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-08 17:24:17 -0400 |
| commit | 4e2a341566ee53963b343d1f06c53bfb02d3d291 (patch) | |
| tree | 59a13aabcede7d56fbf8e4eb4f304004037a8f20 /include/configs | |
| parent | 99f724721130d8606e04c3bd46e7232db06c4dad (diff) | |
| download | talos-obmc-uboot-4e2a341566ee53963b343d1f06c53bfb02d3d291.tar.gz talos-obmc-uboot-4e2a341566ee53963b343d1f06c53bfb02d3d291.zip | |
board/BuR/common: remove BMP_DISPLAY from tseries board
Since we display in future the splash screen out of linux-os, we don't need
this support anymore within the common section.
But kwb-target is still using BMP_DISPLAY feature, so we move the related
from the common section into the target-specific.
Also the default environment of tseries will be adapted to this.
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/bur_am335x_common.h | 6 | ||||
| -rw-r--r-- | include/configs/kwb.h | 8 | ||||
| -rw-r--r-- | include/configs/tseries.h | 10 |
3 files changed, 10 insertions, 14 deletions
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 240fc464bc..c74140b240 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -30,12 +30,6 @@ "setenv stdout nc;setenv stdin nc;setenv stderr nc\0" #define CONFIG_CMD_TIME -#define CONFIG_VIDEO_BMP_GZIP -#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) -#define CONFIG_CMD_UNZIP -#define CONFIG_CMD_BMP -#define CONFIG_BMP_24BMP -#define CONFIG_BMP_32BPP #define CONFIG_SYS_GENERIC_BOARD diff --git a/include/configs/kwb.h b/include/configs/kwb.h index dd30df27b0..7798b8001d 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -19,6 +19,14 @@ #define CONFIG_LCD_NOSTDOUT #define CONFIG_SYS_WHITE_ON_BLACK #define LCD_BPP LCD_COLOR32 + +#define CONFIG_VIDEO_BMP_GZIP +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) +#define CONFIG_CMD_UNZIP +#define CONFIG_CMD_BMP +#define CONFIG_BMP_24BMP +#define CONFIG_BMP_32BPP + /* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) diff --git a/include/configs/tseries.h b/include/configs/tseries.h index c58403fe1d..115fd5b2d2 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -126,10 +126,6 @@ #define MMCARGS \ "dtbdev=mmc\0" \ "dtbpart=0:1\0" \ -"logo0=ext4load mmc 0:3 ${loadaddr} /PPTLogo.bmp.gz && " \ - "bmp display ${loadaddr} 0 0\0" \ -"logo1=ext4load mmc 0:1 ${loadaddr} /PPTLogo.bmp.gz && " \ - "bmp display ${loadaddr} 0 0\0" \ "mmcroot0=setenv bootargs ${optargs_rot} ${optargs} console=${console}\0" \ "mmcroot1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \ "root=/dev/mmcblk0p2 rootfstype=ext4\0" \ @@ -142,13 +138,11 @@ "setenv simplefb 0; " \ "ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \ "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \ -"defboot=run logo0 || run logo1; " \ - "ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \ +"defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \ "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \ "run ramboot; run usbupdate;\0" \ "bootlimit=1\0" \ -"altbootcmd=run logo0 || run logo1; " \ - "run mmcboot0;\0" \ +"altbootcmd=run mmcboot0;\0" \ "upduboot=dhcp; " \ "tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \ "tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0" |
