Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3b27c95c16 | |||
| c153c694bd | |||
| e9cc26c9c7 | |||
| fa2bcfcf0e | |||
| e124d8284c | |||
| 3209d98660 | |||
| 6df7e028a2 | |||
| 1918a27419 | |||
| 0f46a1d376 | |||
| fb03b44883 | |||
| 6d593646ba | |||
| 16656a66cf | |||
| 6160d0d737 | |||
| e7476edfcb | |||
| 1879cb831f | |||
| d072cc8a48 | |||
| ec06e94f2a | |||
| bb8d5f7e9b | |||
| e8d4ac24a4 | |||
| d88e625cf2 | |||
| 1cf3dd5e5e | |||
| 6a7aac79ce | |||
| 90d4e6568a | |||
| a62c7c2ca6 | |||
| ba342d2a9e | |||
| e9a1940bab | |||
| 92a9b7a012 | |||
| 95a9103f91 | |||
| b65bff6323 | |||
| 8fa8d6bed7 | |||
| dbf1113a82 | |||
| 2e1ca4ce2e | |||
| 54f6b3c660 | |||
| 6d7c2f8080 | |||
| fc34bc3b86 | |||
| e67feeff48 | |||
| 99a1b4b5fa | |||
| 9c901bf170 | |||
| 51386901d4 | |||
| fe7592fe9c | |||
| 1f35a585ca | |||
| 15967d6ad9 | |||
| ddb4d6652d | |||
| 357c85c5fb | |||
| 4814f09e49 | |||
| df13222776 | |||
| 1e7750e3c8 | |||
| b859bc3eca | |||
| 4c033eb074 |
1
.github/workflows/yocto-builds.yml
vendored
1
.github/workflows/yocto-builds.yml
vendored
@ -25,6 +25,7 @@ jobs:
|
||||
- raspberrypi3
|
||||
- raspberrypi4-64
|
||||
- raspberrypi4
|
||||
- raspberrypi5
|
||||
- raspberrypi-cm3
|
||||
- raspberrypi-cm
|
||||
- raspberrypi-armv7
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
version: 2
|
||||
|
||||
sphinx:
|
||||
configuration: docs/conf.py
|
||||
build:
|
||||
os: ubuntu-22.04
|
||||
tools:
|
||||
|
||||
@ -60,7 +60,7 @@ do_image_rpi_sdimg[depends] = " \
|
||||
do_image_rpi_sdimg[recrdeps] = "do_build"
|
||||
|
||||
# SD card image name
|
||||
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg"
|
||||
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rpi-sdimg"
|
||||
|
||||
# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
|
||||
FATPAYLOAD ?= ""
|
||||
|
||||
@ -9,8 +9,11 @@ BBFILE_COLLECTIONS += "raspberrypi"
|
||||
BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_raspberrypi = "9"
|
||||
|
||||
LAYERSERIES_COMPAT_raspberrypi = "nanbield"
|
||||
LAYERSERIES_COMPAT_raspberrypi = "nanbield scarthgap"
|
||||
LAYERDEPENDS_raspberrypi = "core"
|
||||
# Recommended for u-boot support for raspberrypi5
|
||||
# https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch
|
||||
LAYERRECOMMENDS_raspberrypi = "lts-u-boot-mixin"
|
||||
|
||||
# Additional license directories.
|
||||
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
|
||||
|
||||
@ -26,8 +26,16 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
|
||||
overlays/gpio-poweroff.dtbo \
|
||||
overlays/gpio-shutdown.dtbo \
|
||||
overlays/hifiberry-amp.dtbo \
|
||||
overlays/hifiberry-amp100.dtbo \
|
||||
overlays/hifiberry-amp3.dtbo \
|
||||
overlays/hifiberry-amp4pro.dtbo \
|
||||
overlays/hifiberry-dac.dtbo \
|
||||
overlays/hifiberry-dacplus.dtbo \
|
||||
overlays/hifiberry-dacplusadc.dtbo \
|
||||
overlays/hifiberry-dacplusadcpro.dtbo \
|
||||
overlays/hifiberry-dacplusdsp.dtbo \
|
||||
overlays/hifiberry-dacplushd.dtbo \
|
||||
overlays/hifiberry-digi-pro.dtbo \
|
||||
overlays/hifiberry-digi.dtbo \
|
||||
overlays/justboom-both.dtbo \
|
||||
overlays/justboom-dac.dtbo \
|
||||
@ -50,10 +58,22 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
|
||||
overlays/pps-gpio.dtbo \
|
||||
overlays/rpi-ft5406.dtbo \
|
||||
overlays/rpi-poe.dtbo \
|
||||
overlays/uart0.dtbo \
|
||||
overlays/uart0-pi5.dtbo \
|
||||
overlays/uart1.dtbo \
|
||||
overlays/uart1-pi5.dtbo \
|
||||
overlays/uart2.dtbo \
|
||||
overlays/uart2-pi5.dtbo \
|
||||
overlays/uart3.dtbo \
|
||||
overlays/uart3-pi5.dtbo \
|
||||
overlays/uart4.dtbo \
|
||||
overlays/uart4-pi5.dtbo \
|
||||
overlays/uart5.dtbo \
|
||||
overlays/vc4-fkms-v3d.dtbo \
|
||||
overlays/vc4-fkms-v3d-pi4.dtbo \
|
||||
overlays/vc4-kms-v3d.dtbo \
|
||||
overlays/vc4-kms-v3d-pi4.dtbo \
|
||||
overlays/vc4-kms-v3d-pi5.dtbo \
|
||||
overlays/vc4-kms-dsi-7inch.dtbo \
|
||||
overlays/w1-gpio.dtbo \
|
||||
overlays/w1-gpio-pullup.dtbo \
|
||||
@ -61,22 +81,22 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
|
||||
"
|
||||
|
||||
RPI_KERNEL_DEVICETREE ?= " \
|
||||
bcm2708-rpi-zero.dtb \
|
||||
bcm2708-rpi-zero-w.dtb \
|
||||
bcm2708-rpi-b.dtb \
|
||||
bcm2708-rpi-b-rev1.dtb \
|
||||
bcm2708-rpi-b-plus.dtb \
|
||||
bcm2709-rpi-2-b.dtb \
|
||||
bcm2710-rpi-2-b.dtb \
|
||||
bcm2710-rpi-3-b.dtb \
|
||||
bcm2710-rpi-3-b-plus.dtb \
|
||||
bcm2710-rpi-zero-2.dtb \
|
||||
bcm2711-rpi-4-b.dtb \
|
||||
bcm2711-rpi-400.dtb \
|
||||
bcm2708-rpi-cm.dtb \
|
||||
bcm2710-rpi-cm3.dtb \
|
||||
bcm2711-rpi-cm4.dtb \
|
||||
bcm2711-rpi-cm4s.dtb \
|
||||
broadcom/bcm2708-rpi-zero.dtb \
|
||||
broadcom/bcm2708-rpi-zero-w.dtb \
|
||||
broadcom/bcm2708-rpi-b.dtb \
|
||||
broadcom/bcm2708-rpi-b-rev1.dtb \
|
||||
broadcom/bcm2708-rpi-b-plus.dtb \
|
||||
broadcom/bcm2709-rpi-2-b.dtb \
|
||||
broadcom/bcm2710-rpi-2-b.dtb \
|
||||
broadcom/bcm2710-rpi-3-b.dtb \
|
||||
broadcom/bcm2710-rpi-3-b-plus.dtb \
|
||||
broadcom/bcm2710-rpi-zero-2.dtb \
|
||||
broadcom/bcm2711-rpi-4-b.dtb \
|
||||
broadcom/bcm2711-rpi-400.dtb \
|
||||
broadcom/bcm2708-rpi-cm.dtb \
|
||||
broadcom/bcm2710-rpi-cm3.dtb \
|
||||
broadcom/bcm2711-rpi-cm4.dtb \
|
||||
broadcom/bcm2711-rpi-cm4s.dtb \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE ??= " \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# RaspberryPi BSP default versions
|
||||
|
||||
PREFERRED_VERSION_linux-raspberrypi ??= "6.1.%"
|
||||
PREFERRED_VERSION_linux-raspberrypi ??= "6.6.%"
|
||||
PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}"
|
||||
|
||||
@ -32,6 +32,7 @@ RPI_KERNEL_DEVICETREE = " \
|
||||
broadcom/bcm2711-rpi-400.dtb \
|
||||
broadcom/bcm2711-rpi-cm4.dtb \
|
||||
broadcom/bcm2711-rpi-cm4s.dtb \
|
||||
broadcom/bcm2712-rpi-5-b.dtb \
|
||||
"
|
||||
|
||||
SDIMG_KERNELIMAGE ?= "kernel8.img"
|
||||
|
||||
34
conf/machine/raspberrypi5.conf
Normal file
34
conf/machine/raspberrypi5.conf
Normal file
@ -0,0 +1,34 @@
|
||||
#@TYPE: Machine
|
||||
#@NAME: RaspberryPi 5 Development Board (64bit)
|
||||
#@DESCRIPTION: Machine configuration for the RaspberryPi 5 in 64 bits mode
|
||||
|
||||
require conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
|
||||
include conf/machine/include/rpi-base.inc
|
||||
|
||||
MACHINE_FEATURES += "pci"
|
||||
MACHINE_EXTRA_RRECOMMENDS += "\
|
||||
linux-firmware-rpidistro-bcm43455 \
|
||||
bluez-firmware-rpidistro-bcm4345c0-hcd \
|
||||
linux-firmware-rpidistro-bcm43456 \
|
||||
bluez-firmware-rpidistro-bcm4345c5-hcd \
|
||||
"
|
||||
|
||||
RPI_KERNEL_DEVICETREE = " \
|
||||
broadcom/bcm2712-rpi-5-b.dtb \
|
||||
"
|
||||
|
||||
RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/bcm2712d0.dtbo"
|
||||
|
||||
SDIMG_KERNELIMAGE ?= "kernel_2712.img"
|
||||
SERIAL_CONSOLES ?= "115200;ttyAMA10"
|
||||
|
||||
VC4DTBO ?= "vc4-kms-v3d"
|
||||
|
||||
# When u-boot is enabled we need to use the "Image" format and the "booti"
|
||||
# command to load the kernel
|
||||
KERNEL_IMAGETYPE_UBOOT ?= "Image"
|
||||
# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
|
||||
KERNEL_IMAGETYPE_DIRECT ?= "Image"
|
||||
KERNEL_BOOTCMD ?= "booti"
|
||||
|
||||
UBOOT_MACHINE = "rpi_arm64_config"
|
||||
@ -74,6 +74,22 @@ To remove (or adjust) this delay set these variables in local.conf:
|
||||
BOOT_DELAY = "0"
|
||||
BOOT_DELAY_MS = "0"
|
||||
|
||||
## Boot media
|
||||
|
||||
The Raspberry Pi 4 board can load the boot image files from SD card and USB memory.
|
||||
By default SD card media is used as boot media.
|
||||
|
||||
To switch the boot media from SD card to USB memory, the following variables are supported
|
||||
in local.conf: `CMDLINE_ROOT_PARTITION` and `BOOT_MEDIA`.
|
||||
The default value of `CMDLINE_ROOT_PARTITION` is "/dev/mmcblk0p2" to mount SD card. If you want to mount USB memory partition, set CMDLINE_ROOT_PARTITION to "/dev/sda2".
|
||||
`BOOT_MEDIA` allows `mmc` and `usb`. The "mmc" is required to load an image from the SD card, following the u-boot specification. Similarly, if you want to load a boot image file from USB memory, set BOOT_MEDIA to "usb".
|
||||
|
||||
For example, if you want to use USB boot, please define
|
||||
the following parameters in your local.conf file.
|
||||
|
||||
CMDLINE_ROOT_PARTITION = "/dev/sda2"
|
||||
BOOT_MEDIA = "usb"
|
||||
|
||||
## Set overclocking options
|
||||
|
||||
The Raspberry Pi can be overclocked. As of now overclocking up to the "Turbo
|
||||
@ -324,6 +340,13 @@ Some modules may require setting the frequency of the crystal oscillator used on
|
||||
|
||||
CAN_OSCILLATOR="8000000"
|
||||
|
||||
Configure the interrupt pin to the one connected to the CAN module. By default,
|
||||
the pins are set to 25 for can0 and 24 for can1. To change them to 12 and 16,
|
||||
the following variables also have to be set:
|
||||
|
||||
CAN0_INTERRUPT_PIN = "12"
|
||||
CAN1_INTERRUPT_PIN = "16"
|
||||
|
||||
Tested modules:
|
||||
|
||||
* PiCAN2 (16 MHz crystal): <http://skpang.co.uk/catalog/pican2-canbus-board-for-raspberry-pi-23-p-1475.html>
|
||||
|
||||
@ -18,7 +18,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
RDEPENDS:${PN} += " \
|
||||
${PYTHON_PN}-numpy \
|
||||
${PYTHON_PN}-rtimu \
|
||||
${PYTHON_PN}-pillow \
|
||||
python3-numpy \
|
||||
python3-rtimu \
|
||||
python3-pillow \
|
||||
"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 738f530829fb5ee37d74191d34f75d72921284ca Mon Sep 17 00:00:00 2001
|
||||
From bbc1ea3e4119c665723cfd1c5a364bc8c7cbb464 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Thu, 4 May 2023 18:07:16 +0000
|
||||
Subject: [PATCH] utils/version.py: use /usr/bin/env in shebang
|
||||
@ -31,7 +31,7 @@ Upstream-Status: Pending
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/version.py b/utils/version.py
|
||||
index fc2d431..1400eed 100755
|
||||
index 48d7e05..4a5e35c 100755
|
||||
--- a/utils/version.py
|
||||
+++ b/utils/version.py
|
||||
@@ -1,4 +1,4 @@
|
||||
@ -39,4 +39,4 @@ index fc2d431..1400eed 100755
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
# Copyright (C) 2021, Raspberry Pi (Trading) Limited
|
||||
# Generate version information for libcamera-apps
|
||||
# Generate version information for rpicam-apps
|
||||
|
||||
@ -0,0 +1,271 @@
|
||||
From 500f1e9eaeca29b255d0364e1383d70ade1d1177 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <martin.jansa@gmail.com>
|
||||
Date: Tue, 30 Jan 2024 12:02:09 +0000
|
||||
Subject: [PATCH] Revert "Support compressed pixel formats when saving DNGs"
|
||||
|
||||
This reverts commit a85aed7603a0b69a6685d3f81ee860246d5b1621.
|
||||
|
||||
This requires rpi specific fork of libcamera to provide e.g.
|
||||
formats::RGGB16_PISP_COMP1
|
||||
added in:
|
||||
https://github.com/raspberrypi/libcamera/commit/fb3cb844f2117f30d3eeece99d6ce4d02624e492
|
||||
but not included in libcamera from meta-oe:
|
||||
https://git.openembedded.org/meta-openembedded/commit/?id=711c6fbce39df685225bca081c5f42bae2de658b
|
||||
|
||||
See https://github.com/raspberrypi/rpicam-apps/issues/627
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
image/dng.cpp | 205 ++++++++------------------------------------------
|
||||
1 file changed, 33 insertions(+), 172 deletions(-)
|
||||
|
||||
diff --git a/image/dng.cpp b/image/dng.cpp
|
||||
index 7692f92..fc10439 100644
|
||||
--- a/image/dng.cpp
|
||||
+++ b/image/dng.cpp
|
||||
@@ -33,47 +33,40 @@ struct BayerFormat
|
||||
int bits;
|
||||
char const *order;
|
||||
bool packed;
|
||||
- bool compressed;
|
||||
};
|
||||
|
||||
static const std::map<PixelFormat, BayerFormat> bayer_formats =
|
||||
{
|
||||
- { formats::SRGGB10_CSI2P, { "RGGB-10", 10, TIFF_RGGB, true, false } },
|
||||
- { formats::SGRBG10_CSI2P, { "GRBG-10", 10, TIFF_GRBG, true, false } },
|
||||
- { formats::SBGGR10_CSI2P, { "BGGR-10", 10, TIFF_BGGR, true, false } },
|
||||
- { formats::SGBRG10_CSI2P, { "GBRG-10", 10, TIFF_GBRG, true, false } },
|
||||
-
|
||||
- { formats::SRGGB10, { "RGGB-10", 10, TIFF_RGGB, false, false } },
|
||||
- { formats::SGRBG10, { "GRBG-10", 10, TIFF_GRBG, false, false } },
|
||||
- { formats::SBGGR10, { "BGGR-10", 10, TIFF_BGGR, false, false } },
|
||||
- { formats::SGBRG10, { "GBRG-10", 10, TIFF_GBRG, false, false } },
|
||||
-
|
||||
- { formats::SRGGB12_CSI2P, { "RGGB-12", 12, TIFF_RGGB, true, false } },
|
||||
- { formats::SGRBG12_CSI2P, { "GRBG-12", 12, TIFF_GRBG, true, false } },
|
||||
- { formats::SBGGR12_CSI2P, { "BGGR-12", 12, TIFF_BGGR, true, false } },
|
||||
- { formats::SGBRG12_CSI2P, { "GBRG-12", 12, TIFF_GBRG, true, false } },
|
||||
-
|
||||
- { formats::SRGGB12, { "RGGB-12", 12, TIFF_RGGB, false, false } },
|
||||
- { formats::SGRBG12, { "GRBG-12", 12, TIFF_GRBG, false, false } },
|
||||
- { formats::SBGGR12, { "BGGR-12", 12, TIFF_BGGR, false, false } },
|
||||
- { formats::SGBRG12, { "GBRG-12", 12, TIFF_GBRG, false, false } },
|
||||
-
|
||||
- { formats::SRGGB16, { "RGGB-16", 16, TIFF_RGGB, false, false } },
|
||||
- { formats::SGRBG16, { "GRBG-16", 16, TIFF_GRBG, false, false } },
|
||||
- { formats::SBGGR16, { "BGGR-16", 16, TIFF_BGGR, false, false } },
|
||||
- { formats::SGBRG16, { "GBRG-16", 16, TIFF_GBRG, false, false } },
|
||||
-
|
||||
- { formats::R10_CSI2P, { "BGGR-10", 10, TIFF_BGGR, true, false } },
|
||||
- { formats::R10, { "BGGR-10", 10, TIFF_BGGR, false, false } },
|
||||
+ { formats::SRGGB10_CSI2P, { "RGGB-10", 10, TIFF_RGGB, true } },
|
||||
+ { formats::SGRBG10_CSI2P, { "GRBG-10", 10, TIFF_GRBG, true } },
|
||||
+ { formats::SBGGR10_CSI2P, { "BGGR-10", 10, TIFF_BGGR, true } },
|
||||
+ { formats::SGBRG10_CSI2P, { "GBRG-10", 10, TIFF_GBRG, true } },
|
||||
+
|
||||
+ { formats::SRGGB10, { "RGGB-10", 10, TIFF_RGGB, false } },
|
||||
+ { formats::SGRBG10, { "GRBG-10", 10, TIFF_GRBG, false } },
|
||||
+ { formats::SBGGR10, { "BGGR-10", 10, TIFF_BGGR, false } },
|
||||
+ { formats::SGBRG10, { "GBRG-10", 10, TIFF_GBRG, false } },
|
||||
+
|
||||
+ { formats::SRGGB12_CSI2P, { "RGGB-12", 12, TIFF_RGGB, true } },
|
||||
+ { formats::SGRBG12_CSI2P, { "GRBG-12", 12, TIFF_GRBG, true } },
|
||||
+ { formats::SBGGR12_CSI2P, { "BGGR-12", 12, TIFF_BGGR, true } },
|
||||
+ { formats::SGBRG12_CSI2P, { "GBRG-12", 12, TIFF_GBRG, true } },
|
||||
+
|
||||
+ { formats::SRGGB12, { "RGGB-12", 12, TIFF_RGGB, false } },
|
||||
+ { formats::SGRBG12, { "GRBG-12", 12, TIFF_GRBG, false } },
|
||||
+ { formats::SBGGR12, { "BGGR-12", 12, TIFF_BGGR, false } },
|
||||
+ { formats::SGBRG12, { "GBRG-12", 12, TIFF_GBRG, false } },
|
||||
+
|
||||
+ { formats::SRGGB16, { "RGGB-16", 16, TIFF_RGGB, false } },
|
||||
+ { formats::SGRBG16, { "GRBG-16", 16, TIFF_GRBG, false } },
|
||||
+ { formats::SBGGR16, { "BGGR-16", 16, TIFF_BGGR, false } },
|
||||
+ { formats::SGBRG16, { "GBRG-16", 16, TIFF_GBRG, false } },
|
||||
+
|
||||
+ { formats::R10_CSI2P, { "BGGR-10", 10, TIFF_BGGR, true } },
|
||||
+ { formats::R10, { "BGGR-10", 10, TIFF_BGGR, false } },
|
||||
// Currently not in the main libcamera branch
|
||||
//{ formats::R12_CSI2P, { "BGGR-12", 12, TIFF_BGGR, true } },
|
||||
- { formats::R12, { "BGGR-12", 12, TIFF_BGGR, false, false } },
|
||||
-
|
||||
- /* PiSP compressed formats. */
|
||||
- { formats::RGGB16_PISP_COMP1, { "RGGB-16-PISP", 16, TIFF_RGGB, false, true } },
|
||||
- { formats::GRBG16_PISP_COMP1, { "GRBG-16-PISP", 16, TIFF_GRBG, false, true } },
|
||||
- { formats::GBRG16_PISP_COMP1, { "GBRG-16-PISP", 16, TIFF_GBRG, false, true } },
|
||||
- { formats::BGGR16_PISP_COMP1, { "BGGR-16-PISP", 16, TIFF_BGGR, false, true } },
|
||||
+ { formats::R12, { "BGGR-12", 12, TIFF_BGGR, false } },
|
||||
};
|
||||
|
||||
static void unpack_10bit(uint8_t const *src, StreamInfo const &info, uint16_t *dest)
|
||||
@@ -124,129 +117,6 @@ static void unpack_16bit(uint8_t const *src, StreamInfo const &info, uint16_t *d
|
||||
}
|
||||
}
|
||||
|
||||
-// We always use these compression parameters.
|
||||
-#define COMPRESS_OFFSET 2048
|
||||
-#define COMPRESS_MODE 1
|
||||
-
|
||||
-static uint16_t postprocess(uint16_t a)
|
||||
-{
|
||||
- if (COMPRESS_MODE & 2)
|
||||
- {
|
||||
- if (COMPRESS_MODE == 3 && a < 0x4000)
|
||||
- a = a >> 2;
|
||||
- else if (a < 0x1000)
|
||||
- a = a >> 4;
|
||||
- else if (a < 0x1800)
|
||||
- a = (a - 0x800) >> 3;
|
||||
- else if (a < 0x3000)
|
||||
- a = (a - 0x1000) >> 2;
|
||||
- else if (a < 0x6000)
|
||||
- a = (a - 0x2000) >> 1;
|
||||
- else if (a < 0xC000)
|
||||
- a = (a - 0x4000);
|
||||
- else
|
||||
- a = 2 * (a - 0x8000);
|
||||
- }
|
||||
-
|
||||
- return std::min(0xFFFF, a + COMPRESS_OFFSET);
|
||||
-}
|
||||
-
|
||||
-static uint16_t dequantize(uint16_t q, int qmode)
|
||||
-{
|
||||
- switch (qmode)
|
||||
- {
|
||||
- case 0:
|
||||
- return (q < 320) ? 16 * q : 32 * (q - 160);
|
||||
-
|
||||
- case 1:
|
||||
- return 64 * q;
|
||||
-
|
||||
- case 2:
|
||||
- return 128 * q;
|
||||
-
|
||||
- default:
|
||||
- return (q < 94) ? 256 * q : std::min(0xFFFF, 512 * (q - 47));
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void subBlockFunction(uint16_t *d, uint32_t w)
|
||||
-{
|
||||
- int q[4];
|
||||
-
|
||||
- int qmode = (w & 3);
|
||||
- if (qmode < 3)
|
||||
- {
|
||||
- int field0 = (w >> 2) & 511;
|
||||
- int field1 = (w >> 11) & 127;
|
||||
- int field2 = (w >> 18) & 127;
|
||||
- int field3 = (w >> 25) & 127;
|
||||
- if (qmode == 2 && field0 >= 384)
|
||||
- {
|
||||
- q[1] = field0;
|
||||
- q[2] = field1 + 384;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- q[1] = (field1 >= 64) ? field0 : field0 + 64 - field1;
|
||||
- q[2] = (field1 >= 64) ? field0 + field1 - 64 : field0;
|
||||
- }
|
||||
- int p1 = std::max(0, q[1] - 64);
|
||||
- if (qmode == 2)
|
||||
- p1 = std::min(384, p1);
|
||||
- int p2 = std::max(0, q[2] - 64);
|
||||
- if (qmode == 2)
|
||||
- p2 = std::min(384, p2);
|
||||
- q[0] = p1 + field2;
|
||||
- q[3] = p2 + field3;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- int pack0 = (w >> 2) & 32767;
|
||||
- int pack1 = (w >> 17) & 32767;
|
||||
- q[0] = (pack0 & 15) + 16 * ((pack0 >> 8) / 11);
|
||||
- q[1] = (pack0 >> 4) % 176;
|
||||
- q[2] = (pack1 & 15) + 16 * ((pack1 >> 8) / 11);
|
||||
- q[3] = (pack1 >> 4) % 176;
|
||||
- }
|
||||
-
|
||||
- d[0] = dequantize(q[0], qmode);
|
||||
- d[2] = dequantize(q[1], qmode);
|
||||
- d[4] = dequantize(q[2], qmode);
|
||||
- d[6] = dequantize(q[3], qmode);
|
||||
-}
|
||||
-
|
||||
-static void uncompress(uint8_t const *src, StreamInfo const &info, uint16_t *dest)
|
||||
-{
|
||||
- // In all cases, the *decompressed* image must be a multiple of 8 columns wide.
|
||||
- unsigned int buf_stride_pixels = (info.width + 7) & ~7;
|
||||
- for (unsigned int y = 0; y < info.height; ++y)
|
||||
- {
|
||||
- uint16_t *dp = dest + y * buf_stride_pixels;
|
||||
- uint8_t const *sp = src + y * info.stride;
|
||||
-
|
||||
- for (unsigned int x = 0; x < info.width; x+=8)
|
||||
- {
|
||||
- if (COMPRESS_MODE & 1)
|
||||
- {
|
||||
- uint32_t w0 = 0, w1 = 0;
|
||||
- for (int b = 0; b < 4; ++b)
|
||||
- w0 |= (*sp++) << (b * 8);
|
||||
- for (int b = 0; b < 4; ++b)
|
||||
- w1 |= (*sp++) << (b * 8);
|
||||
- subBlockFunction(dp, w0);
|
||||
- subBlockFunction(dp + 1, w1);
|
||||
- for (int i = 0; i < 8; ++i, ++dp)
|
||||
- *dp = postprocess(*dp);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- for (int i = 0; i < 8; ++i)
|
||||
- *dp++ = postprocess((*sp++) << 8);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
struct Matrix
|
||||
{
|
||||
Matrix(float m0, float m1, float m2,
|
||||
@@ -307,16 +177,8 @@ void dng_save(std::vector<libcamera::Span<uint8_t>> const &mem, StreamInfo const
|
||||
BayerFormat const &bayer_format = it->second;
|
||||
LOG(1, "Bayer format is " << bayer_format.name);
|
||||
|
||||
- // Decompression will require a buffer that's 8 pixels aligned.
|
||||
- unsigned int buf_stride_pixels = info.width;
|
||||
- unsigned int buf_stride_pixels_padded = (buf_stride_pixels + 7) & ~7;
|
||||
- std::vector<uint16_t> buf(buf_stride_pixels_padded * info.height);
|
||||
- if (bayer_format.compressed)
|
||||
- {
|
||||
- uncompress(mem[0].data(), info, &buf[0]);
|
||||
- buf_stride_pixels = buf_stride_pixels_padded;
|
||||
- }
|
||||
- else if (bayer_format.packed)
|
||||
+ std::vector<uint16_t> buf(info.width * info.height);
|
||||
+ if (bayer_format.packed)
|
||||
{
|
||||
switch (bayer_format.bits)
|
||||
{
|
||||
@@ -444,9 +306,8 @@ void dng_save(std::vector<libcamera::Span<uint8_t>> const &mem, StreamInfo const
|
||||
{
|
||||
for (unsigned int x = 0; x < (info.width >> 4); x++)
|
||||
{
|
||||
- unsigned int off = (y * buf_stride_pixels + x) << 4;
|
||||
- uint32_t grey =
|
||||
- buf[off] + buf[off + 1] + buf[off + buf_stride_pixels] + buf[off + buf_stride_pixels + 1];
|
||||
+ unsigned int off = (y * info.width + x) << 4;
|
||||
+ uint32_t grey = buf[off] + buf[off + 1] + buf[off + info.width] + buf[off + info.width + 1];
|
||||
grey = (grey << 14) >> bayer_format.bits;
|
||||
grey = sqrt((double)grey); // simple "gamma correction"
|
||||
thumb_buf[3 * x] = thumb_buf[3 * x + 1] = thumb_buf[3 * x + 2] = grey;
|
||||
@@ -478,7 +339,7 @@ void dng_save(std::vector<libcamera::Span<uint8_t>> const &mem, StreamInfo const
|
||||
|
||||
for (unsigned int y = 0; y < info.height; y++)
|
||||
{
|
||||
- if (TIFFWriteScanline(tif, &buf[buf_stride_pixels * y], y, 0) != 1)
|
||||
+ if (TIFFWriteScanline(tif, &buf[info.width * y], y, 0) != 1)
|
||||
throw std::runtime_error("error writing DNG image data");
|
||||
}
|
||||
|
||||
@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77"
|
||||
SRC_URI = "\
|
||||
git://github.com/raspberrypi/libcamera-apps.git;protocol=https;branch=main \
|
||||
file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \
|
||||
file://0002-Revert-Support-compressed-pixel-formats-when-saving-.patch \
|
||||
"
|
||||
PV = "1.2.1+git${SRCPV}"
|
||||
SRCREV = "1c1d1c1a2a86d70cf873edc8bb72d174f037973a"
|
||||
PV = "1.4.2+git${SRCPV}"
|
||||
SRCREV = "9ae39f85ae6bee9761c36b9b5b80d675bc1fa369"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@ -38,3 +39,6 @@ EXTRA_OEMESON += "${NEON_FLAGS}"
|
||||
do_install:append() {
|
||||
rm -v ${D}/${bindir}/camera-bug-report
|
||||
}
|
||||
|
||||
# not picked automatically, because it's missing common 'lib' prefix
|
||||
FILES:${PN}-dev += "${libdir}/rpicam_app.so"
|
||||
|
||||
@ -5,7 +5,16 @@ LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=c403841ff2837657b2ed8e5bb474ac8d
|
||||
|
||||
inherit deploy nopackages
|
||||
|
||||
include recipes-bsp/common/raspberrypi-firmware.inc
|
||||
RPIFW_DATE ?= "20240319"
|
||||
SRCREV = "9f24f4bc2bdd07ffd158cfbb4bce88a2efc4c1f5"
|
||||
SHORTREV = "${@d.getVar("SRCREV", False).__str__()[:7]}"
|
||||
RPIFW_SRC_URI ?= "https://api.github.com/repos/raspberrypi/firmware/tarball/9f24f4bc2bdd07ffd158cfbb4bce88a2efc4c1f5;downloadfilename=raspberrypi-firmware-${SHORTREV}.tar.gz"
|
||||
RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-${SHORTREV}"
|
||||
|
||||
SRC_URI = "${RPIFW_SRC_URI}"
|
||||
SRC_URI[sha256sum] = "4b436f8946b139c6a1202375ef55d4848e3bcd8c1a9cb47000e06d7ecec828f7"
|
||||
|
||||
PV = "${RPIFW_DATE}"
|
||||
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
|
||||
@ -9,7 +9,9 @@ inherit deploy nopackages
|
||||
CMDLINE_DWC_OTG ?= "dwc_otg.lpm_enable=0"
|
||||
|
||||
CMDLINE_ROOT_FSTYPE ?= "rootfstype=ext4"
|
||||
CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait"
|
||||
CMDLINE_ROOT_PARTITION ?= "/dev/mmcblk0p2"
|
||||
|
||||
CMDLINE_ROOTFS ?= "root=${CMDLINE_ROOT_PARTITION} ${CMDLINE_ROOT_FSTYPE} rootwait"
|
||||
|
||||
CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}"
|
||||
|
||||
@ -44,6 +46,9 @@ CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}"
|
||||
# if the MAC addresses are omitted, random values will be used
|
||||
CMDLINE_RNDIS ?= ""
|
||||
|
||||
# That allows to keep the traditional network interface names
|
||||
CMDLINE_IFNAMES ?= "net.ifnames=0"
|
||||
|
||||
CMDLINE = " \
|
||||
${CMDLINE_ISOL_CPUS} \
|
||||
${CMDLINE_DWC_OTG} \
|
||||
@ -55,6 +60,7 @@ CMDLINE = " \
|
||||
${CMDLINE_PITFT} \
|
||||
${CMDLINE_DEBUG} \
|
||||
${CMDLINE_RNDIS} \
|
||||
${CMDLINE_IFNAMES} \
|
||||
"
|
||||
|
||||
do_compile() {
|
||||
|
||||
@ -30,6 +30,8 @@ GPIO_IR ?= "18"
|
||||
GPIO_IR_TX ?= "17"
|
||||
|
||||
CAN_OSCILLATOR ?= "16000000"
|
||||
CAN0_INTERRUPT_PIN ?= "25"
|
||||
CAN1_INTERRUPT_PIN ?= "24"
|
||||
|
||||
ENABLE_UART ??= ""
|
||||
|
||||
@ -268,12 +270,12 @@ do_deploy() {
|
||||
# ENABLE DUAL CAN
|
||||
if [ "${ENABLE_DUAL_CAN}" = "1" ]; then
|
||||
echo "# Enable DUAL CAN" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=24" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=${CAN0_INTERRUPT_PIN}" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can1,oscillator=${CAN_OSCILLATOR},interrupt=${CAN1_INTERRUPT_PIN}" >>$CONFIG
|
||||
# ENABLE CAN
|
||||
elif [ "${ENABLE_CAN}" = "1" ]; then
|
||||
echo "# Enable CAN" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG
|
||||
echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=${CAN0_INTERRUPT_PIN}" >>$CONFIG
|
||||
fi
|
||||
|
||||
|
||||
@ -317,6 +319,13 @@ do_deploy() {
|
||||
echo "# Enable One-Wire Interface" >> $CONFIG
|
||||
echo "dtoverlay=w1-gpio" >> $CONFIG
|
||||
fi
|
||||
|
||||
# Reduce config.txt file size to avoid corruption and
|
||||
# to boot successfully Raspberry Pi 5. The issue has
|
||||
# been reported to related projects:
|
||||
# https://github.com/raspberrypi/firmware/issues/1848
|
||||
# https://github.com/Evilpaul/RPi-config/issues/9
|
||||
sed -i '/^##/d' $CONFIG
|
||||
}
|
||||
|
||||
do_deploy:append:raspberrypi3-64() {
|
||||
|
||||
@ -8,8 +8,8 @@ SRC_URI = " \
|
||||
git://github.com/raspberrypi/rpi-eeprom.git;protocol=https;branch=master \
|
||||
"
|
||||
|
||||
SRCREV = "f13b5789f56f65112e2b8aa58be43ebfcbedfe1d"
|
||||
PV = "v2023.10.18-2712"
|
||||
SRCREV = "36e58db5c2a2656e553441f4f48f32227809105d"
|
||||
PV = "v.2024.02.16-2712"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@ -34,22 +34,29 @@ do_install() {
|
||||
install -m 0755 ${S}/rpi-eeprom-digest ${D}${bindir}
|
||||
|
||||
# copy firmware files
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/default
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/default
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/latest
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/default
|
||||
install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/latest
|
||||
|
||||
install -m 644 ${S}/firmware-2711/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/default
|
||||
install -m 644 ${S}/firmware-2711/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest
|
||||
install -m 644 ${S}/firmware-2711/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/default
|
||||
install -m 644 ${S}/firmware-2711/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/latest
|
||||
install -m 644 ${S}/firmware-2712/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/default
|
||||
install -m 644 ${S}/firmware-2712/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/latest
|
||||
|
||||
ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader/critical
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/stable
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/beta
|
||||
ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/critical
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/stable
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2711/beta
|
||||
ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/critical
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/stable
|
||||
ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader-2712/beta
|
||||
|
||||
# copy default config
|
||||
install -d ${D}${sysconfdir}/default
|
||||
install -D ${S}/rpi-eeprom-update-default ${D}${sysconfdir}/default/rpi-eeprom-update
|
||||
}
|
||||
|
||||
FILES:${PN} += "${base_libdir}/firmware/raspberrypi/bootloader/*"
|
||||
FILES:${PN} += "${base_libdir}/firmware/raspberrypi/bootloader-*"
|
||||
|
||||
INHIBIT_PACKAGE_STRIP = "1"
|
||||
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
@ -59,4 +66,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
|
||||
# need to disable arch check for it otherwise it cannot packed.
|
||||
QAPATHTEST[arch] = ""
|
||||
|
||||
COMPATIBLE_MACHINE = "raspberrypi4|raspberrypi4-64"
|
||||
COMPATIBLE_MACHINE = "raspberrypi4|raspberrypi4-64|raspberrypi5"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
fdt addr ${fdt_addr} && fdt get value bootargs /chosen bootargs
|
||||
fatload mmc 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
|
||||
if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
|
||||
fatload @@BOOT_MEDIA@@ 0:1 ${kernel_addr_r} @@KERNEL_IMAGETYPE@@
|
||||
if test ! -e @@BOOT_MEDIA@@ 0:1 uboot.env; then saveenv; fi;
|
||||
@@KERNEL_BOOTCMD@@ ${kernel_addr_r} - ${fdt_addr}
|
||||
|
||||
@ -9,9 +9,12 @@ INHIBIT_DEFAULT_DEPS = "1"
|
||||
|
||||
SRC_URI = "file://boot.cmd.in"
|
||||
|
||||
BOOT_MEDIA ?= "mmc"
|
||||
|
||||
do_compile() {
|
||||
sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
|
||||
-e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
|
||||
-e 's/@@BOOT_MEDIA@@/${BOOT_MEDIA}/' \
|
||||
"${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
|
||||
mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
|
||||
}
|
||||
|
||||
@ -12,8 +12,7 @@ COMPATIBLE_MACHINE = "^rpi$"
|
||||
|
||||
SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "9bd2d39bf4b3a9e81dce799ca51c826a"
|
||||
SRC_URI[sha256sum] = "564920d205977d7e2846e434947708455d468d3a952feca9faef643abd03a227"
|
||||
SRC_URI[sha256sum] = "e67a986462618988a5a86752e36e3ebdd7c5cae66940ff7330aea243b2762525"
|
||||
|
||||
inherit autotools
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -46,6 +46,7 @@ SRC_URI = "\
|
||||
file://0022-all-host_applications-remove-non-existent-projects.patch \
|
||||
file://0023-hello_pi-optionally-build-wayland-specific-app.patch \
|
||||
file://0024-userland-Sync-needed-defines-for-weston-build.patch \
|
||||
file://0025-CMakeLists.txt-.pc-respect-CMAKE_INSTALL_LIBDIR.patch \
|
||||
"
|
||||
|
||||
SRC_URI:remove:toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch"
|
||||
|
||||
@ -16,7 +16,7 @@ SECTION = "kernel"
|
||||
# [^1]: https://github.com/RPi-Distro/bluez-firmware/issues/1
|
||||
LICENSE = "Firmware-cypress-rpidistro"
|
||||
LIC_FILES_CHKSUM = "\
|
||||
file://LICENCE.cypress-rpidistro;md5=c5d12ae0b24ef7177902a8e288751a4e \
|
||||
file://LICENCE.cypress-rpidistro;md5=be80828daf682762f392131141288a74 \
|
||||
"
|
||||
|
||||
# These are not common licenses, set NO_GENERIC_LICENSE for them
|
||||
@ -24,10 +24,10 @@ LIC_FILES_CHKSUM = "\
|
||||
NO_GENERIC_LICENSE[Firmware-cypress-rpidistro] = "LICENCE.cypress-rpidistro"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/RPi-Distro/bluez-firmware;branch=master;protocol=https \
|
||||
git://github.com/RPi-Distro/bluez-firmware;branch=bookworm;protocol=https \
|
||||
"
|
||||
SRCREV = "9556b08ace2a1735127894642cc8ea6529c04c90"
|
||||
PV = "1.2-4+rpt10"
|
||||
SRCREV = "78d6a07730e2d20c035899521ab67726dc028e1c"
|
||||
PV = "1.2-9+rpt3"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@ -51,19 +51,21 @@ do_install() {
|
||||
install -d ${D}${nonarch_base_libdir}/firmware/brcm
|
||||
|
||||
cp LICENCE.cypress-rpidistro ${D}${nonarch_base_libdir}/firmware
|
||||
install -m 0644 broadcom/BCM434*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
|
||||
install -m 0644 debian/firmware/broadcom/BCM434*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
|
||||
}
|
||||
|
||||
PACKAGES = "\
|
||||
${PN}-cypress-license \
|
||||
${PN}-bcm43430a1-hcd \
|
||||
${PN}-bcm43430b0-hcd \
|
||||
${PN}-bcm4343a2-hcd \
|
||||
${PN}-bcm4345c0-hcd \
|
||||
${PN}-bcm4345c5-hcd \
|
||||
"
|
||||
|
||||
LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro"
|
||||
LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro"
|
||||
LICENSE:${PN}-bcm4343a2-hcd = "Firmware-cypress-rpidistro"
|
||||
LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro"
|
||||
LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro"
|
||||
LICENSE:${PN}-cypress-license = "Firmware-cypress-rpidistro"
|
||||
@ -77,6 +79,9 @@ FILES:${PN}-bcm43430a1-hcd = "\
|
||||
FILES:${PN}-bcm43430b0-hcd = "\
|
||||
${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \
|
||||
"
|
||||
FILES:${PN}-bcm4343a2-hcd = "\
|
||||
${nonarch_base_libdir}/firmware/brcm/BCM4343A2.hcd \
|
||||
"
|
||||
FILES:${PN}-bcm4345c0-hcd = "\
|
||||
${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \
|
||||
"
|
||||
@ -86,12 +91,15 @@ FILES:${PN}-bcm4345c5-hcd = "\
|
||||
|
||||
RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license"
|
||||
RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license"
|
||||
RDEPENDS:${PN}-bcm4343a2-hcd += "${PN}-cypress-license"
|
||||
RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license"
|
||||
RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license"
|
||||
RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
|
||||
RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd"
|
||||
RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
|
||||
RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd"
|
||||
RCONFLICTS:${PN}-bcm4343a2-hcd = "linux-firmware-bcm4343a2-hcd"
|
||||
RREPLACES:${PN}-bcm4343a2-hcd = "linux-firmware-bcm4343a2-hcd"
|
||||
RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
|
||||
RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd"
|
||||
RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd"
|
||||
|
||||
@ -7,7 +7,7 @@ SECTION = "kernel"
|
||||
|
||||
LICENSE = "GPL-2.0-only & binary-redist-Cypress-rpidistro & Synaptics-rpidistro"
|
||||
LIC_FILES_CHKSUM = "\
|
||||
file://debian/copyright;md5=03475efdcf4c53c8f2d8fb4bc1fc6965 \
|
||||
file://debian/copyright;md5=291ee5385b4cf74b10c5fb5a46a7bbc6 \
|
||||
"
|
||||
# Where these are no common licenses, set NO_GENERIC_LICENSE so that the
|
||||
# license files will be copied from the fetched source.
|
||||
@ -15,11 +15,11 @@ NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/copyright"
|
||||
NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/copyright"
|
||||
LICENSE_FLAGS = "synaptics-killswitch"
|
||||
|
||||
SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https \
|
||||
SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bookworm;protocol=https \
|
||||
file://0001-Default-43455-firmware-to-standard-variant.patch \
|
||||
"
|
||||
SRCREV = "2c3a8701193ba23d0ef85cdf0d0c9e47baf03dfc"
|
||||
PV = "20230210-5_bpo11+1"
|
||||
SRCREV = "4b356e134e8333d073bd3802d767a825adec3807"
|
||||
PV = "20230625-2+rpt3"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit allarch
|
||||
@ -34,6 +34,7 @@ do_install() {
|
||||
|
||||
for fw in \
|
||||
brcmfmac43430-sdio \
|
||||
brcmfmac43430b0-sdio \
|
||||
brcmfmac43436-sdio \
|
||||
brcmfmac43436s-sdio \
|
||||
brcmfmac43455-sdio \
|
||||
@ -69,9 +70,15 @@ FILES:${PN}-bcm43430 = " \
|
||||
${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin \
|
||||
${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob \
|
||||
"
|
||||
FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*"
|
||||
FILES:${PN}-bcm43436 = " \
|
||||
${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-* \
|
||||
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430b0-* \
|
||||
"
|
||||
FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*"
|
||||
FILES:${PN}-bcm43439 = "${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined"
|
||||
FILES:${PN}-bcm43439 = " \
|
||||
${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined \
|
||||
${nonarch_base_libdir}/firmware/cypress/cyfmac43439-sdio* \
|
||||
"
|
||||
FILES:${PN}-bcm43455 = " \
|
||||
${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* \
|
||||
${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio* \
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 32f53700aeef2f5c7797ddda66348fc0b29e1047 Mon Sep 17 00:00:00 2001
|
||||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Wed, 18 Jan 2023 12:21:35 -0800
|
||||
Subject: [PATCH] gcc-plugins: Reorganize gimple includes for GCC 13
|
||||
|
||||
The gimple-iterator.h header must be included before gimple-fold.h
|
||||
starting with GCC 13. Reorganize gimple headers to work for all GCC
|
||||
versions.
|
||||
|
||||
Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
|
||||
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
|
||||
Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
|
||||
Cc: linux-hardening@vger.kernel.org
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
scripts/gcc-plugins/gcc-common.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
|
||||
index 0c087614fc3e..27770c31214c 100644
|
||||
--- a/scripts/gcc-plugins/gcc-common.h
|
||||
+++ b/scripts/gcc-plugins/gcc-common.h
|
||||
@@ -77,8 +77,10 @@
|
||||
#include "varasm.h"
|
||||
#include "stor-layout.h"
|
||||
#include "internal-fn.h"
|
||||
+#include "gimple.h"
|
||||
#include "gimple-expr.h"
|
||||
#include "gimple-fold.h"
|
||||
+#include "gimple-iterator.h"
|
||||
#include "context.h"
|
||||
#include "tree-ssa-alias.h"
|
||||
#include "tree-ssa.h"
|
||||
@@ -91,11 +93,9 @@
|
||||
#include "tree-eh.h"
|
||||
#include "stmt.h"
|
||||
#include "gimplify.h"
|
||||
-#include "gimple.h"
|
||||
#include "tree-ssa-operands.h"
|
||||
#include "tree-phinodes.h"
|
||||
#include "tree-cfg.h"
|
||||
-#include "gimple-iterator.h"
|
||||
#include "gimple-ssa.h"
|
||||
#include "ssa-iterators.h"
|
||||
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -1,8 +1,3 @@
|
||||
CONFIG_ANDROID=y
|
||||
|
||||
#CONFIG_ANDROID_BINDERFS is not set
|
||||
CONFIG_ANDROID_BINDER_IPC=y
|
||||
CONFIG_ANDROID_BINDER_DEVICES="binder"
|
||||
|
||||
CONFIG_ASHMEM=y
|
||||
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
# see emmc node
|
||||
CONFIG_MMC_SDHCI_IPROC=y
|
||||
@ -1 +0,0 @@
|
||||
patch 0001-gcc-plugins-Reorganize-gimple-includes-for-GCC-13.patch
|
||||
@ -3,4 +3,4 @@
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
require linux-raspberrypi-v7.inc
|
||||
require linux-raspberrypi_5.15.bb
|
||||
require linux-raspberrypi_6.6.bb
|
||||
@ -33,6 +33,7 @@ KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig"
|
||||
KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig"
|
||||
KBUILD_DEFCONFIG:raspberrypi-armv7 ?= "bcm2711_defconfig"
|
||||
KBUILD_DEFCONFIG:raspberrypi-armv8 ?= "bcm2711_defconfig"
|
||||
KBUILD_DEFCONFIG:raspberrypi5 ?= "bcm2712_defconfig"
|
||||
|
||||
LINUX_VERSION_EXTENSION ?= ""
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user