firmware: Fix unused-var and type mismatch error in recent gcc (7+).

timvideos · Aug 19, 2018 · 7f1285a · 7f1285a
1 parent 95aa9e3
commit 7f1285a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/firmware/ci.c b/firmware/ci.c
@@ -724,7 +724,7 @@ static void video_mode_set(int mode)
 static void video_mode_secondary(char *str)
 {
 	char *token;
-	if((token = get_token(&str)) == '\0') return;
+	if((* (token = get_token(&str))) == '\0') return;
 
 	if(strcmp(token, "off") == 0) {
 		wprintf("Turning off secondary video mode\n");

diff --git a/firmware/pll.c b/firmware/pll.c
@@ -70,6 +70,8 @@ void pll_config_for_clock(int freq)
 	 * Reproducible both with DRP and initial reconfiguration.
 	 * Until this spartan6 weirdness is sorted out, just stick to 20x.
 	 */
+
+	(void) pll_config_10x[0]; // Dummy access to suppress to suppress -Werror=unused-const-variable.
 	program_data(pll_config_20x);
 #ifdef XILINX_SPARTAN6_WORKS_AMAZINGLY_WELL
 	if(freq < 2000)