mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-01-12 01:20:20 +00:00
u-boot-bb_org, linux-bb_org: move "bb_org" providers to meta-beagle
Move "bb_org" kernel and U-boot providers that use corresponding official BeagleBoard.org trees into own meta-beagle layer. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
This commit is contained in:
Denys Dmytriyenko
committed by
Ryan Eatmon
Ryan Eatmon
parent
43d10b0593
commit
4ea03b03a6
19
meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb
Normal file
19
meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_git.bb
Normal file
@@ -0,0 +1,19 @@
|
||||
require recipes-bsp/u-boot/u-boot-ti.inc
|
||||
|
||||
SUMMARY = "BeagleBoard.org U-Boot"
|
||||
|
||||
COMPATIBLE_MACHINE = "beagle.*"
|
||||
|
||||
PV = "2023.04"
|
||||
|
||||
SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
|
||||
|
||||
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"
|
||||
@@ -0,0 +1,56 @@
|
||||
From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001
|
||||
From: Arnd Bergmann <arnd@arndb.de>
|
||||
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 <arnd@arndb.de>
|
||||
Acked-by: Tejun Heo <tj@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
---
|
||||
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
|
||||
@@ -0,0 +1,54 @@
|
||||
From ff1cc97b1f4c10db224f276d9615b22835b8c424 Mon Sep 17 00:00:00 2001
|
||||
From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
|
||||
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 <mliska@suse.cz>
|
||||
Cc: Tejun Heo <tj@kernel.org>
|
||||
Cc: Josef Bacik <josef@toxicpanda.com>
|
||||
Cc: Jens Axboe <axboe@kernel.dk>
|
||||
Cc: cgroups@vger.kernel.org
|
||||
Cc: linux-block@vger.kernel.org
|
||||
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20221213120826.17446-1-jirislaby@kernel.org
|
||||
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
||||
---
|
||||
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
|
||||
1
meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig
Normal file
1
meta-beagle/recipes-kernel/linux/linux-bb.org/defconfig
Normal file
@@ -0,0 +1 @@
|
||||
use-kernel-config=bb.org_defconfig
|
||||
65
meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb
Normal file
65
meta-beagle/recipes-kernel/linux/linux-bb.org_git.bb
Normal file
@@ -0,0 +1,65 @@
|
||||
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.80 version for 32-bit
|
||||
SRCREV:armv7a = "4ca9ea30768d58c8d4d56d03dd1eaf8c8feb7ef9"
|
||||
PV:armv7a = "6.1.80+git"
|
||||
BRANCH:armv7a = "v6.1.80-ti-r34"
|
||||
|
||||
# 6.1.80 version for 64-bit
|
||||
SRCREV:aarch64 = "977c75e082620f15c06c72bcced30f787c14b390"
|
||||
PV:aarch64 = "6.1.80+git"
|
||||
BRANCH:aarch64 = "v6.1.80-ti-arm64-r49"
|
||||
|
||||
KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
|
||||
Reference in New Issue
Block a user