2 files changed, 40 insertions, 9 deletions
diff --git a/os/various/lwip_bindings/lwipthread.c b/os/various/lwip_bindings/lwipthread.c
index 3e23118a8..df70dd021 100644
--- a/os/various/lwip_bindings/lwipthread.c
+++ b/os/various/lwip_bindings/lwipthread.c
@@ -71,10 +71,6 @@
 #include <netif/etharp.h>
 #include <lwip/netifapi.h>
 
-#if PPPOE_SUPPORT
-#include <netif/ppp_oe.h>
-#endif
-
 #if LWIP_DHCP
 #include <lwip/dhcp.h>
 #endif
@@ -395,11 +391,6 @@ static THD_FUNCTION(lwip_thread, p) {
             /* IP or ARP packet? */
             case ETHTYPE_IP:
             case ETHTYPE_ARP:
-#if PPPOE_SUPPORT
-            /* PPPoE packet? */
-            case ETHTYPE_PPPOEDISC:
-            case ETHTYPE_PPPOE:
-#endif /* PPPOE_SUPPORT */
               /* full packet send to tcpip_thread to process */
               if (thisif.input(p, &thisif) == ERR_OK)
                 break;
diff --git a/os/various/lwip_bindings/static_lwipopts.h b/os/various/lwip_bindings/static_lwipopts.h
new file mode 100644
index 000000000..c425088cd
--- /dev/null
+++ b/os/various/lwip_bindings/static_lwipopts.h
@@ -0,0 +1,40 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    static_lwipopts.h
+ *
+ * @addtogroup static_lwipopts
+ * @{
+ */
+
+#ifndef STATIC_LWIPOPTS_H
+#define STATIC_LWIPOPTS_H
+
+#define NO_SYS                          0
+
+#define LWIP_TIMERS                     0
+#define LWIP_TIMERS_CUSTOM              1
+
+#define LWIP_TCPIP_CORE_LOCKING         0
+
+#define SYS_LIGHTWEIGHT_PROT            0
+
+#define MEM_ALIGNMENT                   4
+
+#endif  /* STATIC_LWIPOPTS_H */
+
+/** @} */