From 8ffc487c759b985bff7951cc9a8c1bc55e74bfc5 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 17 Jan 2015 14:24:55 +0100 Subject: sunxi: Stop differentiating between 512M and 1G variants of the same board While working on adding more boards I noticed that we lack a config for the 512M cubieboard, and that some of the new boards which I want to add also have 512M and 1G variants, rather then adding 2 defconfig's for all of these, lets switch the exising boards which have both a 512M and 1024M variant over to the sun4i dram autoconfig code. This also drops the foo_RAMSIZE_defconfig variants of boards where we currently have 2 separate configs already. Note: 1) The newly introduced CONFIG_DRAM_EMR1 kconfig value is not used with a value other then its default for now, but we need this to be configurable to support some new boards with auto dram config. 2) We always set all CONFIG_DRAM_foo values in defconfigs, even if they match the defaults, this is done to make it more clear what values are used for a certain board. This has been tested on a Mele A1000, Mini-X and a Cubieboard, all 1G variants, the dram autoconfig code has also been tested on a 512M mk802 (a defconfig for the mk802 is added in a later patch). Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- configs/Mini-X_defconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configs/Mini-X_defconfig') diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index 0f6bbe06b2..bb394641ce 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN4I=y +S:CONFIG_TARGET_MINI_X=y ++S:CONFIG_DRAM_CLK=360 ++S:CONFIG_DRAM_ZQ=123 ++S:CONFIG_DRAM_EMR1=0 -- cgit From 6915270871a4ff68e5309f3372cdb3054017bf35 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 17 Jan 2015 17:01:38 +0100 Subject: sunxi: Remove CONFIG_TARGET_FOO for sun4i, sun6i and sun8i boards CONFIG_TARGET_FOO is only used in board/sunxi/Makefile to select the dram config for sun5i and sun7i boards and in board/sunxi/gmac.c for some special handling of the bananapi/bananapro (both sun7i), iow it is not used at all on any sun4i, sun6i and sun8i boards so lets get rid of it there. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- configs/Mini-X_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/Mini-X_defconfig') diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index bb394641ce..6aea77716d 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN4I=y -+S:CONFIG_TARGET_MINI_X=y +S:CONFIG_DRAM_CLK=360 +S:CONFIG_DRAM_ZQ=123 +S:CONFIG_DRAM_EMR1=0 -- cgit