[U-Boot] NAND: MXS: include common.h first so cache.h is included in correct order

Submitted by Tom Warren on Sept. 10, 2012, 3:55 p.m.

Details

Message ID 1347292557-4478-1-git-send-email-twarren@nvidia.com
State Accepted
Commit 651eb7322407173d5f1ac5a149e381a4044858f4
Delegated to: Stefano Babic
Headers show

Commit Message

Tom Warren Sept. 10, 2012, 3:55 p.m.
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 <twarren@nvidia.com>
---
 drivers/mtd/nand/mxs_nand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Simon Glass Sept. 10, 2012, 3:58 p.m.
On Mon, Sep 10, 2012 at 8:55 AM, Tom Warren <twarren.nvidia@gmail.com> wrote:
> 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 <twarren@nvidia.com>

Thanks Tom.

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  drivers/mtd/nand/mxs_nand.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
> index bf9414f..4701be8 100644
> --- a/drivers/mtd/nand/mxs_nand.c
> +++ b/drivers/mtd/nand/mxs_nand.c
> @@ -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
>
Marek Vasut Sept. 10, 2012, 4:18 p.m.
Dear 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 <twarren@nvidia.com>

Acked-by: Marek Vasut <marex@denx.de>

Ccing Stefano.

> ---
>  drivers/mtd/nand/mxs_nand.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
> index bf9414f..4701be8 100644
> --- a/drivers/mtd/nand/mxs_nand.c
> +++ b/drivers/mtd/nand/mxs_nand.c
> @@ -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>

Best regards,
Marek Vasut
Stefano Babic Sept. 11, 2012, 4:32 a.m.
Am 10/09/2012 22:20, schrieb Tom Warren:
> Marek/Simon,
> 

Hi Tom,

>> -----Original Message-----
>> From: Marek Vasut [mailto:marex@denx.de]
>> Sent: Monday, September 10, 2012 9:19 AM
>> To: Tom Warren; sjg@chromium.org
>> Cc: u-boot@lists.denx.de; scottwood@freescale.com; Tom Warren;
>> sbabic@denx.de
>> Subject: Re: [PATCH] NAND: MXS: include common.h first so cache.h is
>> included in correct order
>>
>> Dear 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 <twarren@nvidia.com>
>>
>> Acked-by: Marek Vasut <marex@denx.de>
> 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
Marek Vasut Sept. 11, 2012, 6:52 a.m.
Dear stefano babic,

> Am 10/09/2012 22:20, schrieb Tom Warren:
> > Marek/Simon,
> 
> Hi Tom,
> 
> >> -----Original Message-----
> >> From: Marek Vasut [mailto:marex@denx.de]
> >> Sent: Monday, September 10, 2012 9:19 AM
> >> To: Tom Warren; sjg@chromium.org
> >> Cc: u-boot@lists.denx.de; scottwood@freescale.com; Tom Warren;
> >> sbabic@denx.de
> >> Subject: Re: [PATCH] NAND: MXS: include common.h first so cache.h is
> >> included in correct order
> >> 
> >> Dear 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 <twarren@nvidia.com>
> >> 
> >> Acked-by: Marek Vasut <marex@denx.de>
> > 
> > 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
Stefano Babic Sept. 11, 2012, 7:44 a.m.
On 11/09/2012 08:52, Marek Vasut wrote:

> 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

Patch hide | download patch | download mbox

diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
index bf9414f..4701be8 100644
--- a/drivers/mtd/nand/mxs_nand.c
+++ b/drivers/mtd/nand/mxs_nand.c
@@ -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>