mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-23 05:00:24 +09:00
Merge with /home/wd/git/u-boot/work
This commit is contained in:
commit
a6e6cf0036
@ -16,6 +16,12 @@ Changes for U-Boot 1.1.4:
|
|||||||
* Fix autonegotiation in tsec ethernet driver
|
* Fix autonegotiation in tsec ethernet driver
|
||||||
Patch by Stefan Roese, 21 Sep 2005
|
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 INKA4x0 board
|
||||||
|
|
||||||
* Update configuration for PM854 board
|
* Update configuration for PM854 board
|
||||||
|
@ -296,7 +296,7 @@ au_check_header_valid(int idx, long nbytes)
|
|||||||
/* recycle checksum */
|
/* recycle checksum */
|
||||||
checksum = ntohl(hdr->ih_size);
|
checksum = ntohl(hdr->ih_size);
|
||||||
/* for kernel and app the image header must also fit into flash */
|
/* 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);
|
checksum += sizeof(*hdr);
|
||||||
/* check the size does not exceed space in flash. HUSH scripts */
|
/* check the size does not exceed space in flash. HUSH scripts */
|
||||||
/* all have ausize[] set to 0 */
|
/* all have ausize[] set to 0 */
|
||||||
|
@ -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];
|
bmp_color_table_entry_t cte = bmp->color_table[i];
|
||||||
ushort colreg =
|
ushort colreg =
|
||||||
( ((cte.red) << 8) & 0xf800) |
|
( ((cte.red) << 8) & 0xf800) |
|
||||||
( ((cte.green) << 4) & 0x07e0) |
|
( ((cte.green) << 3) & 0x07e0) |
|
||||||
( (cte.blue) & 0x001f) ;
|
( ((cte.blue) >> 3) & 0x001f) ;
|
||||||
|
|
||||||
#ifdef CFG_INVERT_COLORS
|
#ifdef CFG_INVERT_COLORS
|
||||||
*cmap = 0xffff - colreg;
|
*cmap = 0xffff - colreg;
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user