summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin@balena.io>2021-08-19 15:36:14 +0200
committerFlorin Sarbu <florin@balena.io>2021-08-19 15:36:41 +0200
commit486f986342f141bbbc5bd4dac534881a497a7675 (patch)
tree416e4f3a67f9ea2a6856433efcbcb4a2f610948d
parent596907b3bae9dc8fa7f1cea4cf87fe44be9a2417 (diff)
downloadmeta-raspberrypi-revert_dropping_64-bits_dtbs_compile_append.tar.gz
Revert "linux-raspberry: Drop 64-bit specific do_compile_append()"revert_dropping_64-bits_dtbs_compile_append
This reverts commit a7cc636d4ef0ed7ddabf5785463dbb5c79633b1e which broke loading overlays. The behaviour is that, as per the comments in 6c4de0b5fe44b8e661f1391ee8540a7f04d75315, the device tree blobs generated on 64 bits lack the symbols and thus no overlays can be loaded (checked with running "vcdbg log msg"): 005284.623: dtb_file 'bcm2711-rpi-4-b.dtb' 005289.625: brfs: File read: /mfs/sd/bcm2711-rpi-4-b.dtb 005289.641: Loading 'bcm2711-rpi-4-b.dtb' to 0x100 size 0x8c60 005302.330: brfs: File read: 35936 bytes 005310.499: brfs: File read: /mfs/sd/overlays/overlay_map.dtb 005358.309: brfs: File read: 1559 bytes 005360.894: brfs: File read: /mfs/sd/config.txt 005361.275: brfs: File read: 143 bytes 005372.465: brfs: File read: /mfs/sd/overlays/vc4-fkms-v3d.dtbo 005375.749: dterror: no symbols found 005375.760: Failed to resolve overlay 'vc4-fkms-v3d' 005376.120: brfs: File read: 1446 bytes 005385.470: brfs: File read: /mfs/sd/overlays/disable-wifi.dtbo 005388.352: dterror: no symbols found 005388.361: Failed to resolve overlay 'disable-wifi'
-rw-r--r--recipes-kernel/linux/linux-raspberrypi.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index ea47b56..2fd13e9 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -35,3 +35,10 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r",
35# set by default in rpi-4.8.y and later branches so we need to provide it 35# set by default in rpi-4.8.y and later branches so we need to provide it
36# manually. This value unused if KERNEL_IMAGETYPE is not uImage. 36# manually. This value unused if KERNEL_IMAGETYPE is not uImage.
37KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000" 37KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000"
38
39do_compile_append() {
40 if [ "${SITEINFO_BITS}" = "64" ]; then
41 cc_extra=$(get_cc_option)
42 oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
43 fi
44}