Skip to contentSkip to conversation

Add ARM S3C SOC core, drivers and boards

Qemu-devel In review Vincent Sanders 4 participants 23 messages May 6, 2009 – May 23, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

This is an updated series integrating the feedback from Paul Brook and Jean-Christophe plagniol-villard and rebased to current git head.

The following series adds Samsung S3C support to Qemu. The approach taken is to create a series of generic s3c24xx peripheral blocks and then to create a SOC device which collects a number of these generic blocks together.

The SOC device is then instansiated by the board driver and additional external peripherals added as appropriate.

Two actual SOC are currently implemented (however the generic peripherals are used throughout the entire Samsung range from S3C2400 to S3C6410) are the S3C2410 and S3C2440.

These two SOC were chosen as representative samples because they are two of the most popular ARM 9 class devices and have been used in many devices from handhelds to the openmoko phones.

These SOC also have extremely good Linux kernel support, a single default configuration covers 22 boards.

Only a pair of boards have been included in this series purely to demostrate the most basic intended usage of the implementation. A subsequent series will introduce all the omited peripherals for these boards.

This series is the smallest set of changes required to support these devices and is current against git head. The implementation of some peripheral blocks although not complete is sufficient to successfully run Linux kernels. Improved peripheral support is envisaged after the core support is merged.

#1 lore raw

PATCH 1/15 Add ARM 920T CPU identifier

Add the CPU Identifier required for ARM 920T cpu cores

---
 target-arm/cpu.h    |    1 +
 target-arm/helper.c |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)
target-arm/cpu.h +1 -0
index f98655f..eafaeaf 100644
@@ -370,6 +370,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum,
 #define ARM_CPUID_ARM1026     0x4106a262
 #define ARM_CPUID_ARM926      0x41069265
 #define ARM_CPUID_ARM946      0x41059461
+#define ARM_CPUID_ARM920T     0x41129200
 #define ARM_CPUID_TI915T      0x54029152
 #define ARM_CPUID_TI925T      0x54029252
 #define ARM_CPUID_PXA250      0x69052100
target-arm/helper.c +5 -0
index 701629a..2b05d15 100644
@@ -37,6 +37,10 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
 {
     env->cp15.c0_cpuid = id;
     switch (id) {
+    case ARM_CPUID_ARM920T:
+        env->cp15.c0_cachetype = 0x0d172172;
+        env->cp15.c1_sys = 0x00000078;
+        break;
     case ARM_CPUID_ARM926:
         set_feature(env, ARM_FEATURE_VFP);
         env->vfp.xregs[ARM_VFP_FPSID] = 0x41011090;
@@ -277,6 +281,7 @@ struct arm_cpu_t {
 };
 
 static const struct arm_cpu_t arm_cpu_names[] = {
+    { ARM_CPUID_ARM920T, "arm920t"},
     { ARM_CPUID_ARM926, "arm926"},
     { ARM_CPUID_ARM946, "arm946"},
     { ARM_CPUID_ARM1026, "arm1026"},
Signature · 1 line
1.5.4.3
#2 lore raw

PATCH 2/15 S3C system on chip integrated peripheral device state header

In reply to Vincent Sanders
---
 hw/s3c24xx.h |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 0 deletions(-)
 create mode 100644 hw/s3c24xx.h
hw/s3c24xx.h new file +73 -0
new file mode 100644
index 0000000..38d4a32
@@ -0,0 +1,73 @@
+/* hw/s3c24xx.h
+ *
+ * Samsung s3c24xx cpu state and functions.
+ *
+ * Copyright 2006, 2007, 2008 Daniel Silverstone and Vincent Sanders
+ *
+ * This file is under the terms of the GNU General Public
+ * License Version 2.
+ */
+
+#ifndef S3C24XX_H
+#define S3C24XX_H 1
+
+/* This structure type encapsulates the state of a S3C24XX SoC. */
+typedef struct S3CState_s {
+    CPUState *cpu_env;
+    qemu_irq *irqs;
+    qemu_irq *eirqs;
+
+    /* Memory controller */
+    uint32_t memc_reg[13];
+
+    /* Interrupt controller */
+    uint32_t irq_main_level, irq_subsrc_level;
+    uint32_t irq_reg[8];
+
+    /* Clock controller */
+    uint32_t clkcon_reg[6];
+
+    uint32_t tclk0; /* first timer clock source frequency */
+    uint32_t tclk1; /* second timer clock source frequency */
+
+    /* GPIO block */
+    uint32_t gpio_reg[47];
+
+    /* Realtime clock */
+    uint8_t rtc_reg[19];
+
+    /* i2c */
+    struct s3c24xx_i2c_state_s *iic;
+    
+    /* Timers, (Specifically timer4) */
+    uint32_t timers_reg[17];
+    QEMUTimer *timer4;
+    uint32_t timer4_reload_value;
+    int64_t timer4_last_ticked;
+
+    /* LCD controller */
+    struct s3c24xx_lcd_state_s *lcd;
+
+    /* NAND controller, and chip attached */
+    uint32_t nand_reg[5];
+    struct nand_flash_s *nand_chip;
+} S3CState;
+
+/* Internal functions for s3c24xx implementation */
+void s3c24xx_memc_init(S3CState *soc, target_phys_addr_t base_addr);
+qemu_irq *s3c24xx_irq_init(S3CState *soc, target_phys_addr_t base_addr);
+void s3c24xx_clkcon_init(S3CState *soc, target_phys_addr_t base_addr);
+void s3c24xx_timers_init(S3CState *soc, target_phys_addr_t base_addr);
+void s3c24xx_serial_init(S3CState *soc, int port, target_phys_addr_t base_addr);
+void s3c24xx_rtc_init(S3CState *soc, target_phys_addr_t base_addr);
+void s3c24xx_gpio_init(S3CState *soc, target_phys_addr_t base_addr,uint32_t cpu_id );
+void s3c24xx_iic_init(S3CState *soc, target_phys_addr_t base_addr);
+struct s3c24xx_lcd_state_s *s3c24xx_lcd_init(target_phys_addr_t base, qemu_irq irq);
+void s3c24xx_nand_init(S3CState *soc, target_phys_addr_t base_addr);
+
+/* attach a NAND device to the s3c24xx controller */
+void s3c24xx_nand_attach(S3CState *soc, struct nand_flash_s *nand_chip);
+
+i2c_bus *s3c24xx_i2c_bus(struct s3c24xx_i2c_state_s *s);
+
+#endif /* S3C24XX_H */
Signature · 1 line
1.5.4.3
#3 lore raw

Re: [Qemu-devel] [PATCH 02/15] S3C system on chip integrated peripheral device state header

hw/s3c24xx.h line 43

Quoted 13 lines
hw/s3c24xx.h new file +13 -0
+    uint32_t tclk1; /* second timer clock source frequency */
+
+    /* GPIO block */
+    uint32_t gpio_reg[47];
+
+    /* Realtime clock */
+    uint8_t rtc_reg[19];
+
+    /* i2c */
+    struct s3c24xx_i2c_state_s *iic;
+    
+    /* Timers, (Specifically timer4) */
+    uint32_t timers_reg[17];

it will be better to define a struct with the timers_reg content same with the other arry

hw/s3c24xx.h line 54

Quoted 11 lines
hw/s3c24xx.h new file +11 -0
+    QEMUTimer *timer4;
+    uint32_t timer4_reload_value;
+    int64_t timer4_last_ticked;
+
+    /* LCD controller */
+    struct s3c24xx_lcd_state_s *lcd;
+
+    /* NAND controller, and chip attached */
+    uint32_t nand_reg[5];
+    struct nand_flash_s *nand_chip;
+} S3CState;

Best Regards,
J.

#4 lore raw

Re: [Qemu-devel] [PATCH 02/15] S3C system on chip integrated peripheral device state header

Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 7 lines
hw/s3c24xx.h new file +7 -0
+    uint32_t tclk1; /* second timer clock source frequency */
+
+    /* GPIO block */
+    uint32_t gpio_reg[47];
+
+    /* Realtime clock */
+    uint8_t rtc_reg[19];
Quoted 8 lines

hw/s3c24xx.h line 43

Quoted 6 lines
hw/s3c24xx.h new file +6 -0
+
+    /* i2c */
+    struct s3c24xx_i2c_state_s *iic;
+    
+    /* Timers, (Specifically timer4) */
+    uint32_t timers_reg[17];

it will be better to define a struct with the timers_reg content same with the other arry

I had a good hard look at this and decided you were right. I have restructured all the SOC devices to be completely self contained. I just posted the new series against git head, it looks a fair bit neater.

Signature · 2 lines
Regards Vincent
http://www.kyllikki.org/
#5 lore raw

PATCH 3/15 Peripheral driver for S3C SOC SDRAM controller.

In reply to Vincent Sanders
---
 Makefile.target   |    1 +
 hw/s3c24xx_memc.c |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 hw/s3c24xx_memc.c
Makefile.target +1 -0
index f735105..c5e6402 100644
@@ -674,6 +674,7 @@ OBJS+= omap_sx1.o palm.o tsc210x.o
 OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
+OBJS+= s3c24xx_memc.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_memc.c new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#6 lore raw

PATCH 4/15 Peripheral driver for S3C SOC IRQ controller.

In reply to Vincent Sanders
---
 Makefile.target  |    2 +-
 hw/s3c24xx_irq.c |  200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_irq.c
Makefile.target +1 -1
index c5e6402..9d6d5fd 100644
@@ -674,7 +674,7 @@ OBJS+= omap_sx1.o palm.o tsc210x.o
 OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
-OBJS+= s3c24xx_memc.o
+OBJS+= s3c24xx_memc.o s3c24xx_irq.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_irq.c new file +200 -0

200 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#7 lore raw

PATCH 5/15 Peripheral driver for S3C SOC clock control.

In reply to Vincent Sanders
---
 Makefile.target     |    2 +-
 hw/s3c24xx_clkcon.c |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_clkcon.c
Makefile.target +1 -1
index 9d6d5fd..f5594fb 100644
@@ -674,7 +674,7 @@ OBJS+= omap_sx1.o palm.o tsc210x.o
 OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
-OBJS+= s3c24xx_memc.o s3c24xx_irq.o
+OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_clkcon.c new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#8 lore raw

PATCH 6/15 Peripheral driver for S3C SOC timers.

In reply to Vincent Sanders
---
 Makefile.target     |    2 +-
 hw/s3c24xx_timers.c |  136 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_timers.c
Makefile.target +1 -1
index f5594fb..2b35da7 100644
@@ -674,7 +674,7 @@ OBJS+= omap_sx1.o palm.o tsc210x.o
 OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
-OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o
+OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_timers.c new file +136 -0

136 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#9 lore raw

PATCH 7/15 Peripheral driver for S3C SOC Serial ports.

In reply to Vincent Sanders
---
 Makefile.target     |    1 +
 hw/s3c24xx_serial.c |  266 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 267 insertions(+), 0 deletions(-)
 create mode 100644 hw/s3c24xx_serial.c
Makefile.target +1 -0
index 2b35da7..679c9e7 100644
@@ -675,6 +675,7 @@ OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
+OBJS+= s3c24xx_serial.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_serial.c new file +266 -0

266 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#10 lore raw

PATCH 8/15 Peripheral driver for S3C SOC real time clock.

In reply to Vincent Sanders
---
 Makefile.target  |    2 +-
 hw/s3c24xx_rtc.c |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_rtc.c
Makefile.target +1 -1
index 679c9e7..02bb9f1 100644
@@ -675,7 +675,7 @@ OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
-OBJS+= s3c24xx_serial.o
+OBJS+= s3c24xx_serial.o s3c24xx_rtc.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_rtc.c new file +123 -0

123 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#11 lore raw

PATCH 9/15 Peripheral driver for S3C SOC general purpose I/O

In reply to Vincent Sanders
---
 Makefile.target   |    2 +-
 hw/s3c24xx_gpio.c |  190 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_gpio.c
Makefile.target +1 -1
index 02bb9f1..d869171 100644
@@ -675,7 +675,7 @@ OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
-OBJS+= s3c24xx_serial.o s3c24xx_rtc.o
+OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_gpio.c new file +190 -0

190 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#12 lore raw

PATCH 10/15 Peripheral driver for S3C SOC I2C controller.

In reply to Vincent Sanders
---
 Makefile.target  |    2 +-
 hw/s3c24xx_iic.c |  321 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 322 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_iic.c
Makefile.target +1 -1
index d869171..4cf323b 100644
@@ -675,7 +675,7 @@ OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
-OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o
+OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_iic.c new file +321 -0

321 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#13 lore raw

PATCH 11/15 Peripheral driver for S3C SOC LCD controller

In reply to Vincent Sanders
---
 Makefile.target       |    1 +
 hw/s3c24xx_lcd.c      |  560 +++++++++++++++++++++++++++++++++++++++++++++++++
 hw/s3c24xx_template.h |  266 +++++++++++++++++++++++
 3 files changed, 827 insertions(+), 0 deletions(-)
 create mode 100644 hw/s3c24xx_lcd.c
 create mode 100644 hw/s3c24xx_template.h
Makefile.target +1 -0
index 4cf323b..b5dae70 100644
@@ -676,6 +676,7 @@ OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
+OBJS+= s3c24xx_lcd.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_lcd.c new file +560 -0

560 lines not on this page · raw message

hw/s3c24xx_template.h new file +266 -0

266 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#14 lore raw

PATCH 12/15 Peripheral driver for S3C SOC NAND controller

In reply to Vincent Sanders
---
 Makefile.target   |    2 +-
 hw/s3c24xx_nand.c |  136 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c24xx_nand.c
Makefile.target +1 -1
index b5dae70..67226cc 100644
@@ -676,7 +676,7 @@ OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
-OBJS+= s3c24xx_lcd.o
+OBJS+= s3c24xx_lcd.o s3c24xx_nand.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c24xx_nand.c new file +136 -0

136 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#15 lore raw

PATCH 13/15 S3C2410 SOC implementation using S3C peripheral blocks.

In reply to Vincent Sanders
---
 Makefile.target |    1 +
 hw/s3c2410x.c   |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/s3c2410x.h   |   30 ++++++++++++++
 3 files changed, 148 insertions(+), 0 deletions(-)
 create mode 100644 hw/s3c2410x.c
 create mode 100644 hw/s3c2410x.h
Makefile.target +1 -0
index 67226cc..4384d8c 100644
@@ -677,6 +677,7 @@ OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
 OBJS+= s3c24xx_lcd.o s3c24xx_nand.o
+OBJS+= s3c2410x.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c2410x.c new file +117 -0

117 lines not on this page · raw message

hw/s3c2410x.h new file +30 -0
new file mode 100644
index 0000000..ca68cd1
@@ -0,0 +1,30 @@
+/* hw/s3c2410x.h
+ *
+ * Samsung s3c2410x cpu register definitions
+ *
+ * Copyright 2006, 2007, 2008 Daniel Silverstone and Vincent Sanders
+ *
+ * This file is under the terms of the GNU General Public
+ * License Version 2.
+ */
+
+#ifndef S3C2410X_H
+#define S3C2410X_H 1
+
+#include "s3c24xx.h"
+
+/* S3C2410 Physical memory areas */
+
+/* Chip select 0 */
+#define CPU_S3C2410X_CS0 (0x00000000)
+#define CPU_S3C2410X_CS1 (0x08000000)
+#define CPU_S3C2410X_CS2 (0x10000000)
+#define CPU_S3C2410X_CS3 (0x18000000)
+#define CPU_S3C2410X_CS4 (0x20000000)
+#define CPU_S3C2410X_CS5 (0x28000000)
+#define CPU_S3C2410X_RAM (0x30000000)
+
+/* s3c2410 SOC initialisation */
+S3CState *s3c2410x_init(int sdram_size);
+
+#endif /* S3C2410X_H */
Signature · 1 line
1.5.4.3
#16 lore raw

PATCH 14/15 S3C2440 Implementation using S3C periperals.

In reply to Vincent Sanders
---
 Makefile.target |    2 +-
 hw/s3c2440x.c   |  116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/s3c2440x.h   |   30 ++++++++++++++
 3 files changed, 147 insertions(+), 1 deletions(-)
 create mode 100644 hw/s3c2440x.c
 create mode 100644 hw/s3c2440x.h
Makefile.target +1 -1
index 4384d8c..b8074ad 100644
@@ -677,7 +677,7 @@ OBJS+= musicpal.o pflash_cfi02.o
 OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
 OBJS+= s3c24xx_lcd.o s3c24xx_nand.o
-OBJS+= s3c2410x.o
+OBJS+= s3c2410x.o s3c2440x.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/s3c2440x.c new file +116 -0

116 lines not on this page · raw message

hw/s3c2440x.h new file +30 -0
new file mode 100644
index 0000000..86191aa
@@ -0,0 +1,30 @@
+/* hw/s3c2440x.h
+ *
+ * Samsung s3c2440x cpu register definitions
+ *
+ * Copyright 2006, 2007, 2008 Daniel Silverstone and Vincent Sanders
+ *
+ * This file is under the terms of the GNU General Public
+ * License Version 2.
+ */
+
+#ifndef S3C2440X_H
+#define S3C2440X_H 1
+
+#include "s3c24xx.h"
+
+/* S3C2440 Physical memory areas */
+
+/* Chip select 0 */
+#define CPU_S3C2440X_CS0 (0x00000000)
+#define CPU_S3C2440X_CS1 (0x08000000)
+#define CPU_S3C2440X_CS2 (0x10000000)
+#define CPU_S3C2440X_CS3 (0x18000000)
+#define CPU_S3C2440X_CS4 (0x20000000)
+#define CPU_S3C2440X_CS5 (0x28000000)
+#define CPU_S3C2440X_RAM (0x30000000)
+
+/* s3c2440 SOC initialisation */
+S3CState *s3c2440x_init(int sdram_size);
+
+#endif /* S3C2440X_H */
Signature · 1 line
1.5.4.3
#17 lore raw

PATCH 15/15 Add bast and smdk2410 boards which use S3C2410 SOC

In reply to Vincent Sanders
---
 Makefile.target      |    1 +
 hw/bast.c            |  187 ++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/boards.h          |    6 ++
 hw/smdk2410.c        |  120 ++++++++++++++++++++++++++++++++
 target-arm/machine.c |    2 +
 5 files changed, 316 insertions(+), 0 deletions(-)
 create mode 100644 hw/bast.c
 create mode 100644 hw/smdk2410.c
Makefile.target +1 -0
index b8074ad..e6f74b3 100644
@@ -678,6 +678,7 @@ OBJS+= s3c24xx_memc.o s3c24xx_irq.o s3c24xx_clkcon.o s3c24xx_timers.o
 OBJS+= s3c24xx_serial.o s3c24xx_rtc.o s3c24xx_gpio.o s3c24xx_iic.o
 OBJS+= s3c24xx_lcd.o s3c24xx_nand.o
 OBJS+= s3c2410x.o s3c2440x.o
+OBJS+= bast.o smdk2410.o
 OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
hw/bast.c new file +187 -0

187 lines not on this page · raw message

hw/boards.h +6 -0
index 5611d2c..327b2b5 100644
@@ -128,4 +128,10 @@ extern QEMUMachine musicpal_machine;
 /* tosa.c */
 extern QEMUMachine tosapda_machine;
 
+/* bast.c */
+extern QEMUMachine bast_machine;
+
+/* smdk2410.c */
+extern QEMUMachine smdk2410_machine;
+
 #endif
hw/smdk2410.c new file +120 -0

120 lines not on this page · raw message

target-arm/machine.c +2 -0
index 323bace..ed97185 100644
@@ -7,6 +7,8 @@ void register_machines(void)
     qemu_register_machine(&versatilepb_machine);
     qemu_register_machine(&versatileab_machine);
     qemu_register_machine(&realview_machine);
+    qemu_register_machine(&bast_machine);
+    qemu_register_machine(&smdk2410_machine);
     qemu_register_machine(&akitapda_machine);
     qemu_register_machine(&spitzpda_machine);
     qemu_register_machine(&borzoipda_machine);
Signature · 1 line
1.5.4.3
#19 lore raw

Re: [Qemu-devel] [PATCH 15/15] Add bast and smdk2410 boards which use S3C2410 SOC

Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Vincent Sanders

---

tks for the pflash support forhe bast
is it possible to have the same on the smdk2410?

IIRC there is a 8Mib

I would, of course, be happy to accomodate. However I dont have data on where the writable flash copy is mapped.

The s3c2410 chip select 0 (where the NOR is booted from) has no write line so a second writable mapping is required (hence the second mapping on the bast).

It may turn out the flash cannot be reprogramed with the CPU and the external JTAG boundry scan must be used. If this is the case it really is a ROM mapping from an emulation POV.

If anyone can provide information on if/where the smdk2410 writable flash area is I will gladly add it.

Quoted 5 lines

Best Regards,
J.

Signature · 2 lines
Regards Vincent
http://www.kyllikki.org/
#20 lore raw

Re: [Qemu-devel] [PATCH 15/15] Add bast and smdk2410 boards which use S3C2410 SOC

Quoted 16 lines · Vincent Sanders
Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Vincent Sanders

---

tks for the pflash support forhe bast
is it possible to have the same on the smdk2410?

IIRC there is a 8Mib

I would, of course, be happy to accomodate. However I dont have data on where the writable flash copy is mapped.

The s3c2410 chip select 0 (where the NOR is booted from) has no write line so a second writable mapping is required (hence the second mapping on the bast).

Quoted 6 lines

It may turn out the flash cannot be reprogramed with the CPU and the external JTAG boundry scan must be used. If this is the case it really is a ROM mapping from an emulation POV.

If anyone can provide information on if/where the smdk2410 writable flash area is I will gladly add it.

Based on u-boot code
there is 2 version of the boards one with a 8Mbit AMD flash
and an other one with a 4Mbit AMD flash

map at 0x00000000
and writeable as the u-boot env is stored at 0xF0000 and 0x70000

Ben could maybe confirm us

Best Regards,
J.

#21 lore raw

Re: [Qemu-devel] [PATCH 15/15] Add bast and smdk2410 boards which use S3C2410 SOC

Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 4 lines · Vincent Sanders
Quoted 3 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Vincent Sanders

---

Quoted 7 lines
Quoted 7 lines
Quoted 4 lines

tks for the pflash support forhe bast
is it possible to have the same on the smdk2410?

IIRC there is a 8Mib

I would, of course, be happy to accomodate. However I dont have data on where the writable flash copy is mapped.

I've not seen anything in the UBoot sources, and having looked at the schematic there is an link option to change the ROM nCS from nGCS0 to nGCS1. However looking at the uboot sources it seems to only use the nGCS0 addressing.

Quoted 15 lines
Quoted 10 lines

The s3c2410 chip select 0 (where the NOR is booted from) has no write line so a second writable mapping is required (hence the second mapping on the bast).

It may turn out the flash cannot be reprogramed with the CPU and the external JTAG boundry scan must be used. If this is the case it really is a ROM mapping from an emulation POV.

If anyone can provide information on if/where the smdk2410 writable flash area is I will gladly add it.

Based on u-boot code
there is 2 version of the boards one with a 8Mbit AMD flash
and an other one with a 4Mbit AMD flash

Quoted 4 lines

map at 0x00000000
and writeable as the u-boot env is stored at 0xF0000 and 0x70000

Ben could maybe confirm us

The manual says that nGCS0 is read-only, but unfortunately I've not got an SMDK2410 available to verify that the manual is correct in this respect. I might still have a board with an S3C2410 on to see if this can be reproduced by experimentation over the weekend.

Quoted 2 lines

Best Regards,
J.

Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#22 lore raw
In reply to Vincent Sanders

Its been over a week since I posted this series. I know everyones busy but I was wondering what I need to do to progress the inclusion of this series?

I have addressed all the issues raised previously, and this series is now three years old and I would like to see it on the road to being merged.

Signature · 1 line
Regards Vincent