diff mbox

[1/2] common: Makefile: allow for spl builds with env_fat

Message ID 1411487058-29135-1-git-send-email-balbi@ti.com
State Accepted
Commit 41f1d40d9207cb6770d4cdc9e397a6e493fb4cfb
Headers show

Commit Message

Felipe Balbi Sept. 23, 2014, 3:44 p.m. UTC
If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
defined, u-boot spl will fail to build. Fix that.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 common/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Felipe Balbi Sept. 26, 2014, 12:38 a.m. UTC | #1
On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> defined, u-boot spl will fail to build. Fix that.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>

ping

> ---
>  common/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/common/Makefile b/common/Makefile
> index aca0f7f..1ff7ce0 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -233,6 +233,7 @@ obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
>  obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
>  obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
>  obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
> +obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
>  obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
>  obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
>  obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
> -- 
> 2.1.1.273.g97b8860
>
Felipe Balbi Oct. 3, 2014, 8:48 p.m. UTC | #2
On Thu, Sep 25, 2014 at 07:38:26PM -0500, Felipe Balbi wrote:
> On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> > If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> > defined, u-boot spl will fail to build. Fix that.
> > 
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> 
> ping

ping here
Tom Rini Oct. 4, 2014, 3:50 p.m. UTC | #3
On Fri, Oct 03, 2014 at 03:48:35PM -0500, Felipe Balbi wrote:
> On Thu, Sep 25, 2014 at 07:38:26PM -0500, Felipe Balbi wrote:
> > On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> > > If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> > > defined, u-boot spl will fail to build. Fix that.
> > > 
> > > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > 
> > ping
> 
> ping here

Looks fine, will take it for the next merge window.
Tom Rini Oct. 23, 2014, 5:16 p.m. UTC | #4
On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:

> If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> defined, u-boot spl will fail to build. Fix that.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>

Applied to u-boot-ti/master, thanks!
diff mbox

Patch

diff --git a/common/Makefile b/common/Makefile
index aca0f7f..1ff7ce0 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -233,6 +233,7 @@  obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
+obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o