r3774 - in trunk/src: host/splash target/u-boot/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-05 19:07:00 +0100 (Sat, 05 Jan 2008)
New Revision: 3774

Modified:
   trunk/src/host/splash/splashimg.pl
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
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



Modified: trunk/src/host/splash/splashimg.pl
===================================================================
--- trunk/src/host/splash/splashimg.pl	2008-01-05 04:12:34 UTC (rev 3773)
+++ trunk/src/host/splash/splashimg.pl	2008-01-05 18:07:00 UTC (rev 3774)
@@ -2,7 +2,7 @@
 #
 # splashimg.pl - Convert a 480x640 PNG to a splash screen raw dump 
 #
-# Copyright (C) 2006-2007 by OpenMoko, Inc.
+# Copyright (C) 2006-2008 by OpenMoko, Inc.
 # Written by Werner Almesberger <werner at openmoko.org>
 # All Rights Reserved
 #
@@ -23,11 +23,12 @@
 
 
 $bpp = 16;
+$swap_pix = 0;
 
 
 sub usage
 {
-    print STDERR "usage: $0 [-32] [-pnm] [System_boot.png]\n";
+    print STDERR "usage: $0 [-32] [-pnm] [-swap] [System_boot.png]\n";
     exit(1);
 }
 
@@ -41,6 +42,10 @@
 	$pnm = 1;
 	shift @ARGV;
     }
+    elsif ($ARGV[0] eq "-swap") {
+	$swap_pix = 1;
+	shift @ARGV;
+    }
     else {
 	die "unrecognized option: \"$ARGV[0]\"";
     }
@@ -64,27 +69,27 @@
 system($cmd) && die "system \"$cmd\": $?";
 
 for ("red", "grn", "blu") {
-    open(FILE,"noname.$_") || die "noname.$_";
-    $f = join("",<FILE>);
+    open(FILE, "noname.$_") || die "noname.$_";
+    $f = join("", <FILE>);
     close FILE;
     unlink("noname.$_");
     $f =~ s/^P5\s+(\d+)\s+(\d+)\s+(\d+)\s//s;
-    ($w,$h,$p) = ($1,$2,$3);
+    ($w, $h, $p) = ($1, $2, $3);
     $p{$_} = $f;
 }
 
 print STDERR "$w x $h ($p)\n";
 
 for ($i = 0; $i != $w*$h; $i++) {
-    $r = unpack("C",substr($p{"red"},$i,1));
-    $g = unpack("C",substr($p{"grn"},$i,1));
-    $b = unpack("C",substr($p{"blu"},$i,1));
+    $r = unpack("C", substr($p{"red"}, $i ^ $swap_pix, 1));
+    $g = unpack("C", substr($p{"grn"}, $i ^ $swap_pix, 1));
+    $b = unpack("C", substr($p{"blu"}, $i ^ $swap_pix, 1));
     if ($bpp == 16) {
 	$v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
-	print pack("v",$v) || die "print: $!";
+	print pack("v", $v) || die "print: $!";
     }
     else {
 	$v = ($r) << 16 | ($g) << 8 | $b;
-	print pack("V",$v) || die "print: $!";
+	print pack("V", $v) || die "print: $!";
     }
 }

Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-01-05 04:12:34 UTC (rev 3773)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch	2008-01-05 18:07:00 UTC (rev 3774)
@@ -8,7 +8,7 @@
 ===================================================================
 --- u-boot.orig/Makefile
 +++ u-boot/Makefile
-@@ -2244,6 +2244,14 @@
+@@ -2270,6 +2270,14 @@
  sbc2410x_config: unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
@@ -873,7 +873,7 @@
 +	lcd->LCDCON2 = 0x019fc3c1;
 +	lcd->LCDCON3 = 0x0039df67;
 +	lcd->LCDCON4 = 0x00000007;
-+	lcd->LCDCON5 = 0x0001cf09;
++	lcd->LCDCON5 = 0x0001cf08;
 +	lcd->LPCSEL  = 0x00000000;
 +}
 Index: u-boot/board/neo1973/common/jbt6k74.h