BeagleBone Black related fixes and cleanups, kernel updates

PATCH New Jan Kiszka 1 participant 5 messages Aug 14, 2022

Share & tools

Jan Kiszka

author

2022-08-14 12:47 UTC #0 lore raw

cover BeagleBone Black related fixes and cleanups, kernel updates

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%)

Signature · 1 line

2.35.3

Jan Kiszka

author

2022-08-14 12:47 UTC #1 lore raw

PATCH 1/4 bbb: Fix console parameter

From: Jan Kiszka <[email protected]>

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

Signed-off-by Jan Kiszka <[email protected]>

---
 wic/bbb.wks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

wic/bbb.wks +1 -1

index 17b85f1..2822ce7 100644
@@ -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"

Signature · 1 line

2.35.3

Jan Kiszka

author

2022-08-14 12:47 UTC #2 lore raw

PATCH 2/4 linux-cip: Update to latest 4.4/4.19/5.10 releases

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Signed-off-by Jan Kiszka <[email protected]>

---
 ...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%)

recipes-kernel/linux/linux-cip-rt_4.19.252-cip78-rt26.bb renamed from recipes-kernel/linux/linux-cip-rt_4.19.245-cip74-rt25.bb +1 -1

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
@@ -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"

recipes-kernel/linux/linux-cip-rt_4.4.302-cip70-rt40.bb renamed from recipes-kernel/linux/linux-cip-rt_4.4.302-cip69-rt39.bb +1 -1

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
@@ -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"

recipes-kernel/linux/linux-cip-rt_5.10.131-cip13-rt5.bb renamed from recipes-kernel/linux/linux-cip-rt_5.10.109-cip5-rt4.bb +1 -1

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
@@ -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"

recipes-kernel/linux/linux-cip_4.19.252-cip78.bb renamed from recipes-kernel/linux/linux-cip_4.19.249-cip76.bb +1 -1

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
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip"
 
-SRC_URI[sha256sum] = "7068eae8ea25eaded7891e14019e0c1d1fdaf8bb0abe77d42205b34fa059a157"
+SRC_URI[sha256sum] = "a77f4b3f81b76318a3d5a68a034100efae35ccb43e99afc820a8525689040bf4"

recipes-kernel/linux/linux-cip_4.4.302-cip70.bb renamed from recipes-kernel/linux/linux-cip_4.4.302-cip69.bb +1 -1

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
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip"
 
-SRC_URI[sha256sum] = "3acecb8f9ee4d9fba58d4a4cf4a2114018f030865f55b65cbc8e385ad04e691e"
+SRC_URI[sha256sum] = "0c59f3b3859c309a9a74d9709d70a35ea449868ebfa2fc56a0cc9d533f351000"

recipes-kernel/linux/linux-cip_5.10.131-cip13.bb renamed from recipes-kernel/linux/linux-cip_5.10.126-cip11.bb +1 -1

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
@@ -13,4 +13,4 @@ require linux-cip-common.inc
 
 KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
 
-SRC_URI[sha256sum] = "fa6b05e52b095ff29c08bbb2cd9d40fc4aedc69e9abf295fc303d30bdce51caf"
+SRC_URI[sha256sum] = "bbc453c27e4d67d1e07b741505f7012ab6c0f7e17efebf29ffc246b42cb612c7"

Signature · 1 line

2.35.3

Jan Kiszka

author

2022-08-14 12:47 UTC #3 lore raw

PATCH 3/4 linux-cip: Update cip-kernel-config revision

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

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 <[email protected]>

---
 recipes-kernel/linux/linux-cip-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

recipes-kernel/linux/linux-cip-common.inc +1 -1

index b612efa..8d8a8e2 100644
@@ -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}"

Signature · 1 line

2.35.3

Jan Kiszka

author

2022-08-14 12:47 UTC #4 lore raw

PATCH 4/4 linux-cip: Switch to bbb to cip-kernel-config

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

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 <[email protected]>

---
 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

conf/machine/bbb.conf +3 -0

index ea87ed8..01206cc 100644
@@ -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"

recipes-kernel/linux/files/bbb_defconfig deleted +0 ~~-455~~

455 lines not on this page · raw message

recipes-kernel/linux/linux-cip-common.inc +0 -2

index 8d8a8e2..15d8370 100644
@@ -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}"

Signature · 1 line

2.35.3