diff options
Diffstat (limited to 'meta-agl-bsp/conf/include')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 12 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi5.inc | 29 |
2 files changed, 14 insertions, 27 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index 4ba7ff0f6..998ffedc8 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -21,17 +21,5 @@ IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux- # Psplash causes crash on first boot on RPi IMAGE_FEATURES:remove = "splash" -# Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES:append = " sota" - -# Add xen build, if the xen feature activated -DISTRO_FEATURES:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" - -# add xen-tools to build -IMAGE_INSTALL:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools xen-mkimage-rpi4', '', d)}" - -# Add xen-raspberry binary to boot files -IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" - #DISPLAY CONFIGURATION WESTON_DISPLAYS:raspberrypi4 = " hdmi-a-1-90 hdmi-a-2-90" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc index a0e675956..212c9ff1b 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc @@ -4,8 +4,16 @@ GPU_MEM = "256" # Add CMA to the kernel arguments for SOTA OSTREE_KERNEL_ARGS:sota:append = " cma=256M" -# use u-boot always (RPi5 U-boot is not ready yet) -RPI_USE_U_BOOT = "0" +# use u-boot always +RPI_USE_U_BOOT = "1" + +# Re-enable U-Boot for raspberrypi5 here until upstream is fixed. +# Note that this assumes the use of scarthgap/u-boot meta-lts-mixins +# branch. +UBOOT_MACHINE = "rpi_arm64_config" +COMPATIBLE_MACHINE:pn-u-boot:forcevariable = "" +KERNEL_IMAGETYPE_UBOOT ?= "Image" +KERNEL_BOOTCMD ?= "booti" # Use UART for serial console ENABLE_UART ?= "1" @@ -13,22 +21,13 @@ ENABLE_UART ?= "1" # For libomxil #LICENSE_FLAGS_ACCEPTED = "commercial" -IMAGE_INSTALL:append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb " +# For linux-firmware-rpidistro +LICENSE_FLAGS_ACCEPTED += "synaptics-killswitch" + +IMAGE_INSTALL:append = " kernel-modules create-combined-dtb " # Psplash causes crash on first boot on RPi IMAGE_FEATURES:remove = "splash" -# Build updatable image. Only takes effect when sota.bbclass is inherited -DISTRO_FEATURES:append = " sota" - -# Add xen build, if the xen feature activated -DISTRO_FEATURES:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" - -# add xen-tools to build -IMAGE_INSTALL:append = " ${@bb.utils.contains('AGL_XEN_WANTED', '1', 'xen-tools xen-mkimage-rpi4', '', d)}" - -# Add xen-raspberry binary to boot files -IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('AGL_XEN_WANTED','1', 'xen-${MACHINE}', '',d)}" - #DISPLAY CONFIGURATION WESTON_DISPLAYS:raspberrypi5 = " hdmi-a-1-90 hdmi-a-2-90" |