UBUNTU: [Config] CONFIG_ARMV8_DEPRECATED=y

BugLink: http://bugs.launchpad.net/bugs/1545542
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9fa3de70587c13743285270fcb956a41e241d93d..29bfdf5d3e81e241cf52ff2c0392daeea26a4495 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -510,7 +510,7 @@ CONFIG_ARMADA_38X_CLK=y
 CONFIG_ARMADA_39X_CLK=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_ARMADA_XP_CLK=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -1429,6 +1429,7 @@ CONFIG_CORENET_GENERIC=y
 # CONFIG_CORESIGHT is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_COSA=m
+CONFIG_CP15_BARRIER_EMULATION=y
 # CONFIG_CPA_DEBUG is not set
 CONFIG_CPM=y
 CONFIG_CPM2=y
@@ -6954,6 +6955,7 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_XILINX_XPS_PS2=m
+CONFIG_SETEND_EMULATION=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
@@ -7652,6 +7654,7 @@ CONFIG_SWAP=y
 CONFIG_SWIOTLB=y
 CONFIG_SWIOTLB_XEN=y
 CONFIG_SWP_EMULATE=y
+CONFIG_SWP_EMULATION=y
 CONFIG_SX9500=m
 CONFIG_SXGBE_ETH=m
 CONFIG_SYNCLINK=m