Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update distro to jellyfish
[AGL/meta-agl.git]
/
meta-agl-bsp
/
recipes-kernel
/
linux
/
linux-agl.inc
diff --git
a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
index
073cbc6
..
c03c56e
100644
(file)
--- a/
meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
+++ b/
meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
@@
-14,6
+14,9
@@
def find_cfgs(d):
do_configure_append () {
[ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config
do_configure_append () {
[ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config
+ # Need to clear CONFIG_LSM for 5.1+ kernels to ensure it'll get
+ # regenerated to reflect configuration changes (e.g. SMACK).
+ sed -i '/^CONFIG_LSM/d' .config
merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
yes '' | make oldconfig
}
merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
yes '' | make oldconfig
}
@@
-30,6
+33,7
@@
SRC_URI_append = "\
file://drm.cfg \
file://btusb.cfg \
file://usbaudio.cfg \
file://drm.cfg \
file://btusb.cfg \
file://usbaudio.cfg \
+ file://usbmodem.cfg \
file://i2c-led.cfg \
file://nfc.cfg \
"
file://i2c-led.cfg \
file://nfc.cfg \
"
@@
-79,9
+83,9
@@
KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\
${WORKDIR}/smack-default-lsm.cfg \
"
${WORKDIR}/smack-default-lsm.cfg \
"
-#
snd-aloop support for 4a
-SRC_URI_append = " file://
4a-
sound.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/
4a-
sound.cfg"
+#
ALSA support and other sound related configuration
+SRC_URI_append = " file://sound.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/sound.cfg"
# iio-dummy-device support for test iiodevice
SRC_URI_append = " file://iiodevice.cfg"
# iio-dummy-device support for test iiodevice
SRC_URI_append = " file://iiodevice.cfg"
@@
-91,3
+95,6
@@
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/iiodevice.cfg"
SRC_URI_append = " file://rtc.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/rtc.cfg"
SRC_URI_append = " file://rtc.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/rtc.cfg"
+# netfilter options
+SRC_URI_append = " file://netfilter.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/netfilter.cfg"