Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kernel (config) changes #502

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Kernel (config) changes #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58a4bb3
linux-iot2050: Disable R5F remoteproc support for now
jan-kiszka Nov 2, 2023
d8c414a
linux-iot2050: Drop unused SP805 watchdog config
jan-kiszka Nov 2, 2023
7fc9db2
linux-iot2050: Update mainline recipe to work with current 6.x
jan-kiszka Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions kas/opt/upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) Siemens AG, 2020
# Copyright (c) Siemens AG, 2020-2023
#
# This file is subject to the terms and conditions of the MIT License. See
# COPYING.MIT file in the top-level directory.
Expand All @@ -10,6 +10,4 @@ header:

local_conf_header:
upstream-versions: |
PREFERRED_VERSION_linux-iot2050 = "5.x-upstream"
extra-args: |
EXTRA_KERNEL_PARAMS = "fw_devlink=permissive"
PREFERRED_VERSION_linux-iot2050 = "6.x-upstream"
4 changes: 2 additions & 2 deletions recipes-kernel/linux/files/iot2050_defconfig_base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_USER_NS=y
CONFIG_CHECKPOINT_RESTORE=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
CONFIG_KALLSYMS_ALL=y
CONFIG_EMBEDDED=y
CONFIG_PERF_EVENTS=y
Expand Down Expand Up @@ -420,7 +421,6 @@ CONFIG_CPU_THERMAL=y
CONFIG_THERMAL_EMULATION=y
CONFIG_K3_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_ARM_SP805_WATCHDOG=y
CONFIG_K3_RTI_WATCHDOG=y
CONFIG_MFD_BD9571MWV=y
CONFIG_MFD_HI6421_PMIC=y
Expand Down Expand Up @@ -609,7 +609,6 @@ CONFIG_ARM_SMMU=y
CONFIG_ARM_SMMU_V3=y
CONFIG_REMOTEPROC=y
CONFIG_TI_K3_DSP_REMOTEPROC=m
CONFIG_TI_K3_R5_REMOTEPROC=m
CONFIG_RPMSG_QCOM_GLINK_RPM=y
CONFIG_RPMSG_VIRTIO=m
CONFIG_TI_SCI_PM_DOMAINS=y
Expand Down Expand Up @@ -643,6 +642,7 @@ CONFIG_FANOTIFY=y
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_QUOTA=y
CONFIG_AUTOFS4_FS=y
CONFIG_AUTOFS_FS=y
CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
Expand Down
7 changes: 3 additions & 4 deletions ...ernel/linux/linux-iot2050_5.x-upstream.bb → ...ernel/linux/linux-iot2050_6.x-upstream.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) Siemens AG, 2020-2021
# Copyright (c) Siemens AG, 2020-2023
#
# Authors:
# Jan Kiszka <[email protected]>
Expand All @@ -11,12 +11,11 @@
require recipes-kernel/linux/linux-custom.inc

SRC_URI += " \
git://github.com/siemens/linux.git;protocol=https;branch=${KERNEL_BRANCH};rev=${KERNEL_BRANCH} \
git://github.com/siemens/linux.git;protocol=https;branch=jan/iot2050 \
file://${KERNEL_DEFCONFIG} \
file://iot2050_defconfig_extra.cfg \
"

KERNEL_BRANCH = "jan/iot2050"
SRCREV = "${AUTOREV}"

KERNEL_DEFCONFIG = "iot2050_defconfig_base"

Expand Down