diff options
| author | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
| commit | 5fb29f3c48d26981b117b08286bc16ec99d4ca0b (patch) | |
| tree | b4a4c5b5cc88fedc568bcb49e248e9561a884ef4 /common/Makefile | |
| parent | 30a3f3881e44187f21eb08bf8601ed4adaf4ca0e (diff) | |
| parent | 55b523b7d4ab885142f77d388007eb5490ba6bf4 (diff) | |
| download | talos-obmc-uboot-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.tar.gz talos-obmc-uboot-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.zip | |
Merge branch 'ext4'
Update Makefile change for LIBS -> LIBS-y change.
Conflicts:
Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 57da76f908..22e8a6fb35 100644 --- a/common/Makefile +++ b/common/Makefile @@ -86,7 +86,13 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o +COBJS-$(CONFIG_CMD_EXT4) += cmd_ext4.o COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o +ifdef CONFIG_CMD_EXT4 +COBJS-y += cmd_ext_common.o +else +COBJS-$(CONFIG_CMD_EXT2) += cmd_ext_common.o +endif COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o |
