<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16056">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysmoOCTSIM: Proper Makefile targets<br><br>It's really bad practsie to generate different output files from one<br>target, which breaks dependency generation and the like.  Let's have<br>separate Makefile targets for each output file we generate, all<br>depending on the .elf file.<br><br>Change-Id: Ie83722a9b61cfcd9865950ab4c088f59a15427ba<br>---<br>M sysmoOCTSIM/gcc/Makefile<br>1 file changed, 18 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/56/16056/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile</span><br><span>index d98277a..4a03a3a 100644</span><br><span>--- a/sysmoOCTSIM/gcc/Makefile</span><br><span>+++ b/sysmoOCTSIM/gcc/Makefile</span><br><span>@@ -153,7 +153,13 @@</span><br><span> vpath %.S ../</span><br><span> </span><br><span> # All Target</span><br><span style="color: hsl(0, 100%, 40%);">-all: $(SUB_DIRS) $(OUTPUT_FILE_PATH) sysmoOCTSIM.elf sysmoOCTSIM.bin</span><br><span style="color: hsl(120, 100%, 40%);">+all: $(SUB_DIRS) elf bin ihex eep lss</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+elf: $(OUTPUT_FILE_NAME).elf sysmoOCTSIM.elf</span><br><span style="color: hsl(120, 100%, 40%);">+bin: $(OUTPUT_FILE_NAME).bin sysmoOCTSIM.elf</span><br><span style="color: hsl(120, 100%, 40%);">+ihex: $(OUTPUT_FILE_NAME).ihex</span><br><span style="color: hsl(120, 100%, 40%);">+eep: $(OUTPUT_FILE_NAME).eep</span><br><span style="color: hsl(120, 100%, 40%);">+lss: $(OUTPUT_FILE_NAME).lss</span><br><span> </span><br><span> # Linker target</span><br><span> </span><br><span>@@ -167,13 +173,18 @@</span><br><span> -L"../gcc/gcc"</span><br><span>      @echo Finished building target: $@</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  $(OBJCOPY) -O binary "$(OUTPUT_FILE_NAME).elf" "$(OUTPUT_FILE_NAME).bin"</span><br><span style="color: hsl(0, 100%, 40%);">-    $(OBJCOPY) -O ihex -R .eeprom -R .fuse -R .lock -R .signature  \</span><br><span style="color: hsl(0, 100%, 40%);">-                "$(OUTPUT_FILE_NAME).elf" "$(OUTPUT_FILE_NAME).hex"</span><br><span style="color: hsl(120, 100%, 40%);">+%.bin: %.elf</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OBJCOPY) -O binary $< $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.ihex: %.elf</span><br><span style="color: hsl(120, 100%, 40%);">+        $(OBJCOPY) -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.eep: %.elf</span><br><span>       $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma \</span><br><span style="color: hsl(0, 100%, 40%);">-             .eeprom=0 --no-change-warnings -O binary "$(OUTPUT_FILE_NAME).elf" \</span><br><span style="color: hsl(0, 100%, 40%);">-          "$(OUTPUT_FILE_NAME).eep" || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-   $(OBJDUMP) -h -S "$(OUTPUT_FILE_NAME).elf" > "$(OUTPUT_FILE_NAME).lss"</span><br><span style="color: hsl(120, 100%, 40%);">+         .eeprom=0 --no-change-warnings -O binary $< $@ || exit 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.lss: %.elf</span><br><span style="color: hsl(120, 100%, 40%);">+   $(OBJDUMP) -h -S $< > $@</span><br><span>       $(SIZE) "$(OUTPUT_FILE_NAME).elf"</span><br><span> </span><br><span> sysmoOCTSIM.elf: $(OUTPUT_FILE_PATH)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16056">change 16056</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16056"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie83722a9b61cfcd9865950ab4c088f59a15427ba </div>
<div style="display:none"> Gerrit-Change-Number: 16056 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>