r3982 - trunk/src/target/u-boot/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-30 11:27:49 +0100 (Wed, 30 Jan 2008)
New Revision: 3982

Added:
   trunk/src/target/u-boot/patches/gta02-bootmenu.patch
Modified:
   trunk/src/target/u-boot/patches/console-ansi.patch
Log:
Bring the boot menu also to GTA02. Since the Glamo is slower than a dumb frame
buffer, we also need to accelerate the clearing of the screen.

console-ansi.patch:
- drivers/video/cfb_console.c (process_sequence): to clear the screen just 
  clear the screen, instead of slowly scrolling away its content 

gta02-bootmenu.patch:
- board/neo1973/gta02/gta02.c (board_late_init): enabled boot menu invocation
  logic
- board/neo1973/gta02/gta02.c (board_late_init): call "neo1973_bootmenu", not
  the platform-independent "bootmenu"
- board/neo1973/gta02/gta02.c (neo1973_aux_key_pressed): AUX polarity is
  reversed in GTA02



Modified: trunk/src/target/u-boot/patches/console-ansi.patch
===================================================================
--- trunk/src/target/u-boot/patches/console-ansi.patch	2008-01-30 08:45:48 UTC (rev 3981)
+++ trunk/src/target/u-boot/patches/console-ansi.patch	2008-01-30 10:27:49 UTC (rev 3982)
@@ -43,13 +43,13 @@
 +static void process_sequence(char c)
 +{
 +	static int inverted = 0;
-+	int i, inv;
++	int inv;
 +
 +	switch (c) {
 +		case 'J':
 +			/* assume num1 == 2 */
-+			for (i = 0; i != CONSOLE_ROWS; i++)
-+				console_scrollup();
++			memsetl(CONSOLE_ROW_FIRST, CONSOLE_SIZE,
++			    CONSOLE_BG_COL);
 +			break;
 +		case 'H':
 +			if (num1 > CONSOLE_ROWS || num2 > CONSOLE_COLS)

Added: trunk/src/target/u-boot/patches/gta02-bootmenu.patch
===================================================================
--- trunk/src/target/u-boot/patches/gta02-bootmenu.patch	2008-01-30 08:45:48 UTC (rev 3981)
+++ trunk/src/target/u-boot/patches/gta02-bootmenu.patch	2008-01-30 10:27:49 UTC (rev 3982)
@@ -0,0 +1,63 @@
+Index: u-boot/board/neo1973/gta02/gta02.c
+===================================================================
+--- u-boot.orig/board/neo1973/gta02/gta02.c
++++ u-boot/board/neo1973/gta02/gta02.c
+@@ -241,10 +241,10 @@
+ 	gpio->GPJDAT |= 0x000000001;	/* GTA02v1_GPIO_3D_RESET */
+ #endif
+ 
+-#if 0
+ 	/* if there's no other reason, must be regular reset */
+ 	neo1973_wakeup_cause = NEO1973_WAKEUP_RESET;
+ 
++#if 0
+ 	if (!booted_from_nand)
+ 		goto woken_by_reset;
+ 
+@@ -274,6 +274,7 @@
+ 	}
+ 
+ woken_by_reset:
++#endif
+ 
+ 	while (neo1973_wakeup_cause == NEO1973_WAKEUP_RESET ||
+ 	    neo1973_on_key_pressed()) {
+@@ -294,7 +295,6 @@
+ 	jbt6k74_init();
+ 	jbt6k74_enter_state(JBT_STATE_NORMAL);
+ 	jbt6k74_display_onoff(1);
+-#endif
+ 
+ #if 0
+ 	{
+@@ -303,12 +303,12 @@
+ 		if (!(gpio->GPFDAT & (1 << 5)))
+ 			gpio->GPBDAT &= ~(1 << 2);
+ 	}
++#endif
+ 
+ 	if (menu_vote > 0) {
+-		bootmenu();
++		neo1973_bootmenu();
+ 		nobootdelay = 1;
+ 	}
+-#endif
+ 
+ 	return 0;
+ }
+@@ -403,13 +403,11 @@
+ 						& PCF50633_OOCSTAT_ONKEY);
+ }
+ 
+-/* FIXME: shared */
+ int neo1973_aux_key_pressed(void)
+ {
+ 	S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+-	if (gpio->GPFDAT & (1 << 6))
+-		return 0;
+-	return 1;
++
++	return !!(gpio->GPFDAT & (1 << 6));
+ }
+ 
+ /* The sum of all part_size[]s must equal to the NAND size, i.e., 0x8000000. */