On 11/08/2011 01:02 AM, Igor Grinberg wrote:
> On 11/08/11 00:03, Tom Rini wrote:
>> Add Hynix 200MHz timing information to <asm/arch-omap3/mem.h>. We
>> don't calculate the MCFG value here for the Micron parts as the provided
>> one assumes a memory size which is incorrect.
>>
>> Signed-off-by: Tom Rini <tr...@ti.com>
>> ---
>> arch/arm/include/asm/arch-omap3/mem.h | 38 +++++++++++++++++++++
>> board/ti/evm/config.mk | 33 ------------------
>> board/ti/evm/evm.c | 42 ++++++++++++++++++++++-
>> include/configs/omap3_evm.h | 58
>> +++++++++++++++++++++++++++++++--
>> 4 files changed, 133 insertions(+), 38 deletions(-)
>> delete mode 100644 board/ti/evm/config.mk
>>
>> diff --git a/arch/arm/include/asm/arch-omap3/mem.h
>> b/arch/arm/include/asm/arch-omap3/mem.h
>> index f467ba9..7b0aaa1 100644
>> --- a/arch/arm/include/asm/arch-omap3/mem.h
>> +++ b/arch/arm/include/asm/arch-omap3/mem.h
>> @@ -60,6 +60,44 @@ enum {
>> #define SDP_SDRC_DLLAB_CTRL ((DLL_ENADLL << 3) | \
>> (DLL_LOCKDLL << 2) | (DLL_DLLPHASE_90 << 1))
>>
>> +/* Hynix part of AM/DM37xEVM (200MHz optimized)
>> + * ACTIMA
>> + * TDAL = 6
>> + * TDPL (Twr) = 3
>> + * TRRD = 2
>> + * TRCD = 4
>> + * TRP = 3
>> + * TRAS = 8
>> + * TRC = 11
>> + * TRFC = 18
>> + * ACTIMB
>> + * TWTR = 2
>> + * TCKE = 1
>> + * TXP = 1
>> + * TXSR = 28
>> + */
>> +#define HYNIX_TDAL_200 6
>> +#define HYNIX_TDPL_200 3
>> +#define HYNIX_TRRD_200 2
>> +#define HYNIX_TRCD_200 4
>> +#define HYNIX_TRP_200 3
>> +#define HYNIX_TRAS_200 8
>> +#define HYNIX_TRC_200 11
>> +#define HYNIX_TRFC_200 18
>> +#define HYNIX_V_ACTIMA_200 ((HYNIX_TRFC_200 << 27) | \
>> + (HYNIX_TRC_200 << 22) | (HYNIX_TRAS_200 << 18) | \
>> + (HYNIX_TRP_200 << 15) | (HYNIX_TRCD_200 << 12) | \
>> + (HYNIX_TRRD_200 << 9) | (HYNIX_TDPL_200 << 6) | \
>> + (HYNIX_TDAL_200))
>> +
>> +#define HYNIX_TWTR_200 2
>> +#define HYNIX_TCKE_200 1
>> +#define HYNIX_TXP_200 1
>> +#define HYNIX_XSR_200 28
>> +#define HYNIX_V_ACTIMB_200 (((HYNIX_TCKE_200 << 12) | \
>> + (HYNIX_XSR_200 << 0)) | (HYNIX_TXP_200 << 8) | \
>> + (HYNIX_TWTR_200 << 16))
>> +
>> /* Infineon part of 3430SDP (165MHz optimized) 6.06ns
>> * ACTIMA
>> * TDAL = Twr/Tck + Trp/tck = 15/6 + 18/6 = 2.5 + 3 = 5.5 -> 6
>> diff --git a/board/ti/evm/config.mk b/board/ti/evm/config.mk
>> deleted file mode 100644
>> index d173eef..0000000
>> --- a/board/ti/evm/config.mk
>> +++ /dev/null
>> @@ -1,33 +0,0 @@
>> -#
>> -# (C) Copyright 2006 - 2008
>> -# Texas Instruments, <www.ti.com>
>> -#
>> -# EVM uses OMAP3 (ARM-CortexA8) cpu
>> -# see http://www.ti.com/ for more information on Texas Instruments
>> -#
>> -# See file CREDITS for list of people who contributed to this
>> -# project.
>> -#
>> -# This program is free software; you can redistribute it and/or
>> -# modify it under the terms of the GNU General Public License as
>> -# published by the Free Software Foundation; either version 2 of
>> -# the License, or (at your option) any later version.
>> -#
>> -# This program is distributed in the hope that it will be useful,
>> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> -# GNU General Public License for more details.
>> -#
>> -# You should have received a copy of the GNU General Public License
>> -# along with this program; if not, write to the Free Software
>> -# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>> -# MA 02111-1307 USA
>> -#
>> -# Physical Address:
>> -# 8000'0000 (bank0)
>> -# A000/0000 (bank1)
>> -# Linux-Kernel is expected to be at 8000'8000, entry 8000'8000
>> -# (mem base + reserved)
>> -
>> -# For use with external or internal boots.
>> -CONFIG_SYS_TEXT_BASE = 0x80008000
>
> Does not belong to this patch, is it?
Same rational as beagle, we change CONFIG_SYS_TEXT_BASE, which I guess I
should note more obviously in the commit message.
>> + /*
>> + * We need to identify what PoP memory is on the board so that
>> + * we know what timings to use. If we can't identify it then
>> + * we know it's an xM.
>
> This comment should be slightly adjusted, evm is not beagle...
Ha, oops, thanks.
>> + */
>> + identify_pop_memory(&pop_mfr, &pop_id);
>> +
>> + if ((pop_mfr == 0xad) && (pop_id == 0xbc)) {
>
> No need for extra parenthesis.
I'll go double check, thanks.
--
Tom
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
