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

[andrew at sita.openmoko.org]

Author: andrew
Date: 2007-06-09 02:09:10 +0200 (Sat, 09 Jun 2007)
New Revision: 2199

Modified:
   trunk/src/host/qemu-neo1973/hw/neo1973.c
   trunk/src/host/qemu-neo1973/openmoko/env
   trunk/src/host/qemu-neo1973/openmoko/flash.sh
Log:
Move the default kernel load address 16 MB lower, to 0x31000000.  This incidentally fixes bug #598.
Enlarge the the u-boot partition default size.  (Recent u-boot and rootfs images grew significantly.)


Modified: trunk/src/host/qemu-neo1973/hw/neo1973.c
===================================================================
--- trunk/src/host/qemu-neo1973/hw/neo1973.c	2007-06-08 10:12:39 UTC (rev 2198)
+++ trunk/src/host/qemu-neo1973/hw/neo1973.c	2007-06-09 00:09:10 UTC (rev 2199)
@@ -360,7 +360,9 @@
 {
     s->modem = modem_init();
 
+#if 0
     s3c_uart_attach(s->cpu->uart[0], s->modem);
+#endif
 }
 
 static void neo_reset(void *opaque)
@@ -370,7 +372,7 @@
     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 + 0x02000000);
+    load_image(s->kernel, phys_ram_base + 0x01000000);
     s->cpu->env->regs[15] = S3C_RAM_BASE | 0x03f80000;
 #endif
 

Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env	2007-06-08 10:12:39 UTC (rev 2198)
+++ trunk/src/host/qemu-neo1973/openmoko/env	2007-06-09 00:09:10 UTC (rev 2199)
@@ -14,7 +14,7 @@
 which gecho && echo=gecho
 export make echo
 
-kernel_addr=0x32000000
+kernel_addr=0x31000000
 splash_addr=0x36000000
 splash_size=0x5000
 

Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh	2007-06-08 10:12:39 UTC (rev 2198)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh	2007-06-09 00:09:10 UTC (rev 2199)
@@ -106,7 +106,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:0x00030000(u-boot),0x00004000(u-boot_env),0x00208000(kernel),0x00010000(splash),0x039c4000(rootfs)
+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"