Makefile: remove automatic include of wrc.h

Adjust files.

Makefile: remove automatic include of wrc.h
Adjust files.
70e6c863 · Tristan Gingold · cc88f249 · 70e6c863 · 70e6c863 · 70e6c863
Commit 70e6c863 authored Apr 05, 2022 by Tristan Gingold
19 changed files
--- a/Makefile
+++ b/Makefile
@@ -142,8 +142,7 @@ obj-$(CONFIG_ARCH_RISCV) += check-error.o
 obj-y += system_checks.o

 CFLAGS = $(cflags-y) -Wall -Werror -Wstrict-prototypes \
-	-ffunction-sections -fdata-sections -Os \
-	-include include/wrc.h -ggdb 
+	-ffunction-sections -fdata-sections -Os -ggdb

 ldflags-$(CONFIG_LTO) += -flto


--- a/boards/generic/board.c
+++ b/boards/generic/board.c
 #include "board.h"
+#include "wrc-debug.h"
 #include "dev/bb_spi.h"
 #include "dev/bb_i2c.h"
 #include "dev/w1.h"

--- a/dev/ad9520.c
+++ b/dev/ad9520.c
@@ -18,6 +18,7 @@
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include "wrc-debug.h"
 #include "dev/ad9520.h"
 #include "dev/bb_i2c.h"


--- a/dev/bb_i2c.c
+++ b/dev/bb_i2c.c
@@ -7,13 +7,14 @@
 *
 * Released according to the GNU GPL, version 2 or any later version.
 */
+#include <errno.h>
+
 #include "types.h"
 #include "board.h"
 #include "dev/syscon.h"
 #include "dev/bb_i2c.h"
 #include "dev/gpio.h"
-
-#include <errno.h>
+#include "pp-printf.h"

 void bb_i2c_delay(uint32_t delay)
 {

--- a/dev/bb_spi.c
+++ b/dev/bb_spi.c
@@ -21,6 +21,7 @@
 #include <stdint.h>

 #include "board.h"
+#include "pp-printf.h"
 #include "dev/gpio.h"
 #include "dev/bb_spi.h"

@@ -193,4 +194,4 @@ void bb_spi_test(struct spi_bus *bus)
        gen_gpio_out( bus->pin_mosi, 1 );
        gen_gpio_out( bus->pin_mosi, 0 );
    }
-}
\ No newline at end of file
+}
--- a/dev/fine_pulse_generator.c
+++ b/dev/fine_pulse_generator.c
@@ -21,6 +21,7 @@
 /* fine_pulse-gen - driver for DDS Sync Unit (fine pulse generator) */

 #include "board.h"
+#include "dev/syscon.h"

 #include "hw/wb_fine_pulse_gen.h"
 #include "dev/fine_pulse_generator.h"

--- a/dev/iuart.c
+++ b/dev/iuart.c
@@ -20,17 +20,15 @@


 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>

+#include "board.h"
 #include "dev/iuart.h"

 // bare-metal version with real HW iuart

 #ifdef IUART_PLATFORM_BARE_METAL

-#include "board.h"
-
 #include <hw/wb_insn_uart.h>
 #include <hw/wb_uart.h>


--- a/dev/sdbfs.c
+++ b/dev/sdbfs.c
@@ -10,6 +10,8 @@

 /* To avoid many #ifdef and associated mess, all headers are included there */
 #include "libsdbfs.h"
+#include "dev/bb_i2c.h"
+#include "dev/i2c_eeprom.h"
 #include "storage.h"

 /*

--- a/dev/sfp.c
+++ b/dev/sfp.c
@@ -9,11 +9,12 @@
 */
 /* SFP Detection / managenent functions */

-#include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
 #include <errno.h>

+#include "wrc-task.h"
+#include "pp-printf.h"
 #include "dev/syscon.h"
 #include "dev/bb_i2c.h"
 #include "dev/gpio.h"

--- a/dev/simple_uart.c
+++ b/dev/simple_uart.c
@@ -9,6 +9,7 @@

 #include <stdint.h>

+#include "wrc.h"
 #include "board.h"
 #include "dev/simple_uart.h"


--- a/dev/spi_flash.c
+++ b/dev/spi_flash.c
@@ -8,6 +8,7 @@
 */
 #include <types.h>

+#include "wrc-debug.h"
 #include "dev/bb_spi.h"
 #include "dev/spi_flash.h"


--- a/dev/syscon.c
+++ b/dev/syscon.c
@@ -7,11 +7,11 @@
 * Released according to the GNU GPL, version 2 or any later version.
 */

-#include "dev/syscon.h"
-
 #include <errno.h>
 #include <string.h>

+#include "dev/syscon.h"
+#include "pp-printf.h"
 #include "dev/gpio.h"
 #include "dev/bb_i2c.h"


--- a/dev/wdiags.c
+++ b/dev/wdiags.c
@@ -7,14 +7,14 @@
 * Released according to the GNU GPL, version 2 or any later version.
 */

+#include <errno.h>
+#include <string.h>

 #include "board.h"
 #include "dev/wdiags.h"
-
+#include "wrc-debug.h"
 #include <hw/wrc_diags_regs.h>

-#include <errno.h>
-#include <string.h>

 #define WDIAGS_VERSION 2


--- a/dump-info.c
+++ b/dump-info.c
@@ -5,6 +5,7 @@
 #include <wrc_global.h>
 #include <sensors.h>

+#include <wrc.h>
 #include <wrpc.h>

 #include "dump-info.h"

--- a/lib/event.c
+++ b/lib/event.c
@@ -9,6 +9,7 @@

 #include <stdint.h>

+#include "board.h"
 #include "event.h"

 // fixme: make configurable through BSPs/KConfig

--- a/lib/events-ptp.c
+++ b/lib/events-ptp.c
@@ -8,6 +8,9 @@
 */

 #include <wrpc.h>
+#include "board.h"
+#include "wrc-debug.h"
+#include "wrc-event.h"
 #include "event.h"

 static int prev_ptp_mode;

--- a/lib/lldp.c
+++ b/lib/lldp.c
@@ -14,6 +14,7 @@

 #include <string.h>

+#include "wrc.h"
 #include "revision.h"
 #include "ptpd_netif.h"
 #include "lldp.h"

--- a/lib/net.c
+++ b/lib/net.c
@@ -8,13 +8,13 @@
 *
 * Released according to the GNU GPL, version 2 or any later version.
 */
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdarg.h>

 #include "hal_exports.h"
 #include <wrpc.h>
+#include "wrc.h"
 #include "ptpd_netif.h"

 #include "board.h"

--- a/shell/cmd_sdb.c
+++ b/shell/cmd_sdb.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <errno.h>

+#include "pp-printf.h"
 #include "shell.h"
 #include "dev/syscon.h"
 #include "storage.h"