From 80c9829297f3f391853d7bfeb586f0aaf4f3af69 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 13 Dec 2024 18:32:01 -0500 Subject: linux-bb.org, u-boot-bb.org: rename recipes with version Rename "bb_org" BSP recipes to include version in the recipe names. This way we can support multiple versions. Also remove 2 unused kernel patches that were needed for 5.10 Signed-off-by: Denys Dmytriyenko --- .../recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb | 22 +++++++ .../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 22 ------- .../linux/linux-bb.org-6.1/defconfig | 1 + ...ost-avoid-64-bit-division-in-ioc_timer_fn.patch | 56 ------------------ ...ocost-gcc13-keep-large-values-in-a-new-en.patch | 54 ----------------- .../recipes-kernel/linux/linux-bb.org/defconfig | 1 - .../recipes-kernel/linux/linux-bb.org_6.1.bb | 68 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-bb.org_git.bb | 65 --------------------- 8 files changed, 91 insertions(+), 198 deletions(-) create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb delete mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb delete mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb new file mode 100644 index 00000000..8e14c495 --- /dev/null +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb @@ -0,0 +1,22 @@ +require recipes-bsp/u-boot/u-boot-ti.inc + +SUMMARY = "BeagleBoard.org U-Boot" + +COMPATIBLE_MACHINE = "beagle.*" + +PV = "2023.04" + +UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" +UBOOT_GIT_PROTOCOL = "https" +BRANCH = "v2023.04-ti-09.01.00.008" +SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb" + +BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay" +BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" +SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" +SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" + +BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" +BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" +SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8" +SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8" diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb deleted file mode 100644 index 8e14c495..00000000 --- a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require recipes-bsp/u-boot/u-boot-ti.inc - -SUMMARY = "BeagleBoard.org U-Boot" - -COMPATIBLE_MACHINE = "beagle.*" - -PV = "2023.04" - -UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" -UBOOT_GIT_PROTOCOL = "https" -BRANCH = "v2023.04-ti-09.01.00.008" -SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb" - -BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay" -BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" -SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" -SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" - -BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" -BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production" -SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8" -SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig new file mode 100644 index 00000000..a5de2e24 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig @@ -0,0 +1 @@ +use-kernel-config=bb.org_defconfig diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch b/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch deleted file mode 100644 index a7806c22..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Wed, 18 Jan 2023 09:07:01 +0100 -Subject: [PATCH] blk-iocost: avoid 64-bit division in ioc_timer_fn - -The behavior of 'enum' types has changed in gcc-13, so now the -UNBUSY_THR_PCT constant is interpreted as a 64-bit number because -it is defined as part of the same enum definition as some other -constants that do not fit within a 32-bit integer. This in turn -leads to some inefficient code on 32-bit architectures as well -as a link error: - -arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn': -blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod' -arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod' - -Split the enum definition to keep the 64-bit timing constants in -a separate enum type from those constants that can clearly fit -within a smaller type. - -Signed-off-by: Arnd Bergmann -Acked-by: Tejun Heo -Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org -Signed-off-by: Jens Axboe ---- - block/blk-iocost.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index 6955605629e4..b691b6bb498f 100644 ---- a/block/blk-iocost.c -+++ b/block/blk-iocost.c -@@ -258,6 +258,11 @@ enum { - VRATE_MIN = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION, - VRATE_CLAMP_ADJ_PCT = 4, - -+ /* switch iff the conditions are met for longer than this */ -+ AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -+}; -+ -+enum { - /* if IOs end up waiting for requests, issue less */ - RQ_WAIT_BUSY_PCT = 5, - -@@ -296,9 +301,6 @@ enum { - /* don't let cmds which take a very long time pin lagging for too long */ - MAX_LAGGING_PERIODS = 10, - -- /* switch iff the conditions are met for longer than this */ -- AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -- - /* - * Count IO size in 4k pages. The 12bit shift helps keeping - * size-proportional components of cost calculation in closer --- -2.40.1 diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch b/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch deleted file mode 100644 index f5d0f476..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ff1cc97b1f4c10db224f276d9615b22835b8c424 Mon Sep 17 00:00:00 2001 -From: "Jiri Slaby (SUSE)" -Date: Tue, 13 Dec 2022 13:08:26 +0100 -Subject: [PATCH] block/blk-iocost (gcc13): keep large values in a new enum - -Since gcc13, each member of an enum has the same type as the enum [1]. And -that is inherited from its members. Provided: - VTIME_PER_SEC_SHIFT = 37, - VTIME_PER_SEC = 1LLU << VTIME_PER_SEC_SHIFT, - ... - AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -the named type is unsigned long. - -This generates warnings with gcc-13: - block/blk-iocost.c: In function 'ioc_weight_prfill': - block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int' - - block/blk-iocost.c: In function 'ioc_weight_show': - block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int' - -So split the anonymous enum with large values to a separate enum, so -that they don't affect other members. - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113 - -Cc: Martin Liska -Cc: Tejun Heo -Cc: Josef Bacik -Cc: Jens Axboe -Cc: cgroups@vger.kernel.org -Cc: linux-block@vger.kernel.org -Signed-off-by: Jiri Slaby (SUSE) -Link: https://lore.kernel.org/r/20221213120826.17446-1-jirislaby@kernel.org -Signed-off-by: Jens Axboe ---- - block/blk-iocost.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/block/blk-iocost.c b/block/blk-iocost.c -index d1bdc12deaa7..549ddc9e0c6f 100644 ---- a/block/blk-iocost.c -+++ b/block/blk-iocost.c -@@ -232,7 +232,9 @@ enum { - - /* 1/64k is granular enough and can easily be handled w/ u32 */ - WEIGHT_ONE = 1 << 16, -+}; - -+enum { - /* - * As vtime is used to calculate the cost of each IO, it needs to - * be fairly high precision. For example, it should be able to --- -2.40.1 diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig deleted file mode 100644 index a5de2e24..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig +++ /dev/null @@ -1 +0,0 @@ -use-kernel-config=bb.org_defconfig diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb new file mode 100644 index 00000000..063bcac3 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb @@ -0,0 +1,68 @@ +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + +SECTION = "kernel" +SUMMARY = "BeagleBoard.org Linux kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +COMPATIBLE_MACHINE = "beagle.*" + +inherit kernel + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/ti-kernel.inc + +DEPENDS += "gmp-native libmpc-native" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" + +# Extra DT overlays/capes +KERNEL_DEVICETREE:append:armv7a = " \ +AM335X-PRU-UIO-00A0.dtbo \ +BB-ADC-00A0.dtbo \ +BB-BBBW-WL1835-00A0.dtbo \ +BB-BBGG-WL1835-00A0.dtbo \ +BB-BBGW-WL1835-00A0.dtbo \ +BB-BONE-4D5R-01-00A1.dtbo \ +BB-BONE-eMMC1-01-00A0.dtbo \ +BB-BONE-LCD4-01-00A1.dtbo \ +BB-BONE-NH7C-01-A0.dtbo \ +BB-CAPE-DISP-CT4-00A0.dtbo \ +BB-HDMI-TDA998x-00A0.dtbo \ +BB-I2C1-MCP7940X-00A0.dtbo \ +BB-I2C1-RTC-DS3231.dtbo \ +BB-I2C1-RTC-PCF8563.dtbo \ +BB-I2C2-BME680.dtbo \ +BB-I2C2-MPU6050.dtbo \ +BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ +BB-NHDMI-TDA998x-00A0.dtbo \ +BBORG_COMMS-00A2.dtbo \ +BBORG_FAN-A000.dtbo \ +BBORG_RELAY-00A2.dtbo \ +BB-SPIDEV0-00A0.dtbo \ +BB-SPIDEV1-00A0.dtbo \ +BB-UART1-00A0.dtbo \ +BB-UART2-00A0.dtbo \ +BB-UART4-00A0.dtbo \ +BB-W1-P9.12-00A0.dtbo \ +BONE-ADC.dtbo \ +M-BB-BBG-00A0.dtbo \ +M-BB-BBGG-00A0.dtbo \ +PB-MIKROBUS-0.dtbo \ +PB-MIKROBUS-1.dtbo \ +" + +S = "${WORKDIR}/git" + +# 6.1.83 version for 32-bit +SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792" +PV:armv7a = "6.1.83+git" +BRANCH:armv7a = "v6.1.83-ti-r35" + +# 6.1.83 version for 64-bit +SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a" +PV:aarch64 = "6.1.83+git" +BRANCH:aarch64 = "v6.1.83-ti-arm64-r64" + +KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb deleted file mode 100644 index 986eda68..00000000 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb +++ /dev/null @@ -1,65 +0,0 @@ -SECTION = "kernel" -SUMMARY = "BeagleBoard.org Linux kernel" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -COMPATIBLE_MACHINE = "beagle.*" - -inherit kernel - -require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/ti-kernel.inc - -DEPENDS += "gmp-native libmpc-native" - -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" - -# Extra DT overlays/capes -KERNEL_DEVICETREE:append:armv7a = " \ -AM335X-PRU-UIO-00A0.dtbo \ -BB-ADC-00A0.dtbo \ -BB-BBBW-WL1835-00A0.dtbo \ -BB-BBGG-WL1835-00A0.dtbo \ -BB-BBGW-WL1835-00A0.dtbo \ -BB-BONE-4D5R-01-00A1.dtbo \ -BB-BONE-eMMC1-01-00A0.dtbo \ -BB-BONE-LCD4-01-00A1.dtbo \ -BB-BONE-NH7C-01-A0.dtbo \ -BB-CAPE-DISP-CT4-00A0.dtbo \ -BB-HDMI-TDA998x-00A0.dtbo \ -BB-I2C1-MCP7940X-00A0.dtbo \ -BB-I2C1-RTC-DS3231.dtbo \ -BB-I2C1-RTC-PCF8563.dtbo \ -BB-I2C2-BME680.dtbo \ -BB-I2C2-MPU6050.dtbo \ -BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ -BB-NHDMI-TDA998x-00A0.dtbo \ -BBORG_COMMS-00A2.dtbo \ -BBORG_FAN-A000.dtbo \ -BBORG_RELAY-00A2.dtbo \ -BB-SPIDEV0-00A0.dtbo \ -BB-SPIDEV1-00A0.dtbo \ -BB-UART1-00A0.dtbo \ -BB-UART2-00A0.dtbo \ -BB-UART4-00A0.dtbo \ -BB-W1-P9.12-00A0.dtbo \ -BONE-ADC.dtbo \ -M-BB-BBG-00A0.dtbo \ -M-BB-BBGG-00A0.dtbo \ -PB-MIKROBUS-0.dtbo \ -PB-MIKROBUS-1.dtbo \ -" - -S = "${WORKDIR}/git" - -# 6.1.83 version for 32-bit -SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792" -PV:armv7a = "6.1.83+git" -BRANCH:armv7a = "v6.1.83-ti-r35" - -# 6.1.83 version for 64-bit -SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a" -PV:aarch64 = "6.1.83+git" -BRANCH:aarch64 = "v6.1.83-ti-arm64-r64" - -KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" -- cgit v1.2.3-54-g00ecf