Changeset 3774


Ignore:
Timestamp:
01/05/08 19:07:00 (5 years ago)
Author:
werner
Message:

target/u-boot/patches/uboot-20061030-neo1973.patch: disable HWSWP in LCDCON5 to

make frame buffer organization consistent with what u-boot's CFB driver
supports. Note that this requires pixels in swap screens to be swapped.

This resolves
​http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1140

  • board/neo1973/common/jbt6k74.c (board_video_init): disable HWSWP in LCDCON5

host/splash/splashimg.pl: added option -swap to swap pixels
host/splash/splashimg.pl: added spaces after commas

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/host/splash/splashimg.pl

    r3552 r3774  
    33# splashimg.pl - Convert a 480x640 PNG to a splash screen raw dump  
    44# 
    5 # Copyright (C) 2006-2007 by OpenMoko, Inc. 
     5# Copyright (C) 2006-2008 by OpenMoko, Inc. 
    66# Written by Werner Almesberger <werner@openmoko.org> 
    77# All Rights Reserved 
    … …  
    2424 
    2525$bpp = 16; 
     26$swap_pix = 0; 
    2627 
    2728 
    2829sub usage 
    2930{ 
    30     print STDERR "usage: $0 [-32] [-pnm] [System_boot.png]\n"; 
     31    print STDERR "usage: $0 [-32] [-pnm] [-swap] [System_boot.png]\n"; 
    3132    exit(1); 
    3233} 
    … …  
    4041    elsif ($ARGV[0] eq "-pnm") { 
    4142        $pnm = 1; 
     43        shift @ARGV; 
     44    } 
     45    elsif ($ARGV[0] eq "-swap") { 
     46        $swap_pix = 1; 
    4247        shift @ARGV; 
    4348    } 
    … …  
    6570 
    6671for ("red", "grn", "blu") { 
    67     open(FILE,"noname.$_") || die "noname.$_"; 
    68     $f = join("",<FILE>); 
     72    open(FILE, "noname.$_") || die "noname.$_"; 
     73    $f = join("", <FILE>); 
    6974    close FILE; 
    7075    unlink("noname.$_"); 
    7176    $f =~ s/^P5\s+(\d+)\s+(\d+)\s+(\d+)\s//s; 
    72     ($w,$h,$p) = ($1,$2,$3); 
     77    ($w, $h, $p) = ($1, $2, $3); 
    7378    $p{$_} = $f; 
    7479} 
    … …  
    7782 
    7883for ($i = 0; $i != $w*$h; $i++) { 
    79     $r = unpack("C",substr($p{"red"},$i,1)); 
    80     $g = unpack("C",substr($p{"grn"},$i,1)); 
    81     $b = unpack("C",substr($p{"blu"},$i,1)); 
     84    $r = unpack("C", substr($p{"red"}, $i ^ $swap_pix, 1)); 
     85    $g = unpack("C", substr($p{"grn"}, $i ^ $swap_pix, 1)); 
     86    $b = unpack("C", substr($p{"blu"}, $i ^ $swap_pix, 1)); 
    8287    if ($bpp == 16) { 
    8388        $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3); 
    84         print pack("v",$v) || die "print: $!"; 
     89        print pack("v", $v) || die "print: $!"; 
    8590    } 
    8691    else { 
    8792        $v = ($r) << 16 | ($g) << 8 | $b; 
    88         print pack("V",$v) || die "print: $!"; 
     93        print pack("V", $v) || die "print: $!"; 
    8994    } 
    9095} 

  • trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch

    r3564 r3774  
    99--- u-boot.orig/Makefile 
    1010+++ u-boot/Makefile 
    11 @@ -2244,6 +2244,14 @@ 
     11@@ -2270,6 +2270,14 @@ 
    1212 sbc2410x_config: unconfig 
    1313        @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0 
    … …  
    874874+       lcd->LCDCON3 = 0x0039df67; 
    875875+       lcd->LCDCON4 = 0x00000007; 
    876 +       lcd->LCDCON5 = 0x0001cf09; 
     876+       lcd->LCDCON5 = 0x0001cf08; 
    877877+       lcd->LPCSEL  = 0x00000000; 
    878878+} 
Note: See TracChangeset for help on using the changeset viewer.