[isar-cip-core][PATCH 0/4] BeagleBone Black related fixes and cleanups, kernel updates

[isar-cip-core][PATCH 0/4] BeagleBone Black related fixes and cleanups, kernel updates

[Jan Kiszka]

Resolves [1] and also removes the last deviation from cip-kernel-config.
Along this, it brings kernel updates which are also needed to perform
the config update for 5.10 on rzg2m.

Jan

[1] https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/37

Jan Kiszka (4):
  bbb: Fix console parameter
  linux-cip: Update to latest 4.4/4.19/5.10 releases
  linux-cip: Update cip-kernel-config revision
  linux-cip: Switch to bbb to cip-kernel-config

 conf/machine/bbb.conf                         |   3 +
 recipes-kernel/linux/files/bbb_defconfig      | 455 ------------------
 recipes-kernel/linux/linux-cip-common.inc     |   4 +-
 ...bb => linux-cip-rt_4.19.252-cip78-rt26.bb} |   2 +-
 ....bb => linux-cip-rt_4.4.302-cip70-rt40.bb} |   2 +-
 ....bb => linux-cip-rt_5.10.131-cip13-rt5.bb} |   2 +-
 ...9-cip76.bb => linux-cip_4.19.252-cip78.bb} |   2 +-
 ...02-cip69.bb => linux-cip_4.4.302-cip70.bb} |   2 +-
 ...6-cip11.bb => linux-cip_5.10.131-cip13.bb} |   2 +-
 wic/bbb.wks                                   |   2 +-
 10 files changed, 11 insertions(+), 465 deletions(-)
 delete mode 100644 recipes-kernel/linux/files/bbb_defconfig
 rename recipes-kernel/linux/{linux-cip-rt_4.19.245-cip74-rt25.bb => linux-cip-rt_4.19.252-cip78-rt26.bb} (72%)
 rename recipes-kernel/linux/{linux-cip-rt_4.4.302-cip69-rt39.bb => linux-cip-rt_4.4.302-cip70-rt40.bb} (72%)
 rename recipes-kernel/linux/{linux-cip-rt_5.10.109-cip5-rt4.bb => linux-cip-rt_5.10.131-cip13-rt5.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_4.19.249-cip76.bb => linux-cip_4.19.252-cip78.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_4.4.302-cip69.bb => linux-cip_4.4.302-cip70.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_5.10.126-cip11.bb => linux-cip_5.10.131-cip13.bb} (72%)

-- 
2.35.3

[isar-cip-core][PATCH 1/4] bbb: Fix console parameter

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Broke booting under certain kernel configuration, e.g. our
cip_bbb_defconfig.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 wic/bbb.wks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wic/bbb.wks b/wic/bbb.wks
index 17b85f1..2822ce7 100644
--- a/wic/bbb.wks
+++ b/wic/bbb.wks
@@ -11,4 +11,4 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/am335x_boneblack/u-bo
 
 part / --source rootfs-u-boot --ondisk mmcblk0 --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --active
 
-bootloader --append "rootwait console=ttyO,115200"
+bootloader --append "rootwait console=ttyO0,115200"
-- 
2.35.3

[isar-cip-core][PATCH 2/4] linux-cip: Update to latest 4.4/4.19/5.10 releases

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...19.245-cip74-rt25.bb => linux-cip-rt_4.19.252-cip78-rt26.bb} | 2 +-
 ...4.4.302-cip69-rt39.bb => linux-cip-rt_4.4.302-cip70-rt40.bb} | 2 +-
 ..._5.10.109-cip5-rt4.bb => linux-cip-rt_5.10.131-cip13-rt5.bb} | 2 +-
 ...{linux-cip_4.19.249-cip76.bb => linux-cip_4.19.252-cip78.bb} | 2 +-
 .../{linux-cip_4.4.302-cip69.bb => linux-cip_4.4.302-cip70.bb}  | 2 +-
 ...{linux-cip_5.10.126-cip11.bb => linux-cip_5.10.131-cip13.bb} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename recipes-kernel/linux/{linux-cip-rt_4.19.245-cip74-rt25.bb => linux-cip-rt_4.19.252-cip78-rt26.bb} (72%)
 rename recipes-kernel/linux/{linux-cip-rt_4.4.302-cip69-rt39.bb => linux-cip-rt_4.4.302-cip70-rt40.bb} (72%)
 rename recipes-kernel/linux/{linux-cip-rt_5.10.109-cip5-rt4.bb => linux-cip-rt_5.10.131-cip13-rt5.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_4.19.249-cip76.bb => linux-cip_4.19.252-cip78.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_4.4.302-cip69.bb => linux-cip_4.4.302-cip70.bb} (72%)
 rename recipes-kernel/linux/{linux-cip_5.10.126-cip11.bb => linux-cip_5.10.131-cip13.bb} (72%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.245-cip74-rt25.bb b/recipes-kernel/linux/linux-cip-rt_4.19.252-cip78-rt26.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip-rt_4.19.245-cip74-rt25.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.252-cip78-rt26.bb
index 0fbf34a..f27be73 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.245-cip74-rt25.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.252-cip78-rt26.bb
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip"
 
-SRC_URI[sha256sum] = "a14a5230356d334a2f06bdd2fed731956d3f6492e085c75dbebc7c4f7b5da1d8"
+SRC_URI[sha256sum] = "770db530cb68f0eb022757fde73774b7312d420fcfc3d86d906f37208bdbce2d"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.302-cip69-rt39.bb b/recipes-kernel/linux/linux-cip-rt_4.4.302-cip70-rt40.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip-rt_4.4.302-cip69-rt39.bb
rename to recipes-kernel/linux/linux-cip-rt_4.4.302-cip70-rt40.bb
index ddce99a..9310dda 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.302-cip69-rt39.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.302-cip70-rt40.bb
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip"
 
-SRC_URI[sha256sum] = "5cbddbd7780739f7af91545691ffaa07a436dab4a0e8380a5e2b9b31e883071f"
+SRC_URI[sha256sum] = "186949d20d7ca0856d666665d66782805c39d6811a6baab1b88af1690c6c73e1"
diff --git a/recipes-kernel/linux/linux-cip-rt_5.10.109-cip5-rt4.bb b/recipes-kernel/linux/linux-cip-rt_5.10.131-cip13-rt5.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip-rt_5.10.109-cip5-rt4.bb
rename to recipes-kernel/linux/linux-cip-rt_5.10.131-cip13-rt5.bb
index 3105f43..8c82e7e 100644
--- a/recipes-kernel/linux/linux-cip-rt_5.10.109-cip5-rt4.bb
+++ b/recipes-kernel/linux/linux-cip-rt_5.10.131-cip13-rt5.bb
@@ -13,4 +13,4 @@ require linux-cip-rt-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
 
-SRC_URI[sha256sum] = "71fba4ed5cb48fa7869e9fe271b68b77fed26775ce5cf2f50891aa8f71c388b3"
+SRC_URI[sha256sum] = "fc5ba1290c6ebeab65ad3783d3a0c65e2bb866c58905f2e627da04dff25166b3"
diff --git a/recipes-kernel/linux/linux-cip_4.19.249-cip76.bb b/recipes-kernel/linux/linux-cip_4.19.252-cip78.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip_4.19.249-cip76.bb
rename to recipes-kernel/linux/linux-cip_4.19.252-cip78.bb
index a5b240e..326d011 100644
--- a/recipes-kernel/linux/linux-cip_4.19.249-cip76.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.252-cip78.bb
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip"
 
-SRC_URI[sha256sum] = "7068eae8ea25eaded7891e14019e0c1d1fdaf8bb0abe77d42205b34fa059a157"
+SRC_URI[sha256sum] = "a77f4b3f81b76318a3d5a68a034100efae35ccb43e99afc820a8525689040bf4"
diff --git a/recipes-kernel/linux/linux-cip_4.4.302-cip69.bb b/recipes-kernel/linux/linux-cip_4.4.302-cip70.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip_4.4.302-cip69.bb
rename to recipes-kernel/linux/linux-cip_4.4.302-cip70.bb
index 2ae0b52..2fd314c 100644
--- a/recipes-kernel/linux/linux-cip_4.4.302-cip69.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.302-cip70.bb
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip"
 
-SRC_URI[sha256sum] = "3acecb8f9ee4d9fba58d4a4cf4a2114018f030865f55b65cbc8e385ad04e691e"
+SRC_URI[sha256sum] = "0c59f3b3859c309a9a74d9709d70a35ea449868ebfa2fc56a0cc9d533f351000"
diff --git a/recipes-kernel/linux/linux-cip_5.10.126-cip11.bb b/recipes-kernel/linux/linux-cip_5.10.131-cip13.bb
similarity index 72%
rename from recipes-kernel/linux/linux-cip_5.10.126-cip11.bb
rename to recipes-kernel/linux/linux-cip_5.10.131-cip13.bb
index a59333b..b2e372f 100644
--- a/recipes-kernel/linux/linux-cip_5.10.126-cip11.bb
+++ b/recipes-kernel/linux/linux-cip_5.10.131-cip13.bb
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
 
-SRC_URI[sha256sum] = "fa6b05e52b095ff29c08bbb2cd9d40fc4aedc69e9abf295fc303d30bdce51caf"
+SRC_URI[sha256sum] = "bbc453c27e4d67d1e07b741505f7012ab6c0f7e17efebf29ffc246b42cb612c7"
-- 
2.35.3

[isar-cip-core][PATCH 3/4] linux-cip: Update cip-kernel-config revision

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This brings updates for Renesas configs on 5.10 and prepares for using
the defconfigs from that repo also for BBB.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 recipes-kernel/linux/linux-cip-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index b612efa..8d8a8e2 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -25,6 +25,6 @@ SRC_URI_append = " ${@ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-confi
 
 SRC_URI_append_bbb = "file://${KERNEL_DEFCONFIG}"
 
-SRCREV_cip-kernel-config ?= "6509d11f52b7df71b8b2228c1bccd7913e4a33b8"
+SRCREV_cip-kernel-config ?= "59f7903d120e529cc26b8e5fd7b13c3bbb632e15"
 
 S = "${WORKDIR}/linux-cip-${PV}"
-- 
2.35.3

[isar-cip-core][PATCH 4/4] linux-cip: Switch to bbb to cip-kernel-config

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

With the command line fixed and [1] being merged, we can finally drop
the private defconfig for the BeagleBone Black.

[1] https://gitlab.com/cip-project/cip-kernel/cip-kernel-config/-/merge_requests/68

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/machine/bbb.conf                     |   3 +
 recipes-kernel/linux/files/bbb_defconfig  | 455 ----------------------
 recipes-kernel/linux/linux-cip-common.inc |   2 -
 3 files changed, 3 insertions(+), 457 deletions(-)
 delete mode 100644 recipes-kernel/linux/files/bbb_defconfig

diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf
index ea87ed8..01206cc 100644
--- a/conf/machine/bbb.conf
+++ b/conf/machine/bbb.conf
@@ -13,3 +13,6 @@ IMAGE_FSTYPES ?= "wic"
 IMAGER_INSTALL += "u-boot-omap"
 
 IMAGE_INSTALL += "u-boot-script"
+
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/cip_bbb_defconfig"
diff --git a/recipes-kernel/linux/files/bbb_defconfig b/recipes-kernel/linux/files/bbb_defconfig
deleted file mode 100644
index 31e15e6..0000000
--- a/recipes-kernel/linux/files/bbb_defconfig
+++ /dev/null
@@ -1,455 +0,0 @@
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-CONFIG_NAMESPACES=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_POWER_AVS_OMAP=y
-CONFIG_POWER_AVS_OMAP_CLASS3=y
-CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX_DEBUG=y
-CONFIG_SOC_AM33XX=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_CMA=y
-CONFIG_SECCOMP=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_CMDLINE=""
-CONFIG_KEXEC=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPUFREQ_DT=y
-# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_CPU_IDLE=y
-CONFIG_BINFMT_MISC=y
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_NET_KEY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_LRO is not set
-CONFIG_NETFILTER=y
-CONFIG_PHONET=m
-CONFIG_CAN=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_CFG80211=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_AF_RXRPC=m
-CONFIG_RXKAD=m
-CONFIG_MAC80211=m
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DMA_CMA=y
-CONFIG_OMAP_OCP2SCP=y
-CONFIG_CONNECTOR=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_OOPS=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ECC_BCH=y
-CONFIG_MTD_NAND_OMAP2=y
-CONFIG_MTD_NAND_OMAP_BCH=y
-CONFIG_MTD_ONENAND=y
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_MTD_ONENAND_OMAP2=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD_M25P80=m
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_SENSORS_TSL2550=m
-CONFIG_BMP085_I2C=m
-CONFIG_SRAM=y
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-CONFIG_DM9000=y
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-CONFIG_KS8851=y
-CONFIG_KS8851_MLL=y
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMC91X=y
-CONFIG_SMSC911X=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_TI_DAVINCI_EMAC=y
-CONFIG_TI_CPSW=y
-CONFIG_TI_CPTS=y
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_AT803X_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_KC2190=y
-CONFIG_USB_CDC_PHONET=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_DEBUG=y
-CONFIG_WL_TI=y
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_KEYBOARD_ATKBD=m
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-CONFIG_KEYBOARD_OMAP4=m
-CONFIG_KEYBOARD_TWL4030=m
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_TPS65218_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_PALMAS_PWRBUTTON=m
-CONFIG_SERIO=m
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=6
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_SPI=y
-CONFIG_SPI_OMAP24XX=y
-CONFIG_SPI_TI_QSPI=m
-CONFIG_HSI=m
-CONFIG_OMAP_SSI=m
-CONFIG_NOKIA_MODEM=m
-CONFIG_SSI_PROTOCOL=m
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_TWL4030=y
-CONFIG_GPIO_PALMAS=y
-CONFIG_W1=m
-CONFIG_HDQ_MASTER_OMAP=m
-CONFIG_BATTERY_BQ27XXX=m
-CONFIG_CHARGER_ISP1704=m
-CONFIG_CHARGER_TWL4030=m
-CONFIG_CHARGER_BQ2415X=m
-CONFIG_CHARGER_BQ24190=m
-CONFIG_CHARGER_BQ24735=m
-CONFIG_POWER_RESET=y
-CONFIG_POWER_AVS=y
-CONFIG_HWMON=m
-CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_THERMAL=m
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_CPU_THERMAL=y
-CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_THERMAL=y
-CONFIG_OMAP4_THERMAL=y
-CONFIG_OMAP5_THERMAL=y
-CONFIG_DRA752_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
-CONFIG_MFD_PALMAS=y
-CONFIG_MFD_TPS65217=y
-CONFIG_MFD_TPS65218=y
-CONFIG_MFD_TPS65910=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_TWL6040_CORE=y
-CONFIG_REGULATOR_PALMAS=y
-CONFIG_REGULATOR_PBIAS=y
-CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=y
-CONFIG_REGULATOR_TPS6507X=y
-CONFIG_REGULATOR_TPS65217=y
-CONFIG_REGULATOR_TPS65218=y
-CONFIG_REGULATOR_TPS65910=y
-CONFIG_REGULATOR_TWL4030=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_OMAP2_DSS=m
-CONFIG_OMAP5_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=y
-CONFIG_OMAP2_DSS_DSI=y
-CONFIG_FB_OMAP2=m
-CONFIG_DISPLAY_ENCODER_TFP410=m
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_DVI=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
-CONFIG_DISPLAY_PANEL_DPI=m
-CONFIG_DISPLAY_PANEL_DSI_CM=m
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
-CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
-CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
-CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_PANDORA=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_DEBUG=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=m
-CONFIG_SND_EDMA_SOC=m
-CONFIG_SND_AM33XX_SOC_EVM=m
-CONFIG_SND_DAVINCI_SOC_MCASP=m
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_HID_GENERIC=m
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-CONFIG_USB=m
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_MON=m
-CONFIG_USB_XHCI_HCD=m
-CONFIG_USB_WDM=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_USB_MUSB_AM35X=m
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_INVENTRA_DMA=y
-CONFIG_USB_TI_CPPI41_DMA=y
-CONFIG_USB_DWC3=m
-CONFIG_USB_TEST=m
-CONFIG_AM335X_PHY_USB=y
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_PHONET=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_G_NOKIA=m
-CONFIG_MMC=y
-CONFIG_SDIO_UART=y
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_TWL92330=y
-CONFIG_RTC_DRV_TWL4030=m
-CONFIG_RTC_DRV_OMAP=m
-CONFIG_DMADEVICES=y
-CONFIG_TI_EDMA=y
-CONFIG_DMA_OMAP=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXTCON=m
-CONFIG_EXTCON_USB_GPIO=m
-CONFIG_EXTCON_PALMAS=m
-CONFIG_TI_EMIF=m
-CONFIG_IIO=m
-CONFIG_TI_AM335X_ADC=m
-CONFIG_PWM=y
-CONFIG_PWM_TIECAP=m
-CONFIG_PWM_TIEHRPWM=m
-CONFIG_PWM_TWL=m
-CONFIG_PWM_TWL_LED=m
-CONFIG_PHY_DM816X_USB=m
-CONFIG_OMAP_USB2=m
-CONFIG_TI_PIPE3=y
-CONFIG_TWL4030_USB=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_QUOTA=y
-CONFIG_QFMT_V2=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_CRAMFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_SECURITY=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC7=y
-CONFIG_LIBCRC32C=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index 8d8a8e2..15d8370 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -23,8 +23,6 @@ SRC_URI_append = " ${@ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-confi
     if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
     }"
 
-SRC_URI_append_bbb = "file://${KERNEL_DEFCONFIG}"
-
 SRCREV_cip-kernel-config ?= "59f7903d120e529cc26b8e5fd7b13c3bbb632e15"
 
 S = "${WORKDIR}/linux-cip-${PV}"
-- 
2.35.3