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

[andrew at sita.openmoko.org]

Author: andrew
Date: 2008-03-07 02:14:43 +0100 (Fri, 07 Mar 2008)
New Revision: 4177

Modified:
   trunk/src/host/qemu-neo1973/hw/neo1973.c
   trunk/src/host/qemu-neo1973/openmoko/env
Log:
Use daily u-boot snapshots now that they're available.
Move kernel load site down a bit.
Disable u-boot env pre-load explicitely.


Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c	2008-03-06 15:46:47 UTC (rev 4176)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c	2008-03-07 01:14:43 UTC (rev 4177)
@@ -626,17 +626,19 @@
     s->cpu->env->regs[15] = S3C_SRAM_BASE;
 #else
     load_image("u-boot.bin", phys_ram_base + 0x03f80000);
-    load_image(s->kernel, phys_ram_base + 0x00800000);
+    load_image(s->kernel, phys_ram_base + 0x00100000);
 
     s->cpu->env->regs[15] = S3C_RAM_BASE | 0x03f80000;
 
     if (strstr(s->kernel, "u-boot")) {	/* FIXME */
         /* Exploit preboot-override to set up an initial environment */
-        stl_raw(phys_ram_base + 0x03f80040, S3C_RAM_BASE | 0x007fff00);
-        strcpy(phys_ram_base + 0x007fff00,
+        stl_raw(phys_ram_base + 0x03f80040, S3C_RAM_BASE | 0x000fff00);
+        strcpy(phys_ram_base + 0x000fff00,
                         "setenv stdin serial; "
                         "setenv stdout serial; "
                         "setenv stderr serial; ");
+        /* Disable ENV pre-load */
+        stl_raw(phys_ram_base + 0x03f80044, 0x00000000);
     }
 #endif
 

Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env	2008-03-06 15:46:47 UTC (rev 4176)
+++ trunk/src/host/qemu-neo1973/openmoko/env	2008-03-07 01:14:43 UTC (rev 4177)
@@ -18,7 +18,7 @@
 qemu_monitor="$HOME/.qemu_monitor"
 qemu_cmd () { $script_dir/qemu-cmd.pl "$qemu_monitor" "$*"; }
 
-kernel_addr=0x30800000
+kernel_addr=0x30100000
 splash_addr=0x36000000
 splash_size=0x5000
 
@@ -28,5 +28,5 @@
 uboot_wildcard="u-boot-gta01bv4-1*.bin"
 
 download_dir="http://buildhost.openmoko.org/daily/neo1973/deploy/glibc/images/neo1973/"
-dev_download_dir="http://buildhost.openmoko.org/snapshots/2007.08/images/"
+dev_download_dir="$download_dir"
 backup_download_dir="http://buildhost.automated.it/OM2007.2/"