From: Michel Pollet <buserror@gmail.com>
Date: Wed, 20 May 2009 13:22:53 +0000 (+0100)
Subject: Merge commit 'origin/master' into dev-mini2440-stable
X-Git-Url: https://repo.or.cz/w/qemu/mini2440.git/commitdiff_plain/34a7481dcf55ef85384929ada05c0c81b509cb8c

Merge commit 'origin/master' into dev-mini2440-stable

Conflicts:
	Makefile.target
	hw/boards.h
	hw/flash.h
	target-arm/machine.c
---

34a7481dcf55ef85384929ada05c0c81b509cb8c
diff --cc Makefile.target
index 65b4873960,60dcf307e6..50dc60a115
--- a/Makefile.target
+++ b/Makefile.target
@@@ -666,9 -653,9 +653,12 @@@ OBJS+= nseries.o blizzard.o onenand.o v
  OBJS+= mst_fpga.o mainstone.o
  OBJS+= musicpal.o pflash_cfi02.o
  OBJS+= framebuffer.o
 +OBJS+= s3c2410.o s3c24xx_gpio.o s3c24xx_lcd.o s3c24xx_mmci.o s3c24xx_rtc.o s3c24xx_udc.o s3c2410_nand.o s3c2440_nand.o  
 +OBJS+= dm9000.o eeprom24c0x.o
 +OBJS+= mini2440.o
+ OBJS+= syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
+ OBJS+= syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
+ OBJS+= syborg_virtio.o
  CPPFLAGS += -DHAS_AUDIO
  endif
  ifeq ($(TARGET_BASE_ARCH), sh4)
diff --cc hw/boards.h
index bcf7e0450d,9a99a851d0..1845c1c431
--- a/hw/boards.h
+++ b/hw/boards.h
@@@ -128,6 -128,7 +128,10 @@@ extern QEMUMachine musicpal_machine
  /* tosa.c */
  extern QEMUMachine tosapda_machine;
  
++/* mini2440.c */
 +extern QEMUMachine mini2440_machine;
 +
+ /* syborg.c */
+ extern QEMUMachine syborg_machine;
+ 
  #endif
diff --cc hw/flash.h
index 29053e8427,69aef8ce29..c274d0e45b
--- a/hw/flash.h
+++ b/hw/flash.h
@@@ -17,15 -17,14 +17,15 @@@ pflash_t *pflash_cfi02_register(target_
                                  uint16_t unlock_addr0, uint16_t unlock_addr1);
  
  /* nand.c */
- struct nand_flash_s;
- struct nand_flash_s *nand_init(int manf_id, int chip_id);
- void nand_done(struct nand_flash_s *s);
- void nand_setpins(struct nand_flash_s *s,
+ typedef struct NANDFlashState NANDFlashState;
+ NANDFlashState *nand_init(int manf_id, int chip_id);
+ void nand_done(NANDFlashState *s);
+ void nand_setpins(NANDFlashState *s,
                  int cle, int ale, int ce, int wp, int gnd);
- void nand_getpins(struct nand_flash_s *s, int *rb);
- void nand_setio(struct nand_flash_s *s, uint8_t value);
- uint8_t nand_getio(struct nand_flash_s *s);
- uint32_t nand_readraw(struct nand_flash_s *s, uint32_t offset, void * dst, uint32_t length);
+ void nand_getpins(NANDFlashState *s, int *rb);
+ void nand_setio(NANDFlashState *s, uint8_t value);
+ uint8_t nand_getio(NANDFlashState *s);
++uint32_t nand_readraw(NANDFlashState *s, uint32_t offset, void * dst, uint32_t length);
  
  #define NAND_MFR_TOSHIBA	0x98
  #define NAND_MFR_SAMSUNG	0xec
diff --cc target-arm/machine.c
index 98c96a8da8,d5a49141ae..30b5ed97ae
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@@ -23,7 -23,7 +23,8 @@@ void register_machines(void
      qemu_register_machine(&mainstone2_machine);
      qemu_register_machine(&musicpal_machine);
      qemu_register_machine(&tosapda_machine);
 +    qemu_register_machine(&mini2440_machine);
+     qemu_register_machine(&syborg_machine);
  }
  
  void cpu_save(QEMUFile *f, void *opaque)