firmware/lm32: fix warnings and use -Werror (requires Misoc update)

enjoy-digital · enjoy-digital · commit 41ab6d96d556 · 2016-01-23T10:33:44.000+01:00
diff --git a/firmware/lm32/Makefile b/firmware/lm32/Makefile
@@ -2,6 +2,8 @@
 MSCDIR=../../third_party/misoc
 include $(MSCDIR)/software/common.mak
 
+CFLAGS += -Wno-unused-function -Werror
+
 OBJECTS=isr.o \
         processor.o \
         hdmi_in0.o \
diff --git a/firmware/lm32/ci.c b/firmware/lm32/ci.c
@@ -310,7 +310,9 @@ static void video_mode_set(int mode)
 
 static void hdp_toggle(int source)
 {
+#if defined(CSR_HDMI_IN0_BASE) || defined(CSR_HDMI_IN1_BASE)
 	int i;
+#endif
 	printf("Toggling HDP on output%d\n", source);
 #ifdef CSR_HDMI_IN0_BASE
 	if(source ==  VIDEO_IN_HDMI_IN0) {
diff --git a/firmware/lm32/fx2.c b/firmware/lm32/fx2.c
@@ -24,7 +24,7 @@ enum fx2_fw_version fx2_fw_active;
 static size_t next_read_addr;
 static size_t end_addr;
 
-inline uint8_t fx2_fw_get_value(size_t addr) {
+static inline uint8_t fx2_fw_get_value(size_t addr) {
 	uint8_t r = 0xff;
 	if (addr <= end_addr) {
 		switch(fx2_fw_active) {
diff --git a/firmware/lm32/processor.c b/firmware/lm32/processor.c
@@ -347,8 +347,10 @@ static void fb_set_mode(const struct video_timing *mode)
 
 static void edid_set_mode(const struct video_timing *mode)
 {
+#if defined(CSR_HDMI_IN0_BASE) || defined(CSR_HDMI_IN1_BASE)
 	unsigned char edid[128];
 	int i;
+#endif
 #ifdef CSR_HDMI_IN0_BASE
 	generate_edid(&edid, "OHW", "TV", 2015, "HDMI2USB 1", mode);
 	for(i=0;i<sizeof(edid);i++)

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,9 @@ static void video_mode_set(int mode)`
`310`	`310`
`311`	`311`	`static void hdp_toggle(int source)`
`312`	`312`	`{`
	`313`	`+#if defined(CSR_HDMI_IN0_BASE) \|\| defined(CSR_HDMI_IN1_BASE)`
`313`	`314`	`int i;`
	`315`	`+#endif`
`314`	`316`	`printf("Toggling HDP on output%d\n", source);`
`315`	`317`	`#ifdef CSR_HDMI_IN0_BASE`
`316`	`318`	`if(source == VIDEO_IN_HDMI_IN0) {`