From 56333be9b262ba4059affe277bca4cf9d2991b69 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 21 Jan 2015 16:14:00 +0100 Subject: 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 Acked-by: Ian Campbell --- configs/i12-tvbox_defconfig | 3 +++ configs/qt840a_defconfig | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 configs/qt840a_defconfig (limited to 'configs') diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index 5f5037e698..65791b7dc1 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_I12_TVBOX=y ++S:CONFIG_DRAM_CLK=384 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig deleted file mode 100644 index 70f8159b39..0000000000 --- a/configs/qt840a_defconfig +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" -+S:CONFIG_ARM=y -+S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_MACH_SUN7I=y -+S:CONFIG_TARGET_QT840A=y -- cgit v1.2.1