diff options
| author | Wolfgang Denk <wd@pollux.(none)> | 2005-09-22 09:46:19 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.(none)> | 2005-09-22 09:46:19 +0200 |
| commit | a6e6cf00367c0779eadb49915e40c55f0a787957 (patch) | |
| tree | 9f24bd7dbdb90453300c0267200e4ea2b18194c1 | |
| parent | 1caa70788c5a936197e3ecbbdc7c7c629fd44a7f (diff) | |
| parent | 8b4c9e7c144397f483d23c002dcd9c59ff7c2395 (diff) | |
| download | u-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.zip u-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.tar.gz u-boot-imx-a6e6cf00367c0779eadb49915e40c55f0a787957.tar.bz2 | |
Merge with /home/wd/git/u-boot/work
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | board/trab/auto_update.c | 2 | ||||
| -rw-r--r-- | common/lcd.c | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -16,6 +16,12 @@ Changes for U-Boot 1.1.4: * Fix autonegotiation in tsec ethernet driver Patch by Stefan Roese, 21 Sep 2005 +* Fix bug in auto_update (trab board) + Patch by Martin Krause, 16 Sep 2005 + +* Fix computation of framebuffer palette for 8bpp LCD bitmaps + Patch by Francesco Mandracci, 16 Sep 2005 + * Update configuration for INKA4x0 board * Update configuration for PM854 board diff --git a/board/trab/auto_update.c b/board/trab/auto_update.c index 0399fe8..b25928c 100644 --- a/board/trab/auto_update.c +++ b/board/trab/auto_update.c @@ -296,7 +296,7 @@ au_check_header_valid(int idx, long nbytes) /* recycle checksum */ checksum = ntohl(hdr->ih_size); /* for kernel and app the image header must also fit into flash */ - if (idx != IDX_DISK) + if ((idx != IDX_DISK) && (idx != IDX_FIRMWARE)) checksum += sizeof(*hdr); /* check the size does not exceed space in flash. HUSH scripts */ /* all have ausize[] set to 0 */ diff --git a/common/lcd.c b/common/lcd.c index a85599d..7bf7a63 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -638,9 +638,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) bmp_color_table_entry_t cte = bmp->color_table[i]; ushort colreg = ( ((cte.red) << 8) & 0xf800) | - ( ((cte.green) << 4) & 0x07e0) | - ( (cte.blue) & 0x001f) ; - + ( ((cte.green) << 3) & 0x07e0) | + ( ((cte.blue) >> 3) & 0x001f) ; #ifdef CFG_INVERT_COLORS *cmap = 0xffff - colreg; #else |