From 091c6afb8051cd89ebc5d0885076f537cf686c62 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 18 Mar 2011 13:02:12 +0000
Subject: [PATCH] upgrade to 2.6.37, mark it broken

SVN-Revision: 26222
---
 target/linux/imx21/Makefile                    |  6 +++---
 .../imx21/{config-2.6.34 => config-default}    |  1 +
 .../010-mach-vp6500.patch                      | 18 +++++++++---------
 .../011-mach-type.patch                        |  0
 .../{patches-2.6.34 => patches}/040-pwm.patch  |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename target/linux/imx21/{config-2.6.34 => config-default} (99%)
 rename target/linux/imx21/{patches-2.6.34 => patches}/010-mach-vp6500.patch (52%)
 rename target/linux/imx21/{patches-2.6.34 => patches}/011-mach-type.patch (100%)
 rename target/linux/imx21/{patches-2.6.34 => patches}/040-pwm.patch (100%)

diff --git a/target/linux/imx21/Makefile b/target/linux/imx21/Makefile
index 76b51ab8f6..982719edd9 100644
--- a/target/linux/imx21/Makefile
+++ b/target/linux/imx21/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=imx21
 BOARDNAME:=Freescale i.MX21
-FEATURES:=jffs2
+FEATURES:=jffs2 broken
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
 
-LINUX_VERSION:=2.6.34.8
+LINUX_VERSION:=2.6.37.3
 
 DEVICE_TYPE=phone
 
diff --git a/target/linux/imx21/config-2.6.34 b/target/linux/imx21/config-default
similarity index 99%
rename from target/linux/imx21/config-2.6.34
rename to target/linux/imx21/config-default
index 829c672d1e..67a656734c 100644
--- a/target/linux/imx21/config-2.6.34
+++ b/target/linux/imx21/config-default
@@ -100,6 +100,7 @@ CONFIG_MACH_VP6500=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_PHYSMAP=y
+# CONFIG_MXC_DEBUG_BOARD is not set
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
 CONFIG_NEED_DMA_MAP_STATE=y
diff --git a/target/linux/imx21/patches-2.6.34/010-mach-vp6500.patch b/target/linux/imx21/patches/010-mach-vp6500.patch
similarity index 52%
rename from target/linux/imx21/patches-2.6.34/010-mach-vp6500.patch
rename to target/linux/imx21/patches/010-mach-vp6500.patch
index 8d1832b56d..37bfa676f9 100644
--- a/target/linux/imx21/patches-2.6.34/010-mach-vp6500.patch
+++ b/target/linux/imx21/patches/010-mach-vp6500.patch
@@ -1,8 +1,8 @@
---- a/arch/arm/mach-mx2/Kconfig
-+++ b/arch/arm/mach-mx2/Kconfig
-@@ -27,6 +27,12 @@ config MACH_MX21ADS
- 	  Include support for MX21ADS platform. This includes specific
- 	  configurations for the board and its peripherals.
+--- a/arch/arm/mach-imx/Kconfig
++++ b/arch/arm/mach-imx/Kconfig
+@@ -83,6 +83,12 @@ if MACH_MX27
+ 
+ comment "MX27 platforms:"
  
 +config MACH_VP6500
 +	bool "Phillips VP6500 VoIP phone"
@@ -12,10 +12,10 @@
 +
  config MACH_MX27ADS
  	bool "MX27ADS platform"
- 	depends on MACH_MX27
---- a/arch/arm/mach-mx2/Makefile
-+++ b/arch/arm/mach-mx2/Makefile
-@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_CPUIMX27) += mach-cpui
+ 	select IMX_HAVE_PLATFORM_IMX_I2C
+--- a/arch/arm/mach-imx/Makefile
++++ b/arch/arm/mach-imx/Makefile
+@@ -32,3 +32,4 @@ obj-$(CONFIG_MACH_CPUIMX27) += mach-cpui
  obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
  obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
  obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
diff --git a/target/linux/imx21/patches-2.6.34/011-mach-type.patch b/target/linux/imx21/patches/011-mach-type.patch
similarity index 100%
rename from target/linux/imx21/patches-2.6.34/011-mach-type.patch
rename to target/linux/imx21/patches/011-mach-type.patch
diff --git a/target/linux/imx21/patches-2.6.34/040-pwm.patch b/target/linux/imx21/patches/040-pwm.patch
similarity index 100%
rename from target/linux/imx21/patches-2.6.34/040-pwm.patch
rename to target/linux/imx21/patches/040-pwm.patch