projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm
[oweals/u-boot.git]
/
arch
/
arm
/
mach-mvebu
/
Makefile
diff --git
a/arch/arm/mach-mvebu/Makefile
b/arch/arm/mach-mvebu/Makefile
index 02d3ce27ee74189ac0d156f39b56a98a0764d24f..b73952044de7ab07f89d6554be59ad88925be1c3 100644
(file)
--- a/
arch/arm/mach-mvebu/Makefile
+++ b/
arch/arm/mach-mvebu/Makefile
@@
-37,6
+37,9
@@
endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
KWB_CFG_BOOT_FROM=sdio
endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),)
KWB_CFG_BOOT_FROM=sdio
endif
+ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),)
+ KWB_CFG_BOOT_FROM=sata
+endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),)
KWB_CFG_BOOT_FROM=uart
endif
ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),)
KWB_CFG_BOOT_FROM=uart
endif
@@
-55,10
+58,10
@@
KWB_REPLACE += SEC_FUSE_DUMP
KWB_CFG_SEC_FUSE_DUMP = a38x
endif
KWB_CFG_SEC_FUSE_DUMP = a38x
endif
-$(
src
)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \
+$(
obj
)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \
include/config/auto.conf
$(Q)sed -ne '$(foreach V,$(KWB_REPLACE),s/^#@$(V)/$(V) $(KWB_CFG_$(V))/;)p' \
include/config/auto.conf
$(Q)sed -ne '$(foreach V,$(KWB_REPLACE),s/^#@$(V)/$(V) $(KWB_CFG_$(V))/;)p' \
- <$< >$(dir $
<
)$(@F)
+ <$< >$(dir $
@
)$(@F)
endif # CONFIG_SPL_BUILD
obj-y += gpio.o
endif # CONFIG_SPL_BUILD
obj-y += gpio.o