diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2015-01-21 16:14:00 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-01-23 15:15:02 +0100 |
| commit | 56333be9b262ba4059affe277bca4cf9d2991b69 (patch) | |
| tree | 536566e513bf959285532ceb6da4a2ae46e8cdf8 /board | |
| parent | 89c95b08117467890d9e7184e232ba106206dd3d (diff) | |
| download | u-boot-56333be9b262ba4059affe277bca4cf9d2991b69.tar.gz | |
sunxi: Drop qt840a_defconfig
The qt840a is one of the many tv-boxes using the "i12" A20 pcb, but it
populates only one of the 2 places for a 16 bit dram ic, thus reducing
the buswidth to 16 bits, and the amount of ram to 512M, which is why we
had a separate config for it.
This commit switches the generic i12-tvbox_defconfig over to DRAM
autoconfiguration, so that it will work with the qt840a too, and drops the
qt840a specific config, like we've done with other memory-amount specific
configs before.
Tested on a generic i12-tvbox with 32 bit bus-width / 1G RAM, and on a
qt840a with 16 bit bus-width / 512M RAM.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/Kconfig | 4 | ||||
| -rw-r--r-- | board/sunxi/Makefile | 3 | ||||
| -rw-r--r-- | board/sunxi/dram_sun5i_auto.c | 2 | ||||
| -rw-r--r-- | board/sunxi/dram_sun7i_384_512_busw16_iow16.c | 31 |
4 files changed, 2 insertions, 38 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 0f47e610bc..0e3c2076dc 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -143,10 +143,6 @@ config TARGET_I12_TVBOX bool "I12_TVBOX" depends on MACH_SUN7I -config TARGET_QT840A - bool "QT840A" - depends on MACH_SUN7I - config TARGET_R7DONGLE bool "R7DONGLE" depends on MACH_SUN5I diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index feb439acd3..0522f3c9b5 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -24,10 +24,9 @@ obj-$(CONFIG_TARGET_BANANAPI) += dram_bananapi.o obj-$(CONFIG_TARGET_BANANAPRO) += dram_bananapi.o obj-$(CONFIG_TARGET_CUBIEBOARD2) += dram_cubieboard2.o obj-$(CONFIG_TARGET_CUBIETRUCK) += dram_cubietruck.o -obj-$(CONFIG_TARGET_I12_TVBOX) += dram_sun7i_384_1024_iow16.o +obj-$(CONFIG_TARGET_I12_TVBOX) += dram_sun5i_auto.o obj-$(CONFIG_TARGET_MELE_M3) += dram_sun7i_384_1024_iow16.o obj-$(CONFIG_TARGET_MK802_A10S) += dram_sun5i_auto.o obj-$(CONFIG_TARGET_MSI_PRIMO73) += dram_sun7i_384_1024_iow16.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_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c index a5965dba96..e86b08e67b 100644 --- a/board/sunxi/dram_sun5i_auto.c +++ b/board/sunxi/dram_sun5i_auto.c @@ -1,4 +1,4 @@ -/* this file is generated, don't edit it yourself */ +/* DRAM parameters for auto dram configuration on sun5i and sun7i */ #include <common.h> #include <asm/arch/dram.h> diff --git a/board/sunxi/dram_sun7i_384_512_busw16_iow16.c b/board/sunxi/dram_sun7i_384_512_busw16_iow16.c deleted file mode 100644 index 2e36011af5..0000000000 --- a/board/sunxi/dram_sun7i_384_512_busw16_iow16.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 = 384, - .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); -} |