From 94f620d82d3e44b366d540d62a2618ec2da1e3a3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Mon, 16 May 2011 20:02:39 +0800
Subject: [PATCH] rk29: update defconfig for RK29_JTAG

---
 arch/arm/configs/rk29_FIH_defconfig      | 1 +
 arch/arm/configs/rk29_a22_defconfig      | 1 +
 arch/arm/configs/rk29_ddr3sdk_defconfig  | 1 +
 arch/arm/configs/rk29_phonesdk_defconfig | 1 +
 arch/arm/configs/rk29_sdk_defconfig      | 1 +
 5 files changed, 5 insertions(+)

diff --git a/arch/arm/configs/rk29_FIH_defconfig b/arch/arm/configs/rk29_FIH_defconfig
index 4f4b3d3dba51..d9449fd7d9b6 100644
--- a/arch/arm/configs/rk29_FIH_defconfig
+++ b/arch/arm/configs/rk29_FIH_defconfig
@@ -236,6 +236,7 @@ CONFIG_DDR_SDRAM_FREQ=400
 #
 CONFIG_RK29_VPU=y
 # CONFIG_RK29_VPU_DEBUG is not set
+# CONFIG_RK29_JTAG is not set
 
 #
 # Processor Type
diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
index 22a424d8bf4b..d2824cf1aee9 100644
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -211,6 +211,7 @@ CONFIG_RK29_MEM_SIZE_M=512
 #
 CONFIG_RK29_VPU=y
 # CONFIG_RK29_VPU_DEBUG is not set
+# CONFIG_RK29_JTAG is not set
 
 #
 # Processor Type
diff --git a/arch/arm/configs/rk29_ddr3sdk_defconfig b/arch/arm/configs/rk29_ddr3sdk_defconfig
index 087aba30e1d0..7485a2f3ef83 100755
--- a/arch/arm/configs/rk29_ddr3sdk_defconfig
+++ b/arch/arm/configs/rk29_ddr3sdk_defconfig
@@ -212,6 +212,7 @@ CONFIG_RK29_MEM_SIZE_M=512
 #
 CONFIG_RK29_VPU=y
 # CONFIG_RK29_VPU_DEBUG is not set
+CONFIG_RK29_JTAG=y
 
 #
 # Processor Type
diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 6238feac63d4..5b796d8d76b7 100755
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -236,6 +236,7 @@ CONFIG_DDR_SDRAM_FREQ=192
 #
 CONFIG_RK29_VPU=y
 # CONFIG_RK29_VPU_DEBUG is not set
+CONFIG_RK29_JTAG=y
 
 #
 # Processor Type
diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index c1ad30227de3..d8adf225b24e 100755
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -236,6 +236,7 @@ CONFIG_DDR_SDRAM_FREQ=400
 #
 CONFIG_RK29_VPU=y
 # CONFIG_RK29_VPU_DEBUG is not set
+CONFIG_RK29_JTAG=y
 
 #
 # Processor Type
-- 
2.34.1