r4480 - in trunk/src/host/qemu-neo1973: hw openmoko

[andrew at docs.openmoko.org]

Author: andrew
Date: 2008-06-09 04:10:18 +0200 (Mon, 09 Jun 2008)
New Revision: 4480

Modified:
   trunk/src/host/qemu-neo1973/hw/neo1973.c
   trunk/src/host/qemu-neo1973/hw/s3c2410.c
   trunk/src/host/qemu-neo1973/openmoko/flash.sh
Log:
Use u-boot "dynpart" when flashing, with all it's consequences, to get the exact same partition sizes as gta01.
Don't print repeated backlight level messages.
Don't die on programmatic CPU off, although there's no way to resume atm.


Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c	2008-06-06 11:37:46 UTC (rev 4479)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c	2008-06-09 02:10:18 UTC (rev 4480)
@@ -95,6 +95,8 @@
     const char *kernel;
     struct sd_card_s *mmc;
     uint32_t id;
+
+    int bl_level;
 };
 
 /* Handlers for output ports */
@@ -105,12 +107,17 @@
 
 static void neo_bl_intensity(int line, int level, void *opaque)
 {
+    struct neo_board_s *s = (struct neo_board_s *) opaque;
+
 #if 0
     if (((s->io->bank[1].con >> (line * 2)) & 3) == 2)		/* TOUT0 */
         neo_printf("LCD Backlight now at %i/%i.\n",
                         s->timers->compareb[line], s->timers->countb[line]);
 #else
-    neo_printf("LCD Backlight now at %i/64.\n", level >> 8);	/* XXX */
+    if ((level >> 8) != s->bl_level) {
+        s->bl_level = level >> 8;
+        neo_printf("LCD Backlight now at %i/64.\n", s->bl_level);
+    }
 #endif
 }
 

Modified: trunk/src/host/qemu-neo1973/hw/s3c2410.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/s3c2410.c	2008-06-06 11:37:46 UTC (rev 4479)
+++ trunk/src/host/qemu-neo1973/hw/s3c2410.c	2008-06-09 02:10:18 UTC (rev 4480)
@@ -632,8 +632,10 @@
             cpu_interrupt(s->env, CPU_INTERRUPT_HALT);
             printf("%s: processor powered off\n", __FUNCTION__);
             s3c_gpio_setpwrstat(s->io, 2);
+#if 0
             cpu_reset(s->env);
             s->env->regs[15] = 0;	/* XXX */
+#endif
         } else
             if (value & (1 << 2))	/* Normal IDLE mode */
                 cpu_interrupt(s->env, CPU_INTERRUPT_HALT);

Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh	2008-06-06 11:37:46 UTC (rev 4479)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh	2008-06-09 02:10:18 UTC (rev 4480)
@@ -109,8 +109,8 @@
 setenv menu_3 'Power off: neo1973 power-off'
 setenv splashimage 'nand read.e $splash_addr splash $splash_size; unzip $splash_addr 0x33d00000 0x96000'
 setenv mtdids nand0=neo1973-nand
-setenv mtdparts mtdparts=neo1973-nand:0x00050000(u-boot),0x00004000(u-boot_env),0x00208000(kernel),0x00010000(splash),0x039a4000(rootfs)
-#dynpart
+#setenv mtdparts mtdparts=neo1973-nand:0x00050000(u-boot),0x00004000(u-boot_env),0x00208000(kernel),0x00010000(splash),0x039a4000(rootfs)
+dynpart
 nand write.e $kernel_addr u-boot $uboot_size
 dynenv set u-boot_env
 saveenv"