Skip to content
Snippets Groups Projects
Commit 4e2a3415 authored by Hannes Petermaier's avatar Hannes Petermaier Committed by Tom Rini
Browse files

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: default avatarHannes Petermaier <oe5hpm@oevsv.at>
parent 99f72472
No related branches found
No related tags found
No related merge requests found
...@@ -30,12 +30,6 @@ ...@@ -30,12 +30,6 @@
"setenv stdout nc;setenv stdin nc;setenv stderr nc\0" "setenv stdout nc;setenv stdin nc;setenv stderr nc\0"
#define CONFIG_CMD_TIME #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 #define CONFIG_SYS_GENERIC_BOARD
......
...@@ -19,6 +19,14 @@ ...@@ -19,6 +19,14 @@
#define CONFIG_LCD_NOSTDOUT #define CONFIG_LCD_NOSTDOUT
#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_SYS_WHITE_ON_BLACK
#define LCD_BPP LCD_COLOR32 #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 */ /* Clock Defines */
#define V_OSCK 26000000 /* Clock output from T2 */ #define V_OSCK 26000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK) #define V_SCLK (V_OSCK)
......
...@@ -126,10 +126,6 @@ ...@@ -126,10 +126,6 @@
#define MMCARGS \ #define MMCARGS \
"dtbdev=mmc\0" \ "dtbdev=mmc\0" \
"dtbpart=0:1\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" \ "mmcroot0=setenv bootargs ${optargs_rot} ${optargs} console=${console}\0" \
"mmcroot1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \ "mmcroot1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \
"root=/dev/mmcblk0p2 rootfstype=ext4\0" \ "root=/dev/mmcblk0p2 rootfstype=ext4\0" \
...@@ -142,13 +138,11 @@ ...@@ -142,13 +138,11 @@
"setenv simplefb 0; " \ "setenv simplefb 0; " \
"ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \ "ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \
"run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \ "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \
"defboot=run logo0 || run logo1; " \ "defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \
"ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \
"ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \ "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \
"run ramboot; run usbupdate;\0" \ "run ramboot; run usbupdate;\0" \
"bootlimit=1\0" \ "bootlimit=1\0" \
"altbootcmd=run logo0 || run logo1; " \ "altbootcmd=run mmcboot0;\0" \
"run mmcboot0;\0" \
"upduboot=dhcp; " \ "upduboot=dhcp; " \
"tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \ "tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \
"tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0" "tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment