summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-04-16 15:48:20 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-04-16 15:48:20 +0000
commit39e895961c506f76588765c6d45e41e761d879a7 (patch)
treef26eb282daa776414456a79393a0b5c2552116b6
parent253e07676474d750c9b123e8c48b13c9d9477f33 (diff)
parent1c5e1f26af6e8b91115b45630902381051468dfa (diff)
Merge "meta-intel: Support the upsquare board" into guppy
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/files/lava.cfg3
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/files/net-devices.cfg1
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/files/upsquare.cfg4
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend8
4 files changed, 16 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/lava.cfg b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/lava.cfg
new file mode 100644
index 0000000..4dcf403
--- /dev/null
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/lava.cfg
@@ -0,0 +1,3 @@
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_NBD=y
+CONFIG_BLK_DEV_INITRD=y
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/net-devices.cfg b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/net-devices.cfg
index 9d5329a..ab88ced 100644
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/net-devices.cfg
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/net-devices.cfg
@@ -1 +1,2 @@
CONFIG_IGB=y
+CONFIG_R8169=y
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/upsquare.cfg b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/upsquare.cfg
new file mode 100644
index 0000000..7be178b
--- /dev/null
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/upsquare.cfg
@@ -0,0 +1,4 @@
+CONFIG_MFD_CORE=y
+CONFIG_MFD_INTEL_LPSS=y
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
index 62c264d..e159747 100644
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-intel_4.14%.bbappend
@@ -12,6 +12,14 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg"
SRC_URI_append = " file://net-devices.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/net-devices.cfg"
+# adding specific driver needed by the upsquare board
+SRC_URI_append = " file://upsquare.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/upsquare.cfg"
+
+# adding CONFIG needed by LAVA and NBD
+SRC_URI_append = " file://lava.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/lava.cfg"
+
# Ensure we have a startup.nsh file
SRC_URI_append = " file://startup.nsh"