Clean dunfell and bring master changes #699
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit a907c32.
The device tree only supports a single CAN interface. This prevents compatiblity with dual-CAN boards like the PiCAN2 Duo. The mcp2515-can1 device tree blob for overlay was added to RPI_KERNEL_DEVICETREE_OVERLAYS in order to support dual-CAN hats. Signed-off-by: Colin McAllister <[email protected]>
Currently ENABLE_CAN adds mcp2525-can0 to the dtoverlay. ENABLE_DUAL_CAN was added to also add mcp2515-can1 to the dtoverlay. This will allow a user to enable dual CAN when using a hat like the PiCAN 2 Duo board. Signed-off-by: Colin McAllister <[email protected]>
Added documentation for ENABLE_DUAL_CAN build configuration and support for Pican2 Duo board. Signed-off-by: Colin McAllister <[email protected]>
Current configuration (16MHz) is made for the PiCAN2 board that uses 16MHz crystal. This setting allows for use of Waveshare RS485 CAN HAT that has 8MHz crystal soldered (although according to Waveshare there is also a 12MHz crystal version of the board). Signed-off-by: Jakub Luzny <[email protected]>
Add instructions how to use CAN_OSCILLATOR variable and declare support for the Waveshare RS485 CAN HAT. Signed-off-by: Jakub Luzny <[email protected]>
Add DEPLOYPAYLOAD, similar to the existing FATPAYLOAD, to enable
adding files to the boot partition from the image deploy directory.
Files such as hypervisor binaries may not be present (and in fact
unwanted) within the root filesystem, so FATPAYLOAD is not sufficient.
DEPLOYPAYLOAD is implemented with support for file renaming from the
source file in the image deploy directory to the filename written into
the boot image. DEPLOYPAYLOAD is a space-separated list of entries for
additions, each of which can optionally be colon-separated:
<image deploy directory file>:<destination filename>
If the colon separator is omitted, the source deploy directory filename
is used as the destination filename.
The support for specifying the destination filename is used for
including Xen, which produces a machine-specific file in the image
deploy directory, and is written to the image partition with its
expected filename: xen.
Files that are to be included from the image deploy directory will
be produced by tasks that the do_image_rpi_sdimg[depends] must list,
so enable adding entries to that via a new variable:
RPI_SDIMG_EXTRA_DEPENDS.
These changes enable retiring a Xen-specific Raspberry Pi SD card
bbclass from meta-virtualization and have been tested on the
Raspberry Pi 4.
Signed-off-by: Christopher Clark <[email protected]>
FATPAYLOAD, DEPLOYPAYLOAD and RPI_SDIMG_EXTRA_DEPENDS Signed-off-by: Christopher Clark <[email protected]>
The raspberry pi 4 variant has a BCM2711 chip, however it still uses the same boot files as the BCM2835 used in previous generations. This change generalizes the naming of the directory generated in the $DEPLOY_DIR to avoid the implication that the files are only meant for the BCM2835. Signed-off-by: Jeff Ithier <[email protected]>
This reverts commit fc494a3.
This reverts commit 89ca43f.
This reverts commit f20ccfa.
The u-boot-env is provided by u-boot recipe and not by libubootenv, so right recipe to append is the u-boot. Adding the rpi-u-boot-scr in DEPENDS variable is wrong because it is forcing rpi-u-boot-scr to be a dependency, but it'll fail if I have another recipe that provides bootscript, once both recipes provide the same file. The default value of u-boot-default-script is rpi-u-boot-scr, so right way is to use u-boot-default-script and change the PREFERRED_PROVIDER_u-boot-default-script if needed. Signed-off-by: Fabio Berton <[email protected]>
If the variable is not defined, bitbake will fail: [...] Task 'depends' should be specified in the form 'packagename:task' [...] This is because not expanding the variable leaves an invalid entry. Signed-off-by: Andrei Gherzan <[email protected]>
|
@mirzak It actually adds it afterward. This is because by doing it in the same master order we avoid conflicts (in this case on |
|
LGTM and thanks for fixing that u-boot build. |
|
Thanks for the reviews. Merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I reverted the custom backports and cleanly added them in the master order so we can maintain the changes easier. Also, one specific change was reverted without backporting because it was broken (#660 CC @nandra). This PR misses a
FILESEXTRAPATHSso please re-push.This also fixes #696.
The only additional fix is
sdcard_image-rpi.bbclass: Fix when RPI_SDIMG_EXTRA_DEPENDS not defined. That fix is also pushed againstmaster(#698).