[U-Boot] [PATCH 4/9] sunxi: Convert Linksprite_pcDuino_defconfig to use auto dram configuration

Ian Campbell
2015-01-18T16:24:54Z

On Sun, 2015-01-18 at 13:23 +0100, Hans de Goede wrote:
> Currently we've separate detailed dram settings for all sun4i boards, this
> moves them

There's only one board here, did you intend for the next patch to be
folder with this one as a bulk switch? Or is there something
particularly interesting about this one?

> over to using auto dram configuration so that we can get rid of
> all the per board dram_foo.c files.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> board/sunxi/Makefile | 2 +-
> board/sunxi/dram_sun4i_408_1024_iow8.c | 31 -------------------------------
> configs/Linksprite_pcDuino_defconfig | 3 +++
> 3 files changed, 4 insertions(+), 32 deletions(-)
> delete mode 100644 board/sunxi/dram_sun4i_408_1024_iow8.c
>
> diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
> index 606bf73..0111b56 100644
> --- a/board/sunxi/Makefile
> +++ b/board/sunxi/Makefile
> @@ -32,7 +32,7 @@ obj-$(CONFIG_TARGET_MELE_A1000) += dram_sun4i_auto.o
> obj-$(CONFIG_TARGET_MELE_M3) += dram_sun7i_384_1024_iow16.o
> obj-$(CONFIG_TARGET_MINI_X) += dram_sun4i_auto.o
> obj-$(CONFIG_TARGET_MSI_PRIMO73) += dram_sun7i_384_1024_iow16.o
> -obj-$(CONFIG_TARGET_PCDUINO) += dram_sun4i_408_1024_iow8.o
> +obj-$(CONFIG_TARGET_PCDUINO) += dram_sun4i_auto.o
> obj-$(CONFIG_TARGET_PCDUINO3) += dram_linksprite_pcduino3.o
> obj-$(CONFIG_TARGET_QT840A) += dram_sun7i_384_512_busw16_iow16.o
> obj-$(CONFIG_TARGET_R7DONGLE) += dram_r7dongle.o
> diff --git a/board/sunxi/dram_sun4i_408_1024_iow8.c b/board/sunxi/dram_sun4i_408_1024_iow8.c
> deleted file mode 100644
> index c6d87d2..0000000
> --- a/board/sunxi/dram_sun4i_408_1024_iow8.c
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/* this file is generated, don't edit it yourself */
> -
> -#include <common.h>
> -#include <asm/arch/dram.h>
> -
> -static struct dram_para dram_para = {
> - .clock = 408,
> - .type = 3,
> - .rank_num = 1,
> - .density = 2048,
> - .io_width = 8,
> - .bus_width = 32,
> - .cas = 6,
> - .zq = 123,
> - .odt_en = 0,
> - .size = 1024,
> - .tpr0 = 0x30926692,
> - .tpr1 = 0x1090,
> - .tpr2 = 0x1a0c8,
> - .tpr3 = 0,
> - .tpr4 = 0,
> - .tpr5 = 0,
> - .emr1 = 0,
> - .emr2 = 0,
> - .emr3 = 0,
> -};
> -
> -unsigned long sunxi_dram_init(void)
> -{
> - return dramc_init(&dram_para);
> -}
> diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
> index f5b0ca9..0bf329e 100644
> --- a/configs/Linksprite_pcDuino_defconfig
> +++ b/configs/Linksprite_pcDuino_defconfig
> @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun4i-a10-pcduino.dtb"
> +S:CONFIG_ARCH_SUNXI=y
> +S:CONFIG_MACH_SUN4I=y
> +S:CONFIG_TARGET_PCDUINO=y
> ++S:CONFIG_DRAM_CLK=408
> ++S:CONFIG_DRAM_ZQ=123
> ++S:CONFIG_DRAM_EMR1=0