diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:19 +0200 |
| commit | f9dfe479ebacbb3efacef4525682546713b11597 (patch) | |
| tree | 64b26ae51c86b9b1419d8a62baf5d2f5948f3f51 /images | |
| parent | ac5e1f63aafb73a6ea2356822029ef391b6234d2 (diff) | |
| parent | 9f30aa3f143eda22ba3cf9e36c05213239a2fe83 (diff) | |
| download | barebox-f9dfe479ebacbb3efacef4525682546713b11597.tar.gz barebox-f9dfe479ebacbb3efacef4525682546713b11597.tar.xz | |
Merge branch 'for-next/stm32'
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/Makefile.stm32mp (renamed from images/Makefile.stm32mp1) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/images/Makefile b/images/Makefile index 479647a827..293e644319 100644 --- a/images/Makefile +++ b/images/Makefile @@ -140,7 +140,7 @@ include $(srctree)/images/Makefile.mxs include $(srctree)/images/Makefile.omap3 include $(srctree)/images/Makefile.rockchip include $(srctree)/images/Makefile.socfpga -include $(srctree)/images/Makefile.stm32mp1 +include $(srctree)/images/Makefile.stm32mp include $(srctree)/images/Makefile.tegra include $(srctree)/images/Makefile.vexpress include $(srctree)/images/Makefile.xburst diff --git a/images/Makefile.stm32mp1 b/images/Makefile.stm32mp index d26231cd92..c49b1d72b7 100644 --- a/images/Makefile.stm32mp1 +++ b/images/Makefile.stm32mp @@ -3,6 +3,6 @@ # barebox image generation Makefile for STMicroelectronics MP1 # -pblb-$(CONFIG_MACH_STM32MP157C_DK2) += start_stm32mp157c_dk2.pblb +pblb-$(CONFIG_MACH_STM32MP157C_DK2) += start_stm32mp157c_dk2 FILE_barebox-stm32mp157c-dk2.img = start_stm32mp157c_dk2.pblb image-$(CONFIG_MACH_STM32MP157C_DK2) += barebox-stm32mp157c-dk2.img |