diff options
| author | rick <rick@andestech.com> | 2017-04-17 14:41:58 +0800 |
|---|---|---|
| committer | Andes <uboot@andestech.com> | 2017-05-22 14:05:33 +0800 |
| commit | 86132af799d51e8e94d87dc56a071f325f369e0c (patch) | |
| tree | eaa707979e38c41487e04cedf3f1685e15b72413 /arch | |
| parent | a375ff8e14bea0a5cbfff99d6456aa8d9a3320ab (diff) | |
| download | u-boot-86132af799d51e8e94d87dc56a071f325f369e0c.zip u-boot-86132af799d51e8e94d87dc56a071f325f369e0c.tar.gz u-boot-86132af799d51e8e94d87dc56a071f325f369e0c.tar.bz2 | |
nds32: Support AG101P serial DM.
Support AG101P serial device tree flow.
Signed-off-by: rick <rick@andestech.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/Kconfig | 1 | ||||
| -rw-r--r-- | arch/nds32/cpu/n1213/start.S | 10 | ||||
| -rw-r--r-- | arch/nds32/dts/Makefile | 14 | ||||
| -rw-r--r-- | arch/nds32/dts/ag101p.dts | 49 | ||||
| -rw-r--r-- | arch/nds32/include/asm/config.h | 1 | ||||
| -rw-r--r-- | arch/nds32/lib/bootm.c | 6 |
6 files changed, 78 insertions, 3 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 2528f50..1212635 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -43,6 +43,7 @@ config MIPS config NDS32 bool "NDS32 architecture" + select SUPPORT_OF_CONTROL config NIOS2 bool "Nios II architecture" diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S index 99971fd..7992fd9 100644 --- a/arch/nds32/cpu/n1213/start.S +++ b/arch/nds32/cpu/n1213/start.S @@ -161,9 +161,13 @@ update_gp: */ call_board_init_f: li $sp, CONFIG_SYS_INIT_SP_ADDR - li $r10, GD_SIZE /* get GD size */ - sub $sp, $sp, $r10 /* GD start addr */ - move $r10, $sp + move $r0, $sp + bal board_init_f_alloc_reserve + move $sp, $r0 + bal board_init_f_init_reserve +#ifdef CONFIG_DEBUG_UART + bal debug_uart_init +#endif li $r0, 0x00000000 #ifdef __PIC__ diff --git a/arch/nds32/dts/Makefile b/arch/nds32/dts/Makefile new file mode 100644 index 0000000..2d8480b --- /dev/null +++ b/arch/nds32/dts/Makefile @@ -0,0 +1,14 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + +dtb-$(CONFIG_TARGET_ADP_AG101P) += ag101p.dtb +targets += $(dtb-y) + +DTC_FLAGS += -R 4 -p 0x1000 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb diff --git a/arch/nds32/dts/ag101p.dts b/arch/nds32/dts/ag101p.dts new file mode 100644 index 0000000..2baa3dc --- /dev/null +++ b/arch/nds32/dts/ag101p.dts @@ -0,0 +1,49 @@ +/dts-v1/; +/ { + compatible = "nds32 ag101p"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + aliases { + uart0 = &serial0; + } ; + + chosen { + /* bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug bootmem_debug memblock=debug loglevel=7"; */ + bootargs = "console=ttyS0,38400n8 earlyprintk=uart8250-32bit,0x99600000 debug loglevel=7"; + stdout-path = "uart0:38400n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu@0 { + compatible = "andestech,n13"; + reg = <0>; + /* FIXME: to fill correct frqeuency */ + clock-frequency = <60000000>; + }; + }; + + intc: interrupt-controller { + compatible = "andestech,atnointc010"; + #interrupt-cells = <1>; + interrupt-controller; + }; + + serial0: serial@99600000 { + compatible = "andestech,uart16550", "ns16550a"; + reg = <0x99600000 0x1000>; + interrupts = <7 4>; + clock-frequency = <14745600>; + reg-shift = <2>; + no-loopback-test = <1>; + }; + +}; diff --git a/arch/nds32/include/asm/config.h b/arch/nds32/include/asm/config.h index 054cc48..7289217 100644 --- a/arch/nds32/include/asm/config.h +++ b/arch/nds32/include/asm/config.h @@ -8,5 +8,6 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +#define CONFIG_LMB #endif diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c index 8b0b28f..7999167 100644 --- a/arch/nds32/lib/bootm.c +++ b/arch/nds32/lib/bootm.c @@ -14,6 +14,12 @@ DECLARE_GLOBAL_DATA_PTR; +int arch_fixup_fdt(void *blob) +{ + return 0; +} + + #if defined(CONFIG_SETUP_MEMORY_TAGS) || \ defined(CONFIG_CMDLINE_TAG) || \ defined(CONFIG_INITRD_TAG) || \ |