From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Tue, 22 Jan 2019 23:41:10 +0100 Subject: [U-Boot] [PATCH v3 2/7] dfu: Make DFU support more SPL friendly In-Reply-To: <20190117194308.29644-3-afd@ti.com> References: <20190117194308.29644-1-afd@ti.com> <20190117194308.29644-3-afd@ti.com> Message-ID: <20190122234110.06082e98@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, 17 Jan 2019 13:43:03 -0600 "Andrew F. Davis" wrote: > Do this by using $(SPL_) in Makefiles and CONFIG_IS_ENABLED in C code. > This ensures the files and features are only built into the right > build for which they are enabled. Using the macros to simplify this > patch was made possible by the config symbol rename done in the last > patch. Acked-by: Lukasz Majewski > > Signed-off-by: Andrew F. Davis > Reviewed-by: Tom Rini > --- > drivers/Makefile | 3 +-- > drivers/dfu/Makefile | 12 ++++++------ > include/dfu.h | 10 +++++----- > 3 files changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/Makefile b/drivers/Makefile > index 14543c7d6c..eca023ac04 100644 > --- a/drivers/Makefile > +++ b/drivers/Makefile > @@ -2,6 +2,7 @@ > > obj-$(CONFIG_$(SPL_TPL_)CLK) += clk/ > obj-$(CONFIG_$(SPL_TPL_)DM) += core/ > +obj-$(CONFIG_$(SPL_TPL_)DFU) += dfu/ > obj-$(CONFIG_$(SPL_TPL_)GPIO_SUPPORT) += gpio/ > obj-$(CONFIG_$(SPL_TPL_)DRIVERS_MISC_SUPPORT) += misc/ sysreset/ > firmware/ obj-$(CONFIG_$(SPL_TPL_)I2C_SUPPORT) += i2c/ > @@ -50,7 +51,6 @@ obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/ > obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ > obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ > obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ > -obj-$(CONFIG_SPL_DFU) += dfu/ > obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/ > obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/ > obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/ > @@ -86,7 +86,6 @@ obj-y += misc/ > obj-$(CONFIG_MMC) += mmc/ > obj-$(CONFIG_NVME) += nvme/ > obj-y += pcmcia/ > -obj-y += dfu/ > obj-$(CONFIG_X86) += pch/ > obj-y += phy/allwinner/ > obj-y += phy/marvell/ > diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile > index 56f9b0c5f4..4164f342ac 100644 > --- a/drivers/dfu/Makefile > +++ b/drivers/dfu/Makefile > @@ -3,9 +3,9 @@ > # Copyright (C) 2012 Samsung Electronics > # Lukasz Majewski > > -obj-$(CONFIG_DFU) += dfu.o > -obj-$(CONFIG_DFU_MMC) += dfu_mmc.o > -obj-$(CONFIG_DFU_NAND) += dfu_nand.o > -obj-$(CONFIG_DFU_RAM) += dfu_ram.o > -obj-$(CONFIG_DFU_SF) += dfu_sf.o > -obj-$(CONFIG_DFU_TFTP) += dfu_tftp.o > +obj-$(CONFIG_$(SPL_)DFU) += dfu.o > +obj-$(CONFIG_$(SPL_)DFU_MMC) += dfu_mmc.o > +obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o > +obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o > +obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o > +obj-$(CONFIG_$(SPL_)DFU_TFTP) += dfu_tftp.o > diff --git a/include/dfu.h b/include/dfu.h > index fbe978abdc..9340a900a2 100644 > --- a/include/dfu.h > +++ b/include/dfu.h > @@ -202,7 +202,7 @@ static inline void dfu_set_defer_flush(struct > dfu_entity *dfu) int dfu_write_from_mem_addr(struct dfu_entity *dfu, > void *buf, int size); > /* Device specific */ > -#ifdef CONFIG_DFU_MMC > +#if CONFIG_IS_ENABLED(DFU_MMC) > extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, > char *s); #else > static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char > *devstr, @@ -213,7 +213,7 @@ static inline int > dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, } > #endif > > -#ifdef CONFIG_DFU_NAND > +#if CONFIG_IS_ENABLED(DFU_NAND) > extern int dfu_fill_entity_nand(struct dfu_entity *dfu, char > *devstr, char *s); #else > static inline int dfu_fill_entity_nand(struct dfu_entity *dfu, char > *devstr, @@ -224,7 +224,7 @@ static inline int > dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr, } > #endif > > -#ifdef CONFIG_DFU_RAM > +#if CONFIG_IS_ENABLED(DFU_RAM) > extern int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, > char *s); #else > static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char > *devstr, @@ -235,7 +235,7 @@ static inline int > dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, } > #endif > > -#ifdef CONFIG_DFU_SF > +#if CONFIG_IS_ENABLED(DFU_SF) > extern int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, > char *s); #else > static inline int dfu_fill_entity_sf(struct dfu_entity *dfu, char > *devstr, @@ -259,7 +259,7 @@ static inline int > dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, * > * @return 0 on success, otherwise error code > */ > -#ifdef CONFIG_DFU_TFTP > +#if CONFIG_IS_ENABLED(DFU_TFTP) > int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, > unsigned int len, char *interface, char *devstring); > #else Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: