diff options
Diffstat (limited to 'conf/machine/include/rpi-base.inc')
| -rw-r--r-- | conf/machine/include/rpi-base.inc | 115 |
1 files changed, 84 insertions, 31 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 36a8daf..a5fd1a4 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -5,7 +5,7 @@ include conf/machine/include/rpi-default-providers.inc SOC_FAMILY = "rpi" include conf/machine/include/soc-family.inc -IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" +IMAGE_FSTYPES ?= "tar.bz2 ext3 wic.bz2 wic.bmap" WKS_FILE ?= "sdimage-raspberrypi.wks" XSERVER = " \ @@ -15,44 +15,81 @@ XSERVER = " \ " RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ + overlays/overlay_map.dtb \ overlays/at86rf233.dtbo \ + overlays/disable-bt.dtbo \ + overlays/disable-wifi.dtbo \ overlays/dwc2.dtbo \ + overlays/gpio-ir.dtbo \ + overlays/gpio-ir-tx.dtbo \ overlays/gpio-key.dtbo \ + 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 \ + overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ + overlays/imx219.dtbo \ + overlays/imx477.dtbo \ + overlays/imx708.dtbo \ overlays/iqaudio-dac.dtbo \ overlays/iqaudio-dacplus.dtbo \ overlays/mcp2515-can0.dtbo \ - overlays/pi3-disable-bt.dtbo \ - overlays/pi3-miniuart-bt.dtbo \ + overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.dtbo \ + overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ + overlays/pitft28-capacitive.dtbo \ overlays/pitft28-resistive.dtbo \ overlays/pitft35-resistive.dtbo \ overlays/pps-gpio.dtbo \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ - overlays/vc4-kms-v3d.dtbo \ overlays/vc4-fkms-v3d.dtbo \ - overlays/w1-gpio-pullup.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 \ + overlays/wm8960-soundcard.dtbo \ " RPI_KERNEL_DEVICETREE ?= " \ - bcm2708-rpi-zero-w.dtb \ - bcm2708-rpi-b.dtb \ - bcm2708-rpi-b-plus.dtb \ - bcm2709-rpi-2-b.dtb \ - bcm2710-rpi-3-b.dtb \ - bcm2710-rpi-3-b-plus.dtb \ - bcm2711-rpi-4-b.dtb \ - bcm2708-rpi-cm.dtb \ - bcm2710-rpi-cm3.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 \ + broadcom/bcm2712-rpi-5-b.dtb \ " -KERNEL_DEVICETREE ?= " \ +KERNEL_DEVICETREE ??= " \ ${RPI_KERNEL_DEVICETREE} \ ${RPI_KERNEL_DEVICETREE_OVERLAYS} \ " @@ -75,42 +112,58 @@ MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa blue # Raspberry Pi has no hardware clock MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_IR', '1', 'kernel-module-gpio-ir kernel-module-gpio-ir-tx', '', d)}" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_GPIO_SHUTDOWN', '1', 'gpio-shutdown kernel-module-gpio-keys', '', d)}" -# Set Raspberrypi splash image -SPLASH = "psplash-raspberrypi" +SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" + +# The name of the deploy directory for raspberry pi boot files. +# This variable is referred to by recipes fetching / generating the files. +BOOTFILES_DIR_NAME ?= "bootfiles" def make_dtb_boot_files(d): # Generate IMAGE_BOOT_FILES entries for device tree files listed in # KERNEL_DEVICETREE. alldtbs = d.getVar('KERNEL_DEVICETREE') - imgtyp = d.getVar('KERNEL_IMAGETYPE') + + # DTBs may be built out of kernel with devicetree.bbclass + if not alldtbs: + return '' def transform(dtb): base = os.path.basename(dtb) - if dtb.endswith('dtb'): - # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: bcm2708-rpi-b.dtb - # destination: bcm2708-rpi-b.dtb - return base - elif dtb.endswith('dtbo'): + if dtb.endswith('dtbo') or base == 'overlay_map.dtb': # overlay dtb: # eg: overlays/hifiberry-amp.dtbo has: # DEPLOYDIR file: hifiberry-amp.dtbo # destination: overlays/hifiberry-amp.dtbo return '{};{}'.format(base, dtb) + elif dtb.endswith('dtb'): + # eg: whatever/bcm2708-rpi-b.dtb has: + # DEPLOYDIR file: bcm2708-rpi-b.dtb + # destination: bcm2708-rpi-b.dtb + return base return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) +RPI_EXTRA_IMAGE_BOOT_FILES ?= " \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ + '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + " -IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \ +IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \ ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + ${RPI_EXTRA_IMAGE_BOOT_FILES} \ " + +EXTRA_IMAGEDEPENDS += "rpi-bootfiles" + do_image_wic[depends] += " \ - bcm2835-bootfiles:do_deploy \ + virtual/kernel:do_deploy \ + rpi-bootfiles:do_deploy \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ " @@ -118,4 +171,4 @@ do_image_wic[recrdeps] = "do_build" # The kernel image is installed into the FAT32 boot partition and does not need # to also be installed into the rootfs. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" |