Revert "ppsi: pick new master and act accordingly"

This reverts commit 03062ea3. The patch is wrong, because it duplicates 9491e61b ppsi: pick new master and fix building accordingly which does the "fixing" in a more elegant way. With both in history, we now have ./ppsi/include/generated/autoconf.h:13:0: warning: "CONFIG_VLAN_ARRAY_SIZE" redefined generated/autoconf.h:14:0: note: this is the previous definition Besides, the reverted commit was not even using new ppsi master (we did it before this commit). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

Revert "ppsi: pick new master and act accordingly"
This reverts commit 03062ea3. The patch is wrong, because it duplicates 9491e61b ppsi: pick new master and fix building accordingly which does the "fixing" in a more elegant way. With both in history, we now have ./ppsi/include/generated/autoconf.h:13:0: warning: "CONFIG_VLAN_ARRAY_SIZE" redefined generated/autoconf.h:14:0: note: this is the previous definition Besides, the reverted commit was not even using new ppsi master (we did it before this commit). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
a7f92ab1 · Alessandro Rubini · 05aa8ac5 · a7f92ab1
Commit a7f92ab1 authored Oct 15, 2015 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Makefile Makefile +1 -3

No files found.
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ SIZE =		$(CROSS_COMPILE)size
 AUTOCONF = $(CURDIR)/include/generated/autoconf.h

 PPSI = ppsi
-PPSI_CONFIG = ppsi/include/generated/autoconf.h

 # we miss CONFIG_ARCH_LM32 as we have no other archs by now
 obj-y = arch/lm32/crt0.o arch/lm32/irq.o
@@ -163,8 +162,7 @@ clean:
 	$(MAKE) -C tools clean

 %.o:		%.c
-	${CC} $(CFLAGS) $(PTPD_CFLAGS) $(INCLUDE_DIR) $(LIB_DIR) \
-		-include $(PPSI_CONFIG)  -c $*.c -o $@
+	${CC} $(CFLAGS) $(PTPD_CFLAGS) $(INCLUDE_DIR) $(LIB_DIR) -c $*.c -o $@

 tools:
 	$(MAKE) -C tools