diff --git a/CMakeLists.txt b/CMakeLists.txt index a1dd84ce294..a0efbe31d13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,7 @@ option(BUILD_EVERYTHING "Build all optional components" ON) include(utils) include(flac_spec_tests) -include(download_raspberry_pi_3_dtb) +include(download_raspberry_pi_dtb) serenity_component( Tests diff --git a/Meta/CMake/download_raspberry_pi_3_dtb.cmake b/Meta/CMake/download_raspberry_pi_dtb.cmake similarity index 50% rename from Meta/CMake/download_raspberry_pi_3_dtb.cmake rename to Meta/CMake/download_raspberry_pi_dtb.cmake index 6d4a6be6007..6f66018f918 100644 --- a/Meta/CMake/download_raspberry_pi_3_dtb.cmake +++ b/Meta/CMake/download_raspberry_pi_dtb.cmake @@ -1,10 +1,16 @@ include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake) -if (ENABLE_RASPBERRY_PI_3_DTB_DOWNLOAD) +if (ENABLE_RASPBERRY_PI_DTB_DOWNLOAD) set(RASPBERRY_PI_3_DTB_SHA256 "39c4e2725dd2090e9b6573a746a7b3237693269e7fc915918f907764044910b7") set(RASPBERRY_PI_3_DTB_FILE bcm2710-rpi-3-b.dtb) set(RASPBERRY_PI_3_DTB_URL "https://github.com/raspberrypi/firmware/raw/1.20240529/boot/${RASPBERRY_PI_3_DTB_FILE}") set(RASPBERRY_PI_3_DTB_DOWNLOAD_PATH "${SERENITY_CACHE_DIR}/${RASPBERRY_PI_3_DTB_FILE}") + set(RASPBERRY_PI_4_DTB_SHA256 "5bc13e0f663531c374cbf4645e511708e40a0774fc7771ae869c5504dc9e39b3") + set(RASPBERRY_PI_4_DTB_FILE bcm2711-rpi-4-b.dtb) + set(RASPBERRY_PI_4_DTB_URL "https://github.com/raspberrypi/firmware/raw/1.20240529/boot/${RASPBERRY_PI_4_DTB_FILE}") + set(RASPBERRY_PI_4_DTB_DOWNLOAD_PATH "${SERENITY_CACHE_DIR}/${RASPBERRY_PI_4_DTB_FILE}") + download_file("${RASPBERRY_PI_3_DTB_URL}" "${RASPBERRY_PI_3_DTB_DOWNLOAD_PATH}" SHA256 "${RASPBERRY_PI_3_DTB_SHA256}") + download_file("${RASPBERRY_PI_4_DTB_URL}" "${RASPBERRY_PI_4_DTB_DOWNLOAD_PATH}" SHA256 "${RASPBERRY_PI_4_DTB_SHA256}") endif() diff --git a/Meta/CMake/serenity_options.cmake b/Meta/CMake/serenity_options.cmake index 38335cf4960..11b497c70ca 100644 --- a/Meta/CMake/serenity_options.cmake +++ b/Meta/CMake/serenity_options.cmake @@ -7,7 +7,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/common_options.cmake NO_POLICY_SCOPE) serenity_option(ENABLE_PCI_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the pci.ids database at build time") serenity_option(ENABLE_USB_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the usb.ids database at build time") serenity_option(ENABLE_PNP_IDS_DOWNLOAD ON CACHE BOOL "Enable download of the pnp.ids database at build time") -serenity_option(ENABLE_RASPBERRY_PI_3_DTB_DOWNLOAD ON CACHE BOOL "Enable download of the Raspberry Pi 3 devicetree blob at build time") +serenity_option(ENABLE_RASPBERRY_PI_DTB_DOWNLOAD ON CACHE BOOL "Enable download of the Raspberry Pi 3/4 devicetree blob at build time") serenity_option(ENABLE_KERNEL_ADDRESS_SANITIZER OFF CACHE BOOL "Enable kernel address sanitizer testing in gcc/clang") serenity_option(ENABLE_KERNEL_COVERAGE_COLLECTION OFF CACHE BOOL "Enable KCOV and kernel coverage instrumentation in gcc/clang") serenity_option(ENABLE_KERNEL_COVERAGE_COLLECTION_DEBUG OFF CACHE BOOL "Enable KCOV and kernel coverage instrumentation debugging")