diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
| commit | 6d7fae1e97d67b635a972b0f1f5c6a140c596e95 (patch) | |
| tree | 8e12b54c5b1bb7e518a920b2b8446b59f42587ae /images | |
| parent | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (diff) | |
| parent | 8cf612878ef9b297d304db1574b5604ddc675b58 (diff) | |
| download | barebox-6d7fae1e97d67b635a972b0f1f5c6a140c596e95.tar.gz barebox-6d7fae1e97d67b635a972b0f1f5c6a140c596e95.tar.xz | |
Merge branch 'for-next/omap-devicetree-prepare'
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile.socfpga | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/images/Makefile.socfpga b/images/Makefile.socfpga index 5eed83c2d9..2fca1b7ecd 100644 --- a/images/Makefile.socfpga +++ b/images/Makefile.socfpga @@ -13,22 +13,22 @@ $(obj)/%.socfpgaimg: $(obj)/% FORCE # ----------------------- Cyclone5 based boards --------------------------- pblx-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += start_socfpga_sockit_xload FILE_barebox-socfpga-sockit-xload.img = start_socfpga_sockit_xload.pblx.socfpgaimg -xload-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit-xload.img +socfpga-xload-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit-xload.img pblx-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += start_socfpga_sockit FILE_barebox-socfpga-sockit.img = start_socfpga_sockit.pblx -barebox-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit.img +socfpga-barebox-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit.img pblx-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += start_socfpga_socrates_xload FILE_barebox-socfpga-socrates-xload.img = start_socfpga_socrates_xload.pblx.socfpgaimg -xload-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates-xload.img +socfpga-xload-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates-xload.img pblx-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += start_socfpga_socrates FILE_barebox-socfpga-socrates.img = start_socfpga_socrates.pblx -barebox-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates.img +socfpga-barebox-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates.img ifdef CONFIG_ARCH_SOCFPGA_XLOAD -image-y += $(xload-y) +image-y += $(socfpga-xload-y) else -image-y += $(barebox-y) +image-y += $(socfpga-barebox-y) endif |