Fix merge error while integrating AT91 bootstrap patches
Signed-off-by: Bart vd. Meulen <[email protected]>
---
rules/at91bootstrap.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: ptxdist-trunk/rules/at91bootstrap.make
===================================================================
--- ptxdist-trunk.orig/rules/at91bootstrap.make 2009-06-10 10:31:15.000000000
+0200
+++ ptxdist-trunk/rules/at91bootstrap.make 2009-06-10 10:57:27.000000000
+0200
@@ -76,7 +76,7 @@ $(STATEDIR)/at91bootstrap.install:
$(STATEDIR)/at91bootstrap.targetinstall:
@$(call targetinfo)
- @cp
$(AT91BOOTSTRAP_BOARDDIR)/$(AT91BOOTSTRAP_BOOTMEDIA)_${PTXCONF_AT91BOOTSTRAP_CONFIG}.bin
\
+ @cp
$(AT91BOOTSTRAP_BOARDDIR)/$(AT91BOOTSTRAP_BOOTMEDIA-y)_${PTXCONF_AT91BOOTSTRAP_CONFIG}.bin
\
$(IMAGEDIR)/at91bootstrap.bin
@$(call touch)
--
This message and attachment(s) are intended solely for use by the addressee and
may contain information that is privileged, confidential or otherwise exempt
from disclosure under applicable law.
If you are not the intended recipient or agent thereof responsible for
delivering this message to the intended recipient, you are hereby notified that
any dissemination, distribution or copying of this communication is strictly
prohibited.
If you have received this communication in error, please notify the sender
immediately by telephone and with a 'reply' message.
Thank you for your co-operation.
--
ptxdist mailing list
[email protected]
