MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 12:59:03 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

linux-raspberrypi: fix kernel configuration using cfg files

Browse Source 
In tree configurations are now used to build the kernel and
it is possible to extend the config via bbappend and cfg fragments

Fix issue 14

Signed-off-by: Andrea Ghittino <aghittino@gmail.com>
This commit is contained in:
Andrea Ghittino 2017-08-29 22:42:45 +02:00 committed by Andrei Gherzan
parent f70b24b1f1
commit 88478c3874
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-kernel/linux/linux-raspberrypi.inc
View File

@ -6,19 +6,16 @@ SECTION = "kernel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
SRC_URI += " \
file://defconfig \
"
COMPATIBLE_MACHINE = "^rpi$"
PE = "1"
PV = "${LINUX_VERSION}+git${SRCPV}"
# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
KERNEL_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig"
KERNEL_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig"
KCONFIG_MODE = "--alldefconfig"
KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig"
KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig"
KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig"
# CMDLINE for raspberrypi
CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
@ -38,10 +35,6 @@ python __anonymous () {
d.setVar("KERNEL_DEVICETREE", kerneldt)
}
do_kernel_configme_prepend() {
install -m 0644 ${S}/arch/${ARCH}/configs/${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig || die "No default configuration for ${MACHINE} / ${KERNEL_DEFCONFIG} available."
}
do_install_prepend() {
install -d ${D}/lib/firmware
}

1
recipes-kernel/linux/linux-raspberrypi/defconfig
View File

@ -1 +0,0 @@
# Dummy file to get through do_kernel_configme.

6
recipes-kernel/linux/linux-rpi.inc
View File

@ -35,8 +35,7 @@ kernel_configure_variable() {
}
do_configure_prepend() {
# Clean .config
echo "" > ${B}/.config
mv -f ${B}/.config ${B}/.config.patched
CONF_SED_SCRIPT=""
# oabi / eabi support
@ -123,7 +122,8 @@ do_configure_prepend() {
# Keep this the last line
# Remove all modified configs and add the rest to .config
sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
sed -e "${CONF_SED_SCRIPT}" < '${B}/.config.patched' >> '${B}/.config'
rm -f ${B}/.config.patched
yes '' | oe_runmake oldconfig
}