mirror of
https://git.yoctoproject.org/meta-raspberrypi
synced 2026-07-16 03:46:56 +00:00
rpi-cmdline: Move cmdline.txt generation to a separate recipe
Instead of generating cmdline.txt in the kernel recipe, it is generated in a standalone recipe and pulled in as a dependency of the bootfiles recipe. This simplifies the process of using a linux-yocto, linux-mainline or similiar kernel recipe instead of linux-raspberrypi. In the rpi-cmdline recipe the command line is built from fragments which can all be easily overridden. The variables `SERIAL` and `CMA` are renamed to `CMDLINE_SERIAL` and `CMDLINE_CMA` for consistency. The cmdline.txt file is created in the do_compile step to allow further customisation via do_compile_append if needed. Signed-off-by: Paul Barker <pbarker@konsulko.com>
This commit is contained in:
committed by
Andrei Gherzan
parent
ba6a809a55
commit
8827040d9c
@@ -29,22 +29,6 @@ KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig"
|
||||
|
||||
LINUX_VERSION_EXTENSION ?= ""
|
||||
|
||||
# CMDLINE for raspberrypi
|
||||
SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}"
|
||||
CMA ?= "${@oe.utils.conditional("RASPBERRYPI_CAMERA_V2", "1", "cma=64M", "", d)}"
|
||||
CMDLINE ?= "dwc_otg.lpm_enable=0 ${SERIAL} root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ${CMA}"
|
||||
|
||||
# Add the kernel debugger over console kernel command line option if enabled
|
||||
CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}'
|
||||
|
||||
# Disable rpi logo on boot
|
||||
CMDLINE_append = ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nologo", "", d)}'
|
||||
|
||||
# You can define CMDLINE_DEBUG as "debug" in your local.conf or distro.conf
|
||||
# to enable kernel debugging.
|
||||
CMDLINE_DEBUG ?= ""
|
||||
CMDLINE_append = " ${CMDLINE_DEBUG}"
|
||||
|
||||
KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}"
|
||||
|
||||
# A LOADADDR is needed when building a uImage format kernel. This value is not
|
||||
@@ -58,15 +42,3 @@ do_compile_append() {
|
||||
oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
|
||||
fi
|
||||
}
|
||||
|
||||
do_deploy_append() {
|
||||
# Deploy cmdline.txt only for the main kernel package
|
||||
if [ ${KERNEL_PACKAGE_NAME} = "kernel" ]; then
|
||||
install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
|
||||
PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
|
||||
if [ ${PITFT} = "1" ]; then
|
||||
PITFT_PARAMS="fbcon=map:10 fbcon=font:VGA8x8"
|
||||
fi
|
||||
echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/cmdline.txt
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user