diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
| commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
| tree | f448089740af77c2987d12e2dd5b753b7659586f /common/Makefile | |
| parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
| parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
| download | talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.gz talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.zip | |
Merge git://git.denx.de/u-boot-dm
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 b23f312006..f9b26b7bbe 100644 --- a/common/Makefile +++ b/common/Makefile @@ -84,6 +84,8 @@ obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o obj-$(CONFIG_LYNXKDI) += lynxkdi.o obj-$(CONFIG_MENU) += menu.o +obj-$(CONFIG_CMD_SATA) += sata.o +obj-$(CONFIG_SCSI) += scsi.o obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_DFU_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o @@ -112,6 +114,9 @@ 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 endif +ifdef CONFIG_SPL_SATA_SUPPORT +obj-$(CONFIG_SCSI) += scsi.o +endif endif #environment obj-y += env_common.o @@ -130,6 +135,7 @@ obj-y += dlmalloc.o ifdef CONFIG_SYS_MALLOC_F_LEN obj-y += malloc_simple.o endif +obj-$(CONFIG_CMD_IDE) += ide.o obj-y += image.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o obj-$(CONFIG_$(SPL_)OF_LIBFDT) += image-fdt.o |
