[U-Boot] [PATCH] 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 twarren@nvidia.com --- 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>
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
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
Marek/Simon,
-----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.
Tom
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
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
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
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
participants (6)
-
Marek Vasut -
Simon Glass -
Stefano Babic -
stefano babic
-
Tom Warren -
Tom Warren