diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 09:19:10 +0200 |
| commit | a6bc0195dba895fa0e9facc718d17eb098695685 (patch) | |
| tree | b3e93d9948b17e4c924012684b0f2fecdf547176 /board | |
| parent | b653516769160a7ba5bb4318c014535e063fdc0b (diff) | |
| parent | b86d54b2c38a4beb97d580d7d9c8c6a5e57fc510 (diff) | |
| download | blackbird-obmc-uboot-a6bc0195dba895fa0e9facc718d17eb098695685.tar.gz blackbird-obmc-uboot-a6bc0195dba895fa0e9facc718d17eb098695685.zip | |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/Kconfig | 4 | ||||
| -rw-r--r-- | board/sunxi/MAINTAINERS | 6 | ||||
| -rw-r--r-- | board/sunxi/Makefile | 1 | ||||
| -rw-r--r-- | board/sunxi/dram_a20_olinuxino_l.c | 31 |
4 files changed, 40 insertions, 2 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index c61c650735..7bdf958afe 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -36,7 +36,7 @@ config SYS_SOC string default "sunxi" -config FTDFILE - string "Default ftdfile env setting for this board" +config FDTFILE + string "Default fdtfile env setting for this board" endif diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index b0b1804c50..4f32195dcd 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -32,3 +32,9 @@ F: configs/Cubieboard2_defconfig F: configs/Cubieboard2_FEL_defconfig F: configs/Cubietruck_defconfig F: configs/Cubietruck_FEL_defconfig + +A20-OLINUXINO-LIME BOARD +M: FUKAUMI Naoki <naobsd@gmail.com> +S: Maintained +F: board/sunxi/dram_a20_olinuxino_l.c +F: configs/A20-OLinuXino-Lime_defconfig diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index cf001e71fa..56073a024d 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_A10_OLINUXINO_L) += dram_a10_olinuxino_l.o obj-$(CONFIG_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o obj-$(CONFIG_A13_OLINUXINO) += dram_a13_olinuxino.o obj-$(CONFIG_A13_OLINUXINOM) += dram_a13_oli_micro.o +obj-$(CONFIG_A20_OLINUXINO_L) += dram_a20_olinuxino_l.o obj-$(CONFIG_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o # This is not a typo, uses the same mem settings as the a10s-olinuxino-m obj-$(CONFIG_AUXTEK_T004) += dram_a10s_olinuxino_m.o diff --git a/board/sunxi/dram_a20_olinuxino_l.c b/board/sunxi/dram_a20_olinuxino_l.c new file mode 100644 index 0000000000..2c74999708 --- /dev/null +++ b/board/sunxi/dram_a20_olinuxino_l.c @@ -0,0 +1,31 @@ +/* this file is generated, don't edit it yourself */ + +#include "common.h" +#include <asm/arch/dram.h> + +static struct dram_para dram_para = { + .clock = 480, + .type = 3, + .rank_num = 1, + .density = 4096, + .io_width = 16, + .bus_width = 16, + .cas = 9, + .zq = 0x7f, + .odt_en = 0, + .size = 512, + .tpr0 = 0x42d899b7, + .tpr1 = 0xa090, + .tpr2 = 0x22a00, + .tpr3 = 0, + .tpr4 = 0, + .tpr5 = 0, + .emr1 = 0x4, + .emr2 = 0x10, + .emr3 = 0, +}; + +unsigned long sunxi_dram_init(void) +{ + return dramc_init(&dram_para); +} |
