From e1b8fa9d6909a6af70556f7192f1a81859a2fbd6 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Fri, 12 Jul 2019 18:04:00 -0400
Subject: linux-libre-4.19: Disable Spectre V2, add AF_PACKET and M+ fonts

BusyBox udhcpc needs AF_PACKET.
---
diff --git a/src/build/linux-libre-4.19/config b/src/build/linux-libre-4.19/config
index 8e82398..96f0dbf 100644
--- a/src/build/linux-libre-4.19/config
+++ b/src/build/linux-libre-4.19/config
@@ -342,7 +342,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="rw mce=0 page_poison=1 pti=on quiet"
+CONFIG_CMDLINE="rw mce=0 page_poison=1 pti=on spectre_v2=off quiet"
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -728,7 +728,8 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_PACKET is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
 # CONFIG_UNIX is not set
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
@@ -2832,9 +2833,24 @@ CONFIG_NLATTR=y
 # CONFIG_DDR is not set
 # CONFIG_IRQ_POLL is not set
 CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_6x10 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_MPLUS_1M_REGULAR_8X12 is not set
+CONFIG_FONT_MPLUS_1M_REGULAR_10X14=y
+# CONFIG_FONT_MPLUS_1M_REGULAR_12X17 is not set
+CONFIG_FONT_MPLUS_1M_REGULAR_16X22=y
+# CONFIG_FONT_MPLUS_1M_REGULAR_24X34 is not set
+# CONFIG_FONT_MPLUS_1M_REGULAR_32X44 is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
--
cgit v0.9.1