[U-Boot] [PATCH v7 06/34] sf: Fix Makefile

Bin Meng
2015-12-03T10:20:03Z

On Thu, Nov 26, 2015 at 8:03 PM, Jagan Teki <jteki@openedev.com> wrote:
> This patch removes unneeded ifdef and fixed accordingly.
>
> Signed-off-by: Jagan Teki <jteki@openedev.com>
> ---
> drivers/mtd/spi/Makefile | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
> index cf4e7e1..a24f761 100644
> --- a/drivers/mtd/spi/Makefile
> +++ b/drivers/mtd/spi/Makefile
> @@ -12,11 +12,7 @@ obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o
> obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o
> endif
>
> -#ifndef CONFIG_DM_SPI
> -obj-$(CONFIG_SPI_FLASH) += sf_probe.o
> -#endif
> -obj-$(CONFIG_CMD_SF) += sf.o
> -obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o
> +obj-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o sf_params.o sf.o
> obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o
> obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o
> obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
> --

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>