diff options
Diffstat (limited to 'import-layers/meta-raspberrypi/conf')
6 files changed, 33 insertions, 10 deletions
diff --git a/import-layers/meta-raspberrypi/conf/layer.conf b/import-layers/meta-raspberrypi/conf/layer.conf index bbdce1458..cfc22342f 100644 --- a/import-layers/meta-raspberrypi/conf/layer.conf +++ b/import-layers/meta-raspberrypi/conf/layer.conf @@ -9,6 +9,8 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" +LAYERSERIES_COMPAT_raspberrypi = "sumo" + # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc index 688227c09..d76495a68 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -6,6 +6,7 @@ SOC_FAMILY = "rpi" include conf/machine/include/soc-family.inc IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" +WKS_FILE ?= "sdimage-raspberrypi.wks" XSERVER = " \ xserver-xorg \ @@ -19,9 +20,11 @@ KERNEL_DEVICETREE ?= " \ bcm2708-rpi-b-plus.dtb \ bcm2709-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ + bcm2710-rpi-3-b-plus.dtb \ bcm2708-rpi-cm.dtb \ bcm2710-rpi-cm3.dtb \ \ + overlays/dwc2.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ @@ -51,14 +54,16 @@ KERNEL_DEVICETREE ?= " \ # within u-boot to load the kernel. KERNEL_BOOTCMD ??= "bootm" KERNEL_IMAGETYPE_UBOOT ??= "uImage" -KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'Image', d)}" +KERNEL_IMAGETYPE_DIRECT ??= "zImage" +KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}" MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" # Raspberry Pi has no hardware clock MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi" # Set Raspberrypi splash image SPLASH = "psplash-raspberrypi" @@ -102,6 +107,8 @@ do_image_wic[depends] += " \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ " +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-base = "" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index faa6b41d0..a5fe6d707 100644 --- a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "4.9.%" +PREFERRED_VERSION_linux-raspberrypi ??= "4.14.%" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf index adb2238dd..accdf3ce3 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf @@ -6,10 +6,12 @@ DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-bcm43430 \ + linux-firmware-bcm43430a1-hcd \ +" SDIMG_KERNELIMAGE ?= "kernel.img" -KERNEL_DEFCONFIG ?= "bcmrpi_defconfig" -UBOOT_MACHINE ?= "rpi_config" +UBOOT_MACHINE ?= "rpi_0_w_defconfig" SERIAL_CONSOLE ?= "115200 ttyS0" VC4_CMA_SIZE ?= "cma-128" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index ebc9f382c..5163320da 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -4,13 +4,19 @@ MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-bcm43430 \ + linux-firmware-bcm43455 \ + linux-firmware-bcm43430a1-hcd \ + linux-firmware-bcm4345c0-hcd \ +" require conf/machine/include/arm/arch-armv8.inc include conf/machine/include/rpi-base.inc KERNEL_DEVICETREE = " \ broadcom/bcm2710-rpi-3-b.dtb \ + broadcom/bcm2710-rpi-3-b-plus.dtb \ broadcom/bcm2837-rpi-3-b.dtb \ \ overlays/hifiberry-amp.dtbo \ @@ -43,4 +49,6 @@ MACHINE_FEATURES_append = " vc4graphics" # 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" diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf index b511bec0d..8b5cce51f 100644 --- a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -6,10 +6,14 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" require conf/machine/include/tune-cortexa7.inc include conf/machine/include/rpi-base.inc -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-bcm43430" +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-bcm43430 \ + linux-firmware-bcm43455 \ + linux-firmware-bcm43430a1-hcd \ + linux-firmware-bcm4345c0-hcd \ +" SDIMG_KERNELIMAGE ?= "kernel7.img" -KERNEL_DEFCONFIG ?= "bcm2709_defconfig" UBOOT_MACHINE = "rpi_3_32b_config" SERIAL_CONSOLE ?= "115200 ttyS0" VC4_CMA_SIZE ?= "cma-256" |
