Patchwork ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices

login
register
mail settings
Submitter Fabio Estevam
Date Nov. 26, 2012, 4:11 p.m.
Message ID <1353946282-12439-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/201718/
State New
Headers show

Comments

Fabio Estevam - Nov. 26, 2012, 4:11 p.m.
Move platform-mx2-emma to arch/arm/mach-imx/devices and fix the following build
error:

make[2]: *** No rule to make target `arch/arm/mach-imx/devices/platform-mx2-emma.o', needed by `arch/arm/mach-imx/devices/built-in.o'.  Stop.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 .../devices/platform-mx2-emma.c                    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-emma.c (94%)
Fabio Estevam - Nov. 30, 2012, 9 p.m.
Hi Sascha,

On Mon, Nov 26, 2012 at 2:11 PM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> Move platform-mx2-emma to arch/arm/mach-imx/devices and fix the following build
> error:
>
> make[2]: *** No rule to make target `arch/arm/mach-imx/devices/platform-mx2-emma.o', needed by `arch/arm/mach-imx/devices/built-in.o'.  Stop.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Could this one be applied, so that linux-next can be built again form
imx_v4_v5_defconfig?

Regards,

Fabio Estevam
Fabio Estevam - Dec. 11, 2012, 5:06 p.m.
On Fri, Nov 30, 2012 at 7:00 PM, Fabio Estevam <festevam@gmail.com> wrote:

> Could this one be applied, so that linux-next can be built again form
> imx_v4_v5_defconfig?

Ping?
Sascha Hauer - Dec. 17, 2012, 10:22 a.m.
On Mon, Nov 26, 2012 at 02:11:22PM -0200, Fabio Estevam wrote:
> Move platform-mx2-emma to arch/arm/mach-imx/devices and fix the following build
> error:
> 
> make[2]: *** No rule to make target `arch/arm/mach-imx/devices/platform-mx2-emma.o', needed by `arch/arm/mach-imx/devices/built-in.o'.  Stop.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied, thanks

Sascha

> ---
>  .../devices/platform-mx2-emma.c                    |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-emma.c (94%)
> 
> diff --git a/arch/arm/plat-mxc/devices/platform-mx2-emma.c b/arch/arm/mach-imx/devices/platform-mx2-emma.c
> similarity index 94%
> rename from arch/arm/plat-mxc/devices/platform-mx2-emma.c
> rename to arch/arm/mach-imx/devices/platform-mx2-emma.c
> index 508404d..11bd01d 100644
> --- a/arch/arm/plat-mxc/devices/platform-mx2-emma.c
> +++ b/arch/arm/mach-imx/devices/platform-mx2-emma.c
> @@ -6,8 +6,8 @@
>   * the terms of the GNU General Public License version 2 as published by the
>   * Free Software Foundation.
>   */
> -#include <mach/hardware.h>
> -#include <mach/devices-common.h>
> +#include "../hardware.h"
> +#include "devices-common.h"
>  
>  #define imx_mx2_emmaprp_data_entry_single(soc)				\
>  	{								\
> -- 
> 1.7.9.5
> 
> 
>

Patch

diff --git a/arch/arm/plat-mxc/devices/platform-mx2-emma.c b/arch/arm/mach-imx/devices/platform-mx2-emma.c
similarity index 94%
rename from arch/arm/plat-mxc/devices/platform-mx2-emma.c
rename to arch/arm/mach-imx/devices/platform-mx2-emma.c
index 508404d..11bd01d 100644
--- a/arch/arm/plat-mxc/devices/platform-mx2-emma.c
+++ b/arch/arm/mach-imx/devices/platform-mx2-emma.c
@@ -6,8 +6,8 @@ 
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "../hardware.h"
+#include "devices-common.h"
 
 #define imx_mx2_emmaprp_data_entry_single(soc)				\
 	{								\