system_init: e310 updated

conke · conke · commit b2533e3e7734 · 2020-08-04T18:27:29.000+08:00
Signed-off-by: Conke Hu &lt;conke.hu@maxwit.com&gt;
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -1,3 +1 @@
 obj-y = head.o cpuid.o
-
-PHONY += head.S
diff --git a/arch/arm/head.S b/arch/arm/head.S
@@ -42,8 +42,11 @@ handle_reset:
 #endif
 
 	bl   system_init
+	cmp  r0, #0
+	bne  hang
 
 	bl   main
+
 	b    hang
 
 #if 1
diff --git a/arch/risc-v/cpuid.c b/arch/risc-v/cpuid.c
@@ -1,4 +1,6 @@
 unsigned long read_cpu_id(void)
 {
-    return 0;
+    extern unsigned long __stack_base;
+
+    return __stack_base;
 }
diff --git a/arch/risc-v/head.S b/arch/risc-v/head.S
@@ -2,19 +2,14 @@
 	.globl _start
 
 _start:
-	li a0, 0x10012000
+	lw   sp, stack_base
 
-	lw a1, 8(a0)
-	ori a1, a1, 1 << 5
-	sw a1, 8(a0)
+	call system_init
 
-	lw a1, 0xc(a0)
-	ori a1, a1, 1 << 5
-	sw a1, 0xc(a0)
-
-	li sp, 0x80010000
 	call main
-	j hang
 
 hang:
 	j hang
+
+stack_base:
+	.word __stack_base
diff --git a/board/e310/Makefile b/board/e310/Makefile
@@ -1 +1 @@
-obj-y = gpio.o
+obj-y = led.o
diff --git a/board/e310/gpio.c b/board/e310/gpio.c
diff --git a/board/e310/led.c b/board/e310/led.c
@@ -0,0 +1,24 @@
+#include <types.h>
+#include <init.h>
+
+// TODO: move to reg.h
+#define E310_GPIO_BASE 0x10012000
+
+struct e310_gpio {
+    __u32 input_val;
+    __u32 input_en;
+    __u32 output_en;
+    __u32 output_val;
+};
+
+static int __init redv_led_on()
+{
+    volatile struct e310_gpio *gpio = (struct e310_gpio *)E310_GPIO_BASE;
+    
+    gpio->output_en  |= 1 << CONFIG_GPIO_LED;
+    gpio->output_val |= 1 << CONFIG_GPIO_LED;
+
+    return 0;
+}
+
+arch_init(redv_led_on);
diff --git a/build/configs/armvirt_defconfig b/build/configs/armvirt_defconfig
@@ -5,6 +5,7 @@ CONFIG_PLAT = armvirt
 CONFIG_ARCH_VER = armv6k
 
 CONFIG_DEBUG = y
+CONFIG_VERBOSE = y
 
 CONFIG_UART = y
 CONFIG_ARMVIRT_UART = y
diff --git a/build/configs/e310_defconfig b/build/configs/e310_defconfig
@@ -2,6 +2,8 @@ CONFIG_ARCH = risc-v
 CONFIG_ARCH_VER = rv32imac
 CONFIG_PLAT = e310
 
+CONFIG_GPIO_LED = 5
+
 CONFIG_DEFAULT_LOADER = LM_NAND
 
 CONFIG_DEBUG = y
diff --git a/core/Makefile b/core/Makefile
@@ -3,3 +3,5 @@ obj-y = init.o
 obj-$(CONFIG_NAND) += nand_loader.o
 obj-$(CONFIG_KERMIT) += kermit_loader.o
 obj-$(CONFIG_YMODEM) += ymodem_loader.o
+
+PHONY += init.c
diff --git a/lib/stdio.c b/lib/stdio.c
@@ -2,16 +2,16 @@
 
 #define BUF_LEN 32 // FIXME
 
-// __WEAK__ void __io_putchar(char ch)
-// {
-// #ifdef CONFIG_UART
-// 	uart_send_byte(ch);
-// 	// if ('\n' == ch)
-// 	// 	uart_send_byte('\r');
-// 	// else if ('\r' == ch)
-// 	// 	uart_send_byte('\n');
-// #endif
-// }
+__WEAK__ void __io_putchar(char ch)
+{
+#ifdef CONFIG_UART
+	uart_send_byte(ch);
+	// if ('\n' == ch)
+	// 	uart_send_byte('\r');
+	// else if ('\r' == ch)
+	// 	uart_send_byte('\n');
+#endif
+}
 
 static const char *int_to_hex_str(__u32 val, char str[])
 {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`	`1`	`obj-y = head.o cpuid.o`
`2`		`-`
`3`		`-PHONY += head.S`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`unsigned long read_cpu_id(void)`
`2`	`2`	`{`
`3`		`- return 0;`
	`3`	`+ extern unsigned long __stack_base;`
	`4`	`+`
	`5`	`+ return __stack_base;`
`4`	`6`	`}`