[kernel] r18266 - in dists/trunk/linux-2.6/debian: . patches/features/arm patches/series

Sun Nov 13 19:42:30 UTC 2011

Author: rtp-guest
Date: Sun Nov 13 19:42:28 2011
New Revision: 18266

Log:
allow to build iMX51 and iMX53 support in same kernel image

Added:
   dists/trunk/linux-2.6/debian/patches/features/arm/allow_imx5x_build.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================

--- dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 19:27:56 2011	(r18265)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 19:42:28 2011	(r18266)
@@ -26,6 +26,8 @@
 
   [ Arnaud Patard ]
   * [arm] add missing ioread/write be functions to ixp4xx to fix FTBFS
+  * [armhf] allow to build kernel image for iMX51 and iMX53 and enable some
+    iMX53 platforms.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 04 Nov 2011 15:05:47 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/features/arm/allow_imx5x_build.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/allow_imx5x_build.patch	Sun Nov 13 19:42:28 2011	(r18266)
@@ -0,0 +1,140 @@
+commit 7409cd1cd554a0bdedfecf2afde58ff468b7045e
+Author: Sascha Hauer <s.hauer at pengutronix.de>
+Date:   Wed Aug 24 08:54:04 2011 +0200
+
+    ARM i.MX: allow to compile together all i.MX5 based SoCs
+    
+    For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.
+    
+    Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
+
+Index: linux-3.1/arch/arm/mach-mx5/Kconfig
+===================================================================
+--- linux-3.1.orig/arch/arm/mach-mx5/Kconfig	2011-11-13 14:24:52.090827440 +0100
++++ linux-3.1/arch/arm/mach-mx5/Kconfig	2011-11-13 14:24:52.158827438 +0100
+@@ -1,8 +1,9 @@
+-if ARCH_MX503 || ARCH_MX51
++if ARCH_MX5
++
+ # ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single
+ # image. So for most time, SOC_IMX50/51/53 should be used.
+ 
+-config ARCH_MX5
++config ARCH_MX51
+ 	bool
+ 
+ config ARCH_MX50
+@@ -19,7 +20,6 @@ config SOC_IMX50
+ 	select ARCH_MXC_IOMUX_V3
+ 	select ARCH_MXC_AUDMUX_V2
+ 	select ARCH_HAS_CPUFREQ
+-	select ARCH_MX5
+ 	select ARCH_MX50
+ 
+ config	SOC_IMX51
+@@ -30,7 +30,7 @@ config	SOC_IMX51
+ 	select ARCH_MXC_IOMUX_V3
+ 	select ARCH_MXC_AUDMUX_V2
+ 	select ARCH_HAS_CPUFREQ
+-	select ARCH_MX5
++	select ARCH_MX51
+ 
+ config	SOC_IMX53
+ 	bool
+@@ -38,10 +38,8 @@ config	SOC_IMX53
+ 	select ARM_L1_CACHE_SHIFT_6
+ 	select MXC_TZIC
+ 	select ARCH_MXC_IOMUX_V3
+-	select ARCH_MX5
+ 	select ARCH_MX53
+ 
+-if ARCH_MX50_SUPPORTED
+ #comment "i.MX50 machines:"
+ 
+ config MACH_MX50_RDP
+@@ -57,9 +55,6 @@ config MACH_MX50_RDP
+ 	  Include support for MX50 reference design platform (RDP) board. This
+ 	  includes specific configurations for the board and its peripherals.
+ 
+-endif # ARCH_MX50_SUPPORTED
+-
+-if ARCH_MX51
+ comment "i.MX51 machines:"
+ 
+ config MACH_MX51_BABBAGE
+@@ -168,9 +163,6 @@ config MACH_MX51_EFIKASB
+ 	  Include support for Genesi Efika Smartbook. This includes specific
+ 	  configurations for the board and its peripherals.
+ 
+-endif # ARCH_MX51
+-
+-if ARCH_MX53_SUPPORTED
+ comment "i.MX53 machines:"
+ 
+ config MACH_MX53_EVK
+@@ -222,6 +214,4 @@ config MACH_MX53_ARD
+ 	  Include support for MX53 ARD platform. This includes specific
+ 	  configurations for the board and its peripherals.
+ 
+-endif # ARCH_MX53_SUPPORTED
+-
+ endif
+Index: linux-3.1/arch/arm/plat-mxc/Kconfig
+===================================================================
+--- linux-3.1.orig/arch/arm/plat-mxc/Kconfig	2011-11-13 14:20:20.026839411 +0100
++++ linux-3.1/arch/arm/plat-mxc/Kconfig	2011-11-13 14:24:52.158827438 +0100
+@@ -4,12 +4,6 @@ source "arch/arm/plat-mxc/devices/Kconfi
+ 
+ menu "Freescale MXC Implementations"
+ 
+-config ARCH_MX50_SUPPORTED
+-	bool
+-
+-config ARCH_MX53_SUPPORTED
+-	bool
+-
+ choice
+ 	prompt "Freescale CPU family:"
+ 	default ARCH_MX3
+@@ -34,20 +28,14 @@ config ARCH_MX3
+ 	help
+ 	  This enables support for systems based on the Freescale i.MX3 family
+ 
+-config ARCH_MX503
+-	bool "i.MX50 + i.MX53"
+-	select ARCH_MX50_SUPPORTED
+-	select ARCH_MX53_SUPPORTED
++config ARCH_MX5
++	bool "i.MX50, i.MX51, i.MX53"
++	select AUTO_ZRELADDR
++	select ARM_PATCH_PHYS_VIRT
+ 	help
+ 	  This enables support for machines using Freescale's i.MX50 and i.MX51
+ 	  processors.
+ 
+-config ARCH_MX51
+-	bool "i.MX51"
+-	select ARCH_MX51_SUPPORTED
+-	help
+-	  This enables support for systems based on the Freescale i.MX51 family
+-
+ endchoice
+ 
+ source "arch/arm/mach-imx/Kconfig"
+Index: linux-3.1/arch/arm/plat-mxc/include/mach/memory.h
+===================================================================
+--- linux-3.1.orig/arch/arm/plat-mxc/include/mach/memory.h	2011-11-13 14:20:20.014839413 +0100
++++ linux-3.1/arch/arm/plat-mxc/include/mach/memory.h	2011-11-13 14:24:52.158827438 +0100
+@@ -31,12 +31,6 @@
+ #  define PLAT_PHYS_OFFSET		MX27_PHYS_OFFSET
+ # elif defined CONFIG_ARCH_MX3
+ #  define PLAT_PHYS_OFFSET		MX3x_PHYS_OFFSET
+-# elif defined CONFIG_ARCH_MX50
+-#  define PLAT_PHYS_OFFSET		MX50_PHYS_OFFSET
+-# elif defined CONFIG_ARCH_MX51
+-#  define PLAT_PHYS_OFFSET		MX51_PHYS_OFFSET
+-# elif defined CONFIG_ARCH_MX53
+-#  define PLAT_PHYS_OFFSET		MX53_PHYS_OFFSET
+ # endif
+ #endif
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 19:27:56 2011	(r18265)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 19:42:28 2011	(r18266)
@@ -63,3 +63,4 @@
 # Defer until we're sure about the system call number
 #+ bugfix/ia64/ia64-Add-accept4-syscall.patch
 + bugfix/arm/ixp4xx_iobe.patch
++ features/arm/allow_imx5x_build.patch

