<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/14549">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tsaitgaist: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">qmod: Disable hub reset and EEPROM erase/write by default<br><br>We recently introduced ALLOW_PEER_ERASE to control if the firmware<br>should contain code for the SAM3 to reset each other on QMOD.<br><br>Let's use the same define to also remove code for putting the USB<br>hub into reset as well as code for erasing + writing the hub EEPROM.<br><br>This is needed only during production, but it shouldn't be enabled<br>during normal operation of the product at the end user.<br><br>Change-Id: I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab<br>---<br>M firmware/libboard/qmod/source/board_qmod.c<br>1 file changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/qmod/source/board_qmod.c b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>index 4d75b98..0565c92 100644</span><br><span>--- a/firmware/libboard/qmod/source/board_qmod.c</span><br><span>+++ b/firmware/libboard/qmod/source/board_qmod.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include "card_pres.h"</span><br><span> #include <osmocom/core/timer.h></span><br><span> #include "usb_buf.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "i2c.h"</span><br><span> </span><br><span> static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;</span><br><span> static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT};</span><br><span>@@ -46,6 +47,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if (ALLOW_PEER_ERASE > 0)</span><br><span> const unsigned char __eeprom_bin[256] = {</span><br><span> USB_VENDOR_OPENMOKO & 0xff,</span><br><span> USB_VENDOR_OPENMOKO >> 8,</span><br><span>@@ -69,7 +71,6 @@</span><br><span> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56, 0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "i2c.h"</span><br><span> static int write_hub_eeprom(void)</span><br><span> {</span><br><span> int i;</span><br><span>@@ -126,7 +127,7 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ALLOW_PEER_ERASE */</span><br><span> </span><br><span> static void board_exec_dbg_cmd_st12only(int ch)</span><br><span> {</span><br><span>@@ -137,12 +138,14 @@</span><br><span> return;</span><br><span> </span><br><span> switch (ch) {</span><br><span style="color: hsl(120, 100%, 40%);">+#if (ALLOW_PEER_ERASE > 0)</span><br><span> case 'E':</span><br><span> write_hub_eeprom();</span><br><span> break;</span><br><span> case 'e':</span><br><span> erase_hub_eeprom();</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ALLOW_PEER_ERASE */</span><br><span> case 'O':</span><br><span> printf("Setting PRTPWR_OVERRIDE\n\r");</span><br><span> PIO_Set(&pin_hubpwr_override);</span><br><span>@@ -151,6 +154,7 @@</span><br><span> printf("Clearing PRTPWR_OVERRIDE\n\r");</span><br><span> PIO_Clear(&pin_hubpwr_override);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+#if (ALLOW_PEER_ERASE > 0)</span><br><span> case 'H':</span><br><span> printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");</span><br><span> PIO_Clear(&pin_hub_rst);</span><br><span>@@ -170,6 +174,7 @@</span><br><span> printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r", val, addr);</span><br><span> eeprom_write_byte(0x50, addr, val);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ALLOW_PEER_ERASE */</span><br><span> case 'r':</span><br><span> printf("Please enter EEPROM offset:\n\r");</span><br><span> UART_GetIntegerMinMax(&addr, 0, 255);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/14549">change 14549</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/simtrace2/+/14549"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab </div>
<div style="display:none"> Gerrit-Change-Number: 14549 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>