Copy changes from sg2000 branch to sg2000a

lupyuen2 · Jun 16, 2024 · fa9e319 · fa9e319
1 parent 8225b76
commit fa9e319
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 1,053 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,8 @@ tools/gdb/__pycache__
 /build
 .ccls-cache
 compile_commands.json
+Image
+initrd
+root-riscv64.cfg
+hello.S
+init.S
diff --git a/arch/risc-v/src/sg2000/Make.defs b/arch/risc-v/src/sg2000/Make.defs
@@ -27,4 +27,4 @@ HEAD_ASRC = sg2000_head.S
 # Specify our C code within this directory to be included
 CHIP_CSRCS  = sg2000_start.c sg2000_irq_dispatch.c sg2000_irq.c
 CHIP_CSRCS += sg2000_timerisr.c sg2000_allocateheap.c
-CHIP_CSRCS += sg2000_mm_init.c sg2000_pgalloc.c sg2000_serial.c
+CHIP_CSRCS += sg2000_mm_init.c sg2000_pgalloc.c
diff --git a/arch/risc-v/src/sg2000/hardware/sg2000_memorymap.h b/arch/risc-v/src/sg2000/hardware/sg2000_memorymap.h
@@ -27,7 +27,6 @@
 
 /* Register Base Address ****************************************************/
 
-#define SG2000_UART3_BASE   0x30002000ul
-#define SG2000_PLIC_BASE    0xe0000000ul
+#define SG2000_PLIC_BASE    0x70000000ul
 
 #endif /* __ARCH_RISCV_SRC_SG2000_HARDWARE_SG2000_MEMORYMAP_H */
diff --git a/arch/risc-v/src/sg2000/hardware/sg2000_uart.h b/arch/risc-v/src/sg2000/hardware/sg2000_uart.h
diff --git a/arch/risc-v/src/sg2000/sg2000_mm_init.c b/arch/risc-v/src/sg2000/sg2000_mm_init.c
@@ -52,7 +52,7 @@
 #define MMU_IO_BASE      (0x00000000ul)
 #define MMU_IO_SIZE      (0x40000000ul)
 
-#define MMU_INT_BASE     (0xe0000000ul)
+#define MMU_INT_BASE     (0x70000000ul)
 #define MMU_INT_SIZE     (0x10000000ul)
 
 /* Physical and virtual addresses to page tables (vaddr = paddr mapping) */