From mboxrd@z Thu Jan  1 00:00:00 1970
From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Thu, 29 Nov 2018 10:16:50 +0100
Subject: [U-Boot] [PATCH v2 01/24] Makefile: move MTD-related lines in
 coherent Makefiles
In-Reply-To: <20181129004623.084c2d50@bbrezillon>
References: <20181128230800.13292-1-miquel.raynal@bootlin.com>
 <20181128230800.13292-2-miquel.raynal@bootlin.com>
 <20181129004623.084c2d50@bbrezillon>
Message-ID: <20181129101650.4a44d06a@xps13>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
To: u-boot@lists.denx.de

Hi Boris,

Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 29 Nov 2018
00:46:23 +0100:

> On Thu, 29 Nov 2018 00:07:37 +0100
> Miquel Raynal <miquel.raynal@bootlin.com> wrote:
>=20
>=20
> > --- a/drivers/Makefile
> > +++ b/drivers/Makefile
> > @@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) +=3D misc=
/ sysreset/ firmware/
> >  obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) +=3D i2c/
> >  obj-$(CONFIG_$(SPL_TPL_)LED) +=3D led/
> >  obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) +=3D mmc/
> > -obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) +=3D mtd/nand/raw/
> > +obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) +=3D mtd/nand/ =20
>=20
> Can't we have
> 					 +=3D mtd/
>=20
> instead?

You are right the SPL Makefile lines needs to be improved as well. I
propose the following diff for that.


Thanks,
Miqu=C3=A8l

---

--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -6,12 +6,11 @@ obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) +=3D misc/ =
sysreset/ firmware/
 obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) +=3D i2c/
 obj-$(CONFIG_$(SPL_TPL_)LED) +=3D led/
 obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) +=3D mmc/
-obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) +=3D mtd/nand/
+obj-y +=3D mtd/
 obj-$(CONFIG_$(SPL_TPL_)PHY) +=3D phy/
 obj-$(CONFIG_$(SPL_TPL_)PINCTRL) +=3D pinctrl/
 obj-$(CONFIG_$(SPL_TPL_)RAM) +=3D ram/
 obj-$(CONFIG_$(SPL_TPL_)SERIAL_SUPPORT) +=3D serial/
-obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPORT) +=3D mtd/spi/
 obj-$(CONFIG_$(SPL_TPL_)SPI_SUPPORT) +=3D spi/
 obj-$(CONFIG_$(SPL_TPL_)TIMER) +=3D timer/
 obj-$(CONFIG_$(SPL_TPL_)VIRTIO) +=3D virtio/
@@ -33,9 +32,6 @@ obj-$(CONFIG_SPL_POWER_SUPPORT) +=3D power/ power/pmic/
 obj-$(CONFIG_SPL_POWER_SUPPORT) +=3D power/regulator/
 obj-$(CONFIG_SPL_POWER_DOMAIN) +=3D power/domain/
 obj-$(CONFIG_SPL_DM_RESET) +=3D reset/
-obj-$(CONFIG_SPL_MTD_SUPPORT) +=3D mtd/
-obj-$(CONFIG_SPL_ONENAND_SUPPORT) +=3D mtd/onenand/
-obj-$(CONFIG_SPL_UBI) +=3D mtd/ubispl/
 obj-$(CONFIG_SPL_DMA_SUPPORT) +=3D dma/
 obj-$(CONFIG_SPL_ETH_SUPPORT) +=3D net/
 obj-$(CONFIG_SPL_ETH_SUPPORT) +=3D net/phy/
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 7574084f36..5e2caa9e46 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -3,23 +3,29 @@
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, wd at denx.de.
=20
-obj-$(CONFIG_MTD) +=3D mtdcore.o mtdpart.o mtd_uboot.o
-obj-$(CONFIG_DM_MTD) +=3D mtd-uclass.o
-obj-$(CONFIG_MTD_CONCAT) +=3D mtdconcat.o
-obj-$(CONFIG_ALTERA_QSPI) +=3D altera_qspi.o
-obj-$(CONFIG_FLASH_CFI_DRIVER) +=3D cfi_flash.o
-obj-$(CONFIG_FLASH_CFI_MTD) +=3D cfi_mtd.o
-obj-$(CONFIG_FLASH_CFI_LEGACY) +=3D jedec_flash.o
-obj-$(CONFIG_MW_EEPROM) +=3D mw_eeprom.o
-obj-$(CONFIG_FLASH_PIC32) +=3D pic32_flash.o
-obj-$(CONFIG_ST_SMI) +=3D st_smi.o
-obj-$(CONFIG_STM32_FLASH) +=3D stm32_flash.o
-obj-$(CONFIG_RENESAS_RPC_HF) +=3D renesas_rpc_hf.o
+mtd-$(CONFIG_MTD) +=3D mtdcore.o mtdpart.o mtd_uboot.o
+mtd-$(CONFIG_DM_MTD) +=3D mtd-uclass.o
+mtd-$(CONFIG_MTD_CONCAT) +=3D mtdconcat.o
+mtd-$(CONFIG_ALTERA_QSPI) +=3D altera_qspi.o
+mtd-$(CONFIG_FLASH_CFI_DRIVER) +=3D cfi_flash.o
+mtd-$(CONFIG_FLASH_CFI_MTD) +=3D cfi_mtd.o
+mtd-$(CONFIG_FLASH_CFI_LEGACY) +=3D jedec_flash.o
+mtd-$(CONFIG_MW_EEPROM) +=3D mw_eeprom.o
+mtd-$(CONFIG_FLASH_PIC32) +=3D pic32_flash.o
+mtd-$(CONFIG_ST_SMI) +=3D st_smi.o
+mtd-$(CONFIG_STM32_FLASH) +=3D stm32_flash.o
+mtd-$(CONFIG_RENESAS_RPC_HF) +=3D renesas_rpc_hf.o
=20
-# SPL will manually build the files it needs
 ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
+obj-y +=3D mtd.o
 obj-y +=3D nand/
 obj-y +=3D onenand/
 obj-y +=3D spi/
 obj-$(CONFIG_MTD_UBI) +=3D ubi/
+else
+obj-$(CONFIG_SPL_MTD_SUPPORT) +=3D mtd.o
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) +=3D nand/
+obj-$(CONFIG_SPL_ONENAND_SUPPORT) +=3D onenand/
+obj-$(CONFIG_$(SPL_TPL_)SPI_FLASH_SUPPORT) +=3D spi/
+obj-$(CONFIG_SPL_UBI) +=3D ubispl/
 endif
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index e5849dc02a..96e186600a 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0+
=20
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
 nandcore-objs :=3D core.o bbt.o
 obj-$(CONFIG_MTD_NAND_CORE) +=3D nandcore.o
 obj-$(CONFIG_MTD_RAW_NAND) +=3D raw/
 obj-$(CONFIG_MTD_SPI_NAND) +=3D spi/
+else
+obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) +=3D raw/
+endif