Merge remote-tracking branch 'origin/master' into localhost

ChangeLog

@@ -10871,3 +10871,6 @@
 	* libc/libc.csv and syscalls/syscalls.csv:  Define some symbol
 	  export conditions, correct errno and add sleep and usleep. From
 	  Pavel Pisa (2015-08-23).
+	* net/ ande include/nuttx/net:  Remove references to PPP as a
+	  link layer protocol (2015-08-24).
+

drivers/mtd/Kconfig

@@ -387,6 +387,27 @@ config M25P_SUBSECTOR_ERASE
 
 endif
 
+config MTD_ST25FL1
+	bool "QuadSPI-based ST25FL1 FLASH"
+	default n
+	select SPI
+
+if MTD_ST25FL1
+
+config ST25FL1_SPIMODE
+	int "ST25FL1 SPI Mode"
+	default 0
+
+config ST25FL1_SPIFREQUENCY
+	int "ST25FL1 SPI Frequency"
+	default 20000000
+
+config ST25FL1_SECTOR512
+	bool "Simulate 512 byte Erase Blocks"
+	default n
+
+endif
+
 config MTD_SMART
 	bool "Sector Mapped Allocation for Really Tiny (SMART) Flash support"
 	default n

include/nuttx/net/net.h

@@ -78,7 +78,6 @@ enum net_lltype_e
   NET_LL_ETHERNET = 0, /* Ethernet */
   NET_LL_LOOPBACK,     /* Local loopback */
   NET_LL_SLIP,         /* Serial Line Internet Protocol (SLIP) */
-  NET_LL_PPP,          /* Point-to-Point Protocol (PPP) */
   NET_LL_TUN,          /* TUN Virtual Network Device */
 };
 
@@ -1079,7 +1078,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap);
  *
  * Parameters:
  *   dev    - The device driver structure to be registered.
- *   lltype - Link level protocol used by the driver (Ethernet, SLIP, PPP, ...
+ *   lltype - Link level protocol used by the driver (Ethernet, SLIP, TUN, ...
  *
  * Returned Value:
  *   0:Success; negated errno on failure

net/netdev/netdev_register.c

@@ -160,7 +160,7 @@ static int find_devnum(FAR const char *devfmt)
  *
  * Parameters:
  *   dev    - The device driver structure to be registered.
- *   lltype - Link level protocol used by the driver (Ethernet, SLIP, PPP, ...
+ *   lltype - Link level protocol used by the driver (Ethernet, SLIP, TUN, ...
  *              ...
  *
  * Returned Value:
@@ -235,17 +235,6 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
             break;
 #endif
 
-#if 0                            /* REVISIT: Not yet supported */
-          case NET_LL_PPP:       /* Point-to-Point Protocol (PPP) */
-            dev->d_llhdrlen = 0;
-            dev->d_mtu      = CONFIG_NET_PPP_MTU;
-#ifdef CONFIG_NET_TCP
-            dev->d_recvwndo = CONFIG_NET_PPP_TCP_RECVWNDO;
-#endif
-            devfmt          = NETDEV_PPP_FORMAT;
-            break;
-#endif
-
           default:
             nlldbg("ERROR: Unrecognized link type: %d\n", lltype);
             return -EINVAL;