Merge with /home/wd/git/u-boot/work
diff --git a/CHANGELOG b/CHANGELOG
index 3be741c..863759c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,12 @@
* 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 @@
/* 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 @@
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