From mboxrd@z Thu Jan  1 00:00:00 1970
From: Boris Brezillon <boris.brezillon@bootlin.com>
Date: Tue, 31 Jul 2018 21:25:53 +0200
Subject: [U-Boot] [PATCH v5 00/27] SPI-NAND support
In-Reply-To: <CAMty3ZDjtkwYWnGX2NLRSrDTALPN8hY-4-ggap0iB_BGwEt=Uw@mail.gmail.com>
References: <20180730154657.20738-1-miquel.raynal@bootlin.com>
 <CAMty3ZBPCy6GSjTNEgbZp=orPH2==OUBWB5Wpd6ZydJ0=CuSsA@mail.gmail.com>
 <CAMty3ZDjtkwYWnGX2NLRSrDTALPN8hY-4-ggap0iB_BGwEt=Uw@mail.gmail.com>
Message-ID: <20180731212553.7f26b368@bbrezillon>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Jagan,

On Tue, 31 Jul 2018 20:03:47 +0530
Jagan Teki <jagan@amarulasolutions.com> wrote:

> > Applied to u-boot-spi/master  
> 
> Look like we have some build issues [1]?

Yep, I reproduced the issue. Looks like u-boot Makefile hierarchy is a
bit different from Linux one, and patch is breaking raw/parallel NAND
build. I fixed it up (see below diff). This diff should be merged in
patch 9, and you'll have to fix a few conflicts when rebasing. Here is
a branch [1] containing this fixup commit (placed just after the
offending one) in case you want to check the end result. 

Regards,

Boris

[1]https://github.com/bbrezillon/u-boot/commits/wip-spi

--->8---
diff --git a/Makefile b/Makefile
index 884b7d943cf7..a38146003d77 100644
--- a/Makefile
+++ b/Makefile
@@ -685,7 +685,7 @@ libs-y += drivers/dma/
 libs-y += drivers/gpio/
 libs-y += drivers/i2c/
 libs-y += drivers/mtd/
-libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/
+libs-$(CONFIG_CMD_NAND) += drivers/mtd/nand/raw/
 libs-y += drivers/mtd/onenand/
 libs-$(CONFIG_CMD_UBI) += drivers/mtd/ubi/
 libs-y += drivers/mtd/spi/
diff --git a/drivers/Makefile b/drivers/Makefile
index 276e5ee4d7ee..ccd1b648d058 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ firmware/
 obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) += i2c/
 obj-$(CONFIG_$(SPL_TPL_)LED) += led/
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += mmc/
-obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += mtd/nand/raw/
 obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/
 obj-$(CONFIG_$(SPL_TPL_)PINCTRL) += pinctrl/
 obj-$(CONFIG_$(SPL_TPL_)RAM) += ram/
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 8b2d0e118d1c..69f40d15635d 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,3 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0+
 
-obj-$(CONFIG_MTD_NAND) += raw/