[Hackndev-commit] SF.net SVN: hackndev: [1061] qemu/trunk

[<bob...@us...>]

Revision: 1061
          http://svn.sourceforge.net/hackndev/?rev=1061&view=rev
Author:   bobofdoom
Date:     2007-06-23 22:00:46 -0700 (Sat, 23 Jun 2007)

Log Message:
-----------
qemu: Boot from kernel image by default.

Modified Paths:
--------------
    qemu/trunk/Makefile.target
    qemu/trunk/hw/palm.c

Modified: qemu/trunk/Makefile.target
===================================================================
--- qemu/trunk/Makefile.target	2007-06-24 04:43:53 UTC (rev 1060)
+++ qemu/trunk/Makefile.target	2007-06-24 05:00:46 UTC (rev 1061)
@@ -469,9 +469,10 @@
 VL_OBJS+= arm-semi.o
 VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
 VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o max111x.o max7310.o
+VL_OBJS+= palm.o mdoc.o
 VL_OBJS+= spitz.o ads7846.o ide.o serial.o nand.o $(AUDIODRV) wm8750.o wm8753.o
 VL_OBJS+= s3c2410.o s3c24xx_gpio.o s3c24xx_lcd.o s3c24xx_mmci.o s3c24xx_rtc.o
-VL_OBJS+= s3c24xx_udc.o neo1973.o pcf5060x.o jbt6k74.o palm.o
+VL_OBJS+= s3c24xx_udc.o neo1973.o pcf5060x.o jbt6k74.o 
 VL_OBJS+= $(GSM_OBJS) modem.o
 CPPFLAGS+= -DHAS_AUDIO $(GSM_CPPFLAGS)
 endif

Modified: qemu/trunk/hw/palm.c
===================================================================
--- qemu/trunk/hw/palm.c	2007-06-24 04:43:53 UTC (rev 1060)
+++ qemu/trunk/hw/palm.c	2007-06-24 05:00:46 UTC (rev 1061)
@@ -1003,16 +1003,16 @@
     ld_gpio_setup(cpu); // FIXME: write t650 gpio func
 
     /* Setup initial (reset) machine state */
-    cpu->env->regs[15] = 0;
-    //cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+    //cpu->env->regs[15] = 0;
+    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
     
     //mdoc_init();
 
     //memset(phys_ram_base + t650_ram, 0, t650_rom);
     //load_image("palmt650.rom", phys_ram_base + t650_ram);
 
-    //arm_load_kernel(cpu->env, t650_ram, kernel_filename, kernel_cmdline,
-    //                initrd_filename, 909, PXA2XX_SDRAM_BASE);
+    arm_load_kernel(cpu->env, t650_ram, kernel_filename, kernel_cmdline,
+                    initrd_filename, 909, PXA2XX_SDRAM_BASE);
  
 }
 
@@ -1053,16 +1053,16 @@
     t680_gpio_setup(cpu);
 
     /* Setup initial (reset) machine state */
-    cpu->env->regs[15] = 0;
-    //cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+    //cpu->env->regs[15] = 0;
+    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
     
     //mdoc_init();
 
     memset(phys_ram_base + t680_ram, 0, t680_rom);
-    load_image("../../BOOTROM/palmt680.rom", phys_ram_base + t680_ram);
+    //load_image("../../BOOTROM/palmt680.rom", phys_ram_base + t680_ram);
 
-    //arm_load_kernel(cpu->env, t680_ram, kernel_filename, kernel_cmdline,
-    //                initrd_filename, 909, PXA2XX_SDRAM_BASE);
+    arm_load_kernel(cpu->env, t680_ram, kernel_filename, kernel_cmdline,
+                    initrd_filename, 909, PXA2XX_SDRAM_BASE);
  
 }
 
@@ -1102,14 +1102,14 @@
 
     /* Setup initial (reset) machine state */
     cpu->env->regs[15] = 0;
-//    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
 
     memset(phys_ram_base, 0, tc_ram);
     memset(phys_ram_base + tc_ram, 0, tc_rom);
-    load_image("../../BOOTROM/palmtc.rom", phys_ram_base + tc_ram);
+    //load_image("../../BOOTROM/palmtc.rom", phys_ram_base + tc_ram);
 
-//    arm_load_kernel(cpu->env, tc_ram, kernel_filename, kernel_cmdline,
-//            initrd_filename, 918 /* THIS IS ARM_ID!! */ //, PXA2XX_SDRAM_BASE);
+    arm_load_kernel(cpu->env, tc_ram, kernel_filename, kernel_cmdline,
+            initrd_filename, 918 /* THIS IS ARM_ID!! */ , PXA2XX_SDRAM_BASE);
  
 }
 
@@ -1152,12 +1152,12 @@
     z72_gpio_setup(cpu);
 
     /* Setup initial (reset) machine state */
-    cpu->env->regs[15] = 0;
-//    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+//    cpu->env->regs[15] = 0;
+    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
 
     memset(phys_ram_base, 0, z72_ram);
     memset(phys_ram_base + z72_ram, 0, z72_rom);
-    load_image("../../BOOTROM/palmz72.rom", phys_ram_base + z72_ram);
+//    load_image("../../BOOTROM/palmz72.rom", phys_ram_base + z72_ram);
 
     arm_load_kernel(cpu->env, z72_ram, kernel_filename, kernel_cmdline,
                     initrd_filename, 904, PXA2XX_SDRAM_BASE);
@@ -1203,13 +1203,13 @@
     tx_gpio_setup(cpu);
 
     /* Setup initial (reset) machine state */
-    cpu->env->regs[15] = 0;
-//    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
+//    cpu->env->regs[15] = 0;
+    cpu->env->regs[15] = PXA2XX_SDRAM_BASE;
 
     memset(phys_ram_base, 0, tx_ram);
     memset(phys_ram_base + tx_ram, 0, tx_rom);
-    load_image("../../BOOTROM/palmtx.rom", phys_ram_base + tx_ram);
-
+//    load_image("../../BOOTROM/palmtx.rom", phys_ram_base + tx_ram);
+//
     arm_load_kernel(cpu->env, tx_ram, kernel_filename, kernel_cmdline,
                     initrd_filename, 885, PXA2XX_SDRAM_BASE);
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.