Skip to contentSkip to conversation

NAND: MXS: include common.h first so cache.h is included in correct order

PATCH New Tom Warren 5 participants 7 messages Sep 10, 2012 – Sep 11, 2012

Subsystems (3)
Arm i.MX and Layerscape Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Tom Warren

author
#0 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>
---
 drivers/mtd/nand/mxs_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/mxs_nand.c +1 -1
index bf9414f..4701be8 100644
@@ -25,10 +25,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <common.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/types.h>
-#include <common.h>
 #include <malloc.h>
 #include <asm/errno.h>
 #include <asm/io.h>
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

Quoted 5 lines · Tom Warren

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>

Thanks Tom.

Acked-by Simon Glass <[email protected]>
Quoted 23 lines
---
 drivers/mtd/nand/mxs_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/mxs_nand.c +1 -2
index bf9414f..4701be8 100644
@@ -25,10 +25,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <common.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/types.h>
-#include <common.h>
 #include <malloc.h>
 #include <asm/errno.h>
 #include <asm/io.h>
--

1.7.0.4

#2 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

In reply to Tom Warren

Dear Tom Warren,

Quoted 5 lines

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>
Acked-by Marek Vasut <[email protected]>

Ccing Stefano.

Quoted 10 lines
---
 drivers/mtd/nand/mxs_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/mxs_nand.c +0 -0
index bf9414f..4701be8 100644
@@ -25,10 +25,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

drivers/mtd/nand/mxs_nand.c line 34

Quoted 10 lines
drivers/mtd/nand/mxs_nand.c +1 -1
  */
 
+#include <common.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/types.h>
-#include <common.h>
 #include <malloc.h>
 #include <asm/errno.h>
 #include <asm/io.h>

Best regards,
Marek Vasut

#3 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

Marek/Simon,

Quoted 11 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, September 10, 2012 9:19 AM
To: Tom Warren; sjg at chromium.org
Cc: u-boot at lists.denx.de; scottwood at freescale.com; Tom Warren; sbabic at denx.de
Subject: Re: [PATCH] NAND: MXS: include common.h first so cache.h is included in correct order

Dear Tom Warren,

Quoted 7 lines
Quoted 5 lines

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>
Acked-by Marek Vasut <[email protected]>

Thanks. Applied to u-boot-tegra/next and pushed. I'll be moving /next to /master today or tomorrow and sending a new pull request to Albert to clear the decks for T30 support.

Tom

Quoted 26 lines

Ccing Stefano.

Quoted 10 lines
---
 drivers/mtd/nand/mxs_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mtd/nand/mxs_nand.c +0 -0
index bf9414f..4701be8 100644
@@ -25,10 +25,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

drivers/mtd/nand/mxs_nand.c line 34

Quoted 10 lines
drivers/mtd/nand/mxs_nand.c +1 -1
  */
 
+#include <common.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/types.h>
-#include <common.h>
 #include <malloc.h>
 #include <asm/errno.h>
 #include <asm/io.h>

Best regards,
Marek Vasut

Signature · 1 line
nvpublic
#4 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

Am 10/09/2012 22:20, schrieb Tom Warren:

Quoted 2 lines

Marek/Simon,

Hi Tom,

Quoted 11 lines
Quoted 11 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, September 10, 2012 9:19 AM
To: Tom Warren; sjg at chromium.org
Cc: u-boot at lists.denx.de; scottwood at freescale.com; Tom Warren; sbabic at denx.de
Subject: Re: [PATCH] NAND: MXS: include common.h first so cache.h is included in correct order

Dear Tom Warren,

Quoted 9 lines
Quoted 7 lines
Quoted 5 lines

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>
Acked-by Marek Vasut <[email protected]>

Thanks. Applied to u-boot-tegra/next and pushed. I'll be moving /next to /master today or tomorrow and sending a new pull request to Albert to clear the decks for T30 support.

That's ok, but should this not be merged instead into the i.MX repository ? That is also the reason why Marek CCed to me.

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#5 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

Dear stefano babic,

Quoted 23 lines

Am 10/09/2012 22:20, schrieb Tom Warren:

Quoted 1 line

Marek/Simon,

Hi Tom,

Quoted 18 lines
Quoted 18 lines

-----Original Message-----
From: Marek Vasut [mailto:marex at denx.de]
Sent: Monday, September 10, 2012 9:19 AM
To: Tom Warren; sjg at chromium.org
Cc: u-boot at lists.denx.de; scottwood at freescale.com; Tom Warren; sbabic at denx.de
Subject: Re: [PATCH] NAND: MXS: include common.h first so cache.h is included in correct order

Dear Tom Warren,

Quoted 6 lines

With Simon Glass's include/nand.h alignment changes, some mxs builds were generating errors. Fix is to ensure asm/cache.h is included before linux/mtd/nand.h. Moving common.h to top of include list does that.

Signed-off-by Tom Warren <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Acked-by Marek Vasut <[email protected]>

Thanks. Applied to u-boot-tegra/next and pushed. I'll be moving /next to /master today or tomorrow and sending a new pull request to Albert to clear the decks for T30 support.

That's ok, but should this not be merged instead into the i.MX repository ? That is also the reason why Marek CCed to me.

There's some rework of MTD going on in the tegra tree, I'd say let it slide, it won't cause conflict.

Best regards,
Marek Vasut

#6 lore raw

PATCH 1/1 NAND: MXS: include common.h first so cache.h is included in correct order

Quoted 2 lines · Marek Vasut

There's some rework of MTD going on in the tegra tree, I'd say let it slide, it won't cause conflict.

Ok, that is fine with me ;-)

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================