Skip to content

Commit

Permalink
Merge pull request #256 from siemens/jan/stable-V01.02
Browse files Browse the repository at this point in the history
Fill stable branch
  • Loading branch information
BaochengSu authored Jan 26, 2022
2 parents 40d3fc0 + 6cdf837 commit 883c59c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
6 changes: 4 additions & 2 deletions conf/distro/iot2050-debian.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#
# Copyright (c) Siemens AG, 2019-2021
# Copyright (c) Siemens AG, 2019-2022
#
# Authors:
# Le Jin <le.jin@siemens.com>
# Jan Kiszka <jan.kiszka@siemens.com>
# Su Baocheng <baocheng.su@siemens.com>
#
# This file is subject to the terms and conditions of the MIT License. See
# COPYING.MIT file in the top-level directory.
Expand All @@ -15,7 +16,8 @@ DISTRO_NAME = "IOT2050 Debian System"

HOSTNAME ??= "iot2050-debian"

PREFERRED_VERSION_u-boot-iot2050 ?= "2021.04"
PREFERRED_VERSION_u-boot-iot2050-pg1 ?= "2021.04"
PREFERRED_VERSION_u-boot-iot2050-pg2 ?= "2021.04"
PREFERRED_VERSION_linux-iot2050 ?= "5.10.%"
PREFERRED_VERSION_linux-iot2050-rt ?= "5.10.%"

Expand Down
4 changes: 3 additions & 1 deletion conf/machine/iot2050.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#
# Copyright (c) Siemens AG, 2019
# Copyright (c) Siemens AG, 2019-2022
#
# Authors:
# Le Jin <le.jin@siemens.com>
# Su Baocheng <baocheng.su@siemens.com>
#
# This file is subject to the terms and conditions of the MIT License. See
# COPYING.MIT file in the top-level directory.
Expand All @@ -11,6 +12,7 @@
DISTRO_ARCH ?= "arm64"

PREFERRED_PROVIDER_u-boot-${MACHINE} ?= "u-boot-iot2050-pg2"
PREFERRED_PROVIDER_u-boot-${MACHINE}-config ?= "u-boot-iot2050-pg2"

KERNEL_NAME ?= "iot2050"

Expand Down
6 changes: 6 additions & 0 deletions recipes-kernel/linux/files/iot2050_defconfig_extra.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ CONFIG_NFT_REJECT_IPV6=m
CONFIG_NF_TABLES_IPV6=y
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_BRIDGE_NETFILTER=m
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_NAT=m
CONFIG_NETFILTER_XT_TARGET_LOG=m
Expand All @@ -185,3 +186,8 @@ CONFIG_NET_CLS_POLICE=y
CONFIG_USB_NET_QMI_WWAN=m
CONFIG_USB_NET_HUAWEI_CDC_NCM=m
CONFIG_USB_NET_CDC_MBIM=m

CONFIG_BPF_SYSCALL=y
CONFIG_CGROUP_BPF=y

CONFIG_WIREGUARD=m
File renamed without changes.

0 comments on commit 883c59c

Please sign in to comment.