From 39c128750c4934942929b556000b090f90c16200 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=94=A1=E6=9E=AB?= Date: Fri, 15 Apr 2011 17:36:42 +0800 Subject: [PATCH] Revert "update defconfig for ddr" This reverts commit d357f98bf59a659e3e1c116438d2a4ea6514c512. --- arch/arm/configs/rk29_sdk_defconfig | 26 +------------------------- arch/arm/mach-rk29/Kconfig | 4 ++-- arch/arm/mach-rk29/ddr.c | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig index 8e5994ef95d1..1fdfa05cbd15 100755 --- a/arch/arm/configs/rk29_sdk_defconfig +++ b/arch/arm/configs/rk29_sdk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Sat Apr 9 17:01:30 2011 +# Sat Apr 2 10:51:17 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -205,31 +205,7 @@ CONFIG_MACH_RK29SDK=y # CONFIG_MACH_RK29_MALATA is not set # CONFIG_MACH_RK29_PHONESDK is not set # CONFIG_MACH_RK29_A22 is not set -# CONFIG_DDR_TYPE_DDRII is not set -# CONFIG_DDR_TYPE_DDR3_800D is not set -# CONFIG_DDR_TYPE_DDR3_800E is not set -# CONFIG_DDR_TYPE_DDR3_1066E is not set -# CONFIG_DDR_TYPE_DDR3_1066F is not set -# CONFIG_DDR_TYPE_DDR3_1066G is not set -# CONFIG_DDR_TYPE_DDR3_1333F is not set -# CONFIG_DDR_TYPE_DDR3_1333G is not set -# CONFIG_DDR_TYPE_DDR3_1333H is not set -# CONFIG_DDR_TYPE_DDR3_1333J is not set -# CONFIG_DDR_TYPE_DDR3_1600G is not set -# CONFIG_DDR_TYPE_DDR3_1600H is not set -# CONFIG_DDR_TYPE_DDR3_1600J is not set -# CONFIG_DDR_TYPE_DDR3_1600K is not set -# CONFIG_DDR_TYPE_DDR3_1866J is not set -# CONFIG_DDR_TYPE_DDR3_1866K is not set -# CONFIG_DDR_TYPE_DDR3_1866L is not set -# CONFIG_DDR_TYPE_DDR3_1866M is not set -# CONFIG_DDR_TYPE_DDR3_2133K is not set -# CONFIG_DDR_TYPE_DDR3_2133L is not set -# CONFIG_DDR_TYPE_DDR3_2133M is not set -# CONFIG_DDR_TYPE_DDR3_2133N is not set -CONFIG_DDR_TYPE_DDR3_DEFAULT=y CONFIG_RK29_MEM_SIZE_M=512 -CONFIG_DDR_SDRAM_FREQ=400 # # RK29 VPU (Video Processing Unit) support diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig index a6c10edb6ed4..0dd19b836b98 100755 --- a/arch/arm/mach-rk29/Kconfig +++ b/arch/arm/mach-rk29/Kconfig @@ -51,7 +51,7 @@ endchoice choice DDR_TYPE prompt "DDR Memory Type" - default DDR_TYPE_DDR3_DEFAULT + default DDR_TYPE_DDR3_800D config DDR_TYPE_DDRII bool "DDRII" @@ -127,7 +127,7 @@ config DDR_TYPE_DDR3_DEFAULT endchoice config RK29_MEM_SIZE_M - int "DDR Memory size (in MB)" + int "Memory size (in MB)" default 512 config DDR_SDRAM_FREQ diff --git a/arch/arm/mach-rk29/ddr.c b/arch/arm/mach-rk29/ddr.c index d4772f86f12f..acaccd22969f 100755 --- a/arch/arm/mach-rk29/ddr.c +++ b/arch/arm/mach-rk29/ddr.c @@ -1121,7 +1121,7 @@ static int __init ddr_probe(void) ((capability<>20)); value = ddr_change_freq(DDR_FREQ); - ddr_print("init success!!! freq=%dMHz\n", value); + ddr_print("init success!!! freq=%dMHz\n", DDR_FREQ); ddr_print("CSR:0x%x, RSLR0:0x%x, RSLR1:0x%x, RDGR0:0x%x, RDGR1:0x%x\n", pDDR_Reg->CSR, pDDR_Reg->RSLR[0], pDDR_Reg->RSLR[1], -- 2.34.1