From 0393560d3b5fe26deb4960358b7e98f5c4051cf3 Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Fri, 11 Apr 2025 11:47:38 +0000 Subject: [PATCH 01/16] linux: config: add and remove required build configs Remove CONFIG_AMD_IOMMU_V2, CONFIG_FB_ARMCLCD, CONFIG_MD_LINEAR, CONFIG_NET_ACT_IPT. Add CONFIG_MODULE_COMPRESS. See: https://github.com/torvalds/linux/commit/5a0b11a180a9b82b4437a4be1cf73530053f139b linux: remove CONFIG_MD_LINEAR See: https://github.com/torvalds/linux/commit/849d18e27be9a1253f2318cb4549cc857219d991 linux: remove CONFIG_NET_ACT_IPT See: https://github.com/torvalds/linux/commit/86fe596b588fc9ec23bf93a5c8f86fc16225dd3a linux: add required CONFIG_MODULE_COMPRESS=y See: https://github.com/torvalds/linux/commit/c7ff693fa2094ba0a9d0a20feb4ab1658eff9c33 linux: remove CONFIG_FB_ARMCLCD See: https://github.com/torvalds/linux/commit/dee56ccb468a832074397fdbf22bbd9bf6d710aa --- .../sys-kernel/coreos-modules/files/commonconfig-6.12 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 index 32312c1cba9..eb20eb00891 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.12 @@ -455,7 +455,6 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MARVELL_PHY=m CONFIG_MAX_RAW_DEVS=8192 CONFIG_MD=y -CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_MM=m From c824fadf9befe1567322a2d7f1468b90ec3e63ce Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 8 May 2025 15:58:27 +0200 Subject: [PATCH 02/16] Enable Rockchip kernel configurations --- .../coreos-modules/files/arm64_defconfig-6.12 | 121 +++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 1fc273f107b..2fe6109ecb8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -5,6 +5,7 @@ CONFIG_ARCH_BCM2835=y CONFIG_ARCH_BCM_IPROC=y # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_QCOM is not set +CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_SPRD=y CONFIG_ARCH_TEGRA=y @@ -24,7 +25,7 @@ CONFIG_BCMGENET=y CONFIG_CHR_DEV_SCH=m CONFIG_CMA=y CONFIG_COMPAT=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y @@ -109,3 +110,121 @@ CONFIG_USB_ULPI=y CONFIG_USB_XHCI_PLATFORM=y CONFIG_VIRTUALIZATION=y CONFIG_XGENE_DMA=y + +# Configs from Home Assistant OS + +CONFIG_CRYPTO_ENGINE=m +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_SETEND_EMULATION=y + +CONFIG_NVME_CORE=y +CONFIG_NVME_HWMON=y + +CONFIG_I6300ESB_WDT=y + +CONFIG_GPIO_PCA9570=y + +CONFIG_USB_ONBOARD_DEV=y +CONFIG_USB_ONBOARD_DEV_USB5744=y + +CONFIG_I2C_CADENCE=y + +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_SENSORS_GPIO_FAN=y + +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_GPIO_POLLED=y + +CONFIG_MMC_SDHCI_OF_DWCMSHC=y + +# CONFIG_DW_WATCHDOG is not set + + +# Configs from multiple sources + +CONFIG_ROCKCHIP_ERRATUM_3588001=y +CONFIG_PCIE_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=y +# CONFIG_PCIE_ROCKCHIP_EP is not set +CONFIG_PCIE_ROCKCHIP_DW_HOST=y +CONFIG_MTD_NAND_ROCKCHIP=y +CONFIG_MTD_RAW_NAND=y +CONFIG_HAS_IOMEM=y +# CONFIG_EMAC_ROCKCHIP is not set +CONFIG_ROCKCHIP_PHY=y +CONFIG_HW_RANDOM_ROCKCHIP=y +CONFIG_SPI_ROCKCHIP=y + +CONFIG_SPI_ROCKCHIP_SFC=m=y +CONFIG_PINCTRL_ROCKCHIP=y +CONFIG_GPIO_ROCKCHIP=y +CONFIG_ROCKCHIP_THERMAL=y +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_VOP=y +CONFIG_ROCKCHIP_VOP2=y +CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_CDN_DP=y +CONFIG_ROCKCHIP_DW_HDMI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_INNO_HDMI=y +CONFIG_ROCKCHIP_LVDS=y +CONFIG_ROCKCHIP_RGB=y +CONFIG_ROCKCHIP_RK3066_HDMI=y +CONFIG_COMMON_CLK_ROCKCHIP=y +CONFIG_ROCKCHIP_TIMER=y +CONFIG_ROCKCHIP_MBOX=y +CONFIG_ROCKCHIP_IOMMU=y +CONFIG_ROCKCHIP_GRF=y +CONFIG_ROCKCHIP_IODOMAIN=y +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y +CONFIG_PM_DEVFREQ=y +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_ROCKCHIP_SARADC=y +CONFIG_IIO=y +CONFIG_RESET_CONTROLLER=y +CONFIG_PWM=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_DP=y +CONFIG_PHY_ROCKCHIP_DPHY_RX0=m +CONFIG_PHY_ROCKCHIP_EMMC=y +CONFIG_PHY_ROCKCHIP_INNO_HDMI=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y +CONFIG_PHY_ROCKCHIP_PCIE=y +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y +CONFIG_PHY_ROCKCHIP_TYPEC=y +CONFIG_PHY_ROCKCHIP_USB=y +CONFIG_NVMEM_ROCKCHIP_EFUSE=m +CONFIG_NVMEM_ROCKCHIP_OTP=m +CONFIG_CRYPTO_DEV_ROCKCHIP=m +# CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG is not set +CONFIG_I2C_RK3X=y +CONFIG_CLK_RK3308=y +CONFIG_CLK_RK3328=y +CONFIG_CLK_RK3368=y +CONFIG_CLK_RK3399=y +CONFIG_CLK_RK3568=y +CONFIG_CLK_RK3588=y + +CONFIG_COMPILE_TEST=y +CONFIG_OF_OVERLAY=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +CONFIG_OF_ALL_DTBS=y + +CONFIG_SCSI=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_IBFT=y + +CONFIG_MFD_RK8XX=y +CONFIG_MFD_RK8XX_I2C=y +CONFIG_MFD_RK8XX_SPI=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_RK805=y +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_RK808=y From a5cadc660ee59a4169ee865c537da0d4021d248a Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 8 May 2025 16:06:22 +0200 Subject: [PATCH 03/16] Temporary copy Github CI workflow from @ader1990 to allow image build --- .github/workflows/ci.yaml | 121 ++++---------------------------------- 1 file changed, 10 insertions(+), 111 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a8d23875143..1ab37edd933 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: description: | Space-separated vendor formats to build. required: true - default: qemu_uefi pxe + default: qemu_uefi custom_sdk_version: type: string required: false @@ -21,7 +21,7 @@ on: description: | Space-separated vendor formats to build. required: true - default: qemu_uefi pxe + default: qemu_uefi custom_sdk_version: type: string required: false @@ -35,14 +35,11 @@ jobs: packages: name: "Build Flatcar packages" runs-on: - - self-hosted - - ubuntu - - build - - amd64 + - ubuntu-latest strategy: - fail-fast: false + fail-fast: true matrix: - arch: ["amd64", "arm64"] + arch: ["arm64"] defaults: run: working-directory: scripts @@ -92,7 +89,7 @@ jobs: arch="${{ matrix.arch }}" echo "arch=${arch}" >> $GITHUB_ENV - IMAGE_FORMATS="qemu_uefi pxe" + IMAGE_FORMATS="qemu_uefi" [ -z "${{ inputs.image_formats }}" ] || IMAGE_FORMATS="${{ inputs.image_formats }}" echo "IMAGE_FORMATS=${IMAGE_FORMATS}" >> $GITHUB_ENV @@ -138,31 +135,6 @@ jobs: -C "${sdk_image}" \ ./build_packages --board="${arch}-usr" - # Create binpkgs tarball for archiving as artifact later - ./run_sdk_container -n "${container_name}" \ - tar -C "/build/${arch}-usr/var/lib/portage/pkgs/" \ - -cvf binpkgs.tar . - - - name: Extract build logs - if: always() && !cancelled() - shell: bash - run: | - set -euo pipefail - set -x - # Copy logs - ./run_sdk_container -n "${container_name}" \ - tar -cJf ebuild_logs.tar.xz /build/${arch}-usr/var/log/portage \ - /build/${arch}-usr/var/tmp/portage - - - name: Upload build logs - if: always() && !cancelled() - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-build-logs - path: | - scripts/ebuild_logs.tar.xz - - name: Build image shell: bash run: | @@ -181,7 +153,7 @@ jobs: ./run_sdk_container -n "${container_name}" \ ./build_image --board="${arch}-usr" --group="${channel}" \ --output_root="${CI_CONTAINER_ARTIFACT_ROOT}" \ - prodtar container sysext + --image_compression_formats=none - name: Build VM image(s) shell: bash @@ -239,88 +211,15 @@ jobs: mv * ../../images/ ) - - name: Generate reports against last release - run: .github/workflows/image_changes.sh ${{ matrix.arch }} release - - - name: Generate reports against last nightly - run: .github/workflows/image_changes.sh ${{ matrix.arch }} nightly - - - name: Upload binpkgs - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-binpkgs - path: | - scripts/binpkgs.tar - - - name: Upload update image (used with kola tests later) - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-test-update - path: | - scripts/artifacts/images/flatcar_test_update.gz - - name: Upload generic image uses: actions/upload-artifact@v4 with: retention-days: 7 name: ${{ matrix.arch }}-generic-image path: | - scripts/artifacts/images/flatcar_production_image.bin - scripts/artifacts/images/flatcar_production_image.grub - scripts/artifacts/images/flatcar_production_image.shim - scripts/artifacts/images/flatcar_production_image.vmlinuz - scripts/artifacts/images/flatcar_production_image*.txt - scripts/artifacts/images/flatcar_production_image*.json - scripts/artifacts/images/flatcar_production_image_pcr_policy.zip - scripts/artifacts/images/flatcar_production_*_efi_*.qcow2 - scripts/artifacts/images/flatcar_production_qemu.sh - - - name: Upload developer container - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-devcontainer - path: | - scripts/artifacts/images/flatcar_developer_container* - - - name: Upload reports - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-image-changes-reports - path: | - scripts/image-changes-reports*.txt - - # Clean up what we uploaded already so the "vendor images" wildcard - # works when uploading artifacts in the next step. - - name: Remove update, generic and devcontainer images - shell: bash - run: | - set -euo pipefail - set -x - rm -f artifacts/images/flatcar_test_update.gz \ - artifacts/images/flatcar_production_image* \ - artifacts/images/flatcar_developer_container* \ - artifacts/images/flatcar_production_update* - - - name: Upload vendor images - uses: actions/upload-artifact@v4 - with: - retention-days: 7 - name: ${{ matrix.arch }}-vm-images - path: | - scripts/artifacts/images/*.img scripts/artifacts/images/*.bin - scripts/artifacts/images/flatcar_production_*_efi_*.qcow2 + scripts/artifacts/images/*.img scripts/artifacts/images/*.txt scripts/artifacts/images/flatcar-*.raw - scripts/artifacts/images/flatcar_production_*.sh - scripts/artifacts/images/flatcar_production_pxe_image.cpio.gz - scripts/artifacts/images/flatcar_production_pxe.vmlinuz - - test: - needs: packages - name: "Run kola tests" - uses: ./.github/workflows/run-kola-tests.yaml + scripts/artifacts/images/flatcar_production_*_efi_*.qcow2 + scripts/artifacts/images/flatcar_production_qemu.sh From e15199cf534cb34278f3a65343bbecd63ffbbecd Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 11 May 2025 09:04:39 +0200 Subject: [PATCH 04/16] Temporary set disk layout to aligment to 8192 blocks to leave some room for U-Boot --- build_library/disk_layout.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json index 33ae6cb4732..cb8ddc704bf 100644 --- a/build_library/disk_layout.json +++ b/build_library/disk_layout.json @@ -2,7 +2,7 @@ "_comment": "See http://www.chromium.org/chromium-os/building-chromium-os/disk-layout-format", "metadata":{ "_comment": "Partitions are aligned to 2MB (4096 blocks). For the sake of VHD disks sizes should align to *both* 2MB and a CHS cylender boundry for the common 16H 63S geometry (16*63 = 1008 blocks). The least common multiple of 4096 and 1008 is 258048 blocks.", - "part_alignment": 4096, + "part_alignment": 8192, "disk_alignment": 258048, "block_size": 512, "fs_block_size": 4096 From dbfb58c056108ddd01669969bacd7205d7613a19 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 12 May 2025 16:33:45 +0200 Subject: [PATCH 05/16] Force disable randstruct configuration --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 2fe6109ecb8..0fa198c8a55 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -228,3 +228,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_RK805=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_RK808=y + +# CONFIG_RANDSTRUCT_FULL is not set +# GCC_PLUGIN_RANDSTRUCT is not set From 9dbac6ca22d7584b73187674cf22cf7ff7060128 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 12 May 2025 16:52:37 +0200 Subject: [PATCH 06/16] Try another way to disable configs --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 0fa198c8a55..9b1f2ae4777 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -229,5 +229,5 @@ CONFIG_PINCTRL_RK805=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_RK808=y -# CONFIG_RANDSTRUCT_FULL is not set -# GCC_PLUGIN_RANDSTRUCT is not set +CONFIG_RANDSTRUCT_FULL=n +GCC_PLUGIN_RANDSTRUCT=n From c7409ea8d371d8225d4fdc030a13de3c2ab4fb9f Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 13 May 2025 13:00:59 +0200 Subject: [PATCH 07/16] Add more clocks configs and remove debug configurations --- .../coreos-modules/files/arm64_defconfig-6.12 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 9b1f2ae4777..e2d86ddb467 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -204,18 +204,19 @@ CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m CONFIG_CRYPTO_DEV_ROCKCHIP=m # CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG is not set + +CONFIG_I2C=y CONFIG_I2C_RK3X=y + CONFIG_CLK_RK3308=y CONFIG_CLK_RK3328=y CONFIG_CLK_RK3368=y CONFIG_CLK_RK3399=y CONFIG_CLK_RK3568=y +CONFIG_CLK_RK3576=y CONFIG_CLK_RK3588=y -CONFIG_COMPILE_TEST=y -CONFIG_OF_OVERLAY=y CONFIG_EFI_ARMSTUB_DTB_LOADER=y -CONFIG_OF_ALL_DTBS=y CONFIG_SCSI=y CONFIG_SCSI_LOWLEVEL=y @@ -228,6 +229,3 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_RK805=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_RK808=y - -CONFIG_RANDSTRUCT_FULL=n -GCC_PLUGIN_RANDSTRUCT=n From bd55a77348007b7cc9275c79b9729f3de380834f Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 14 May 2025 16:08:07 +0200 Subject: [PATCH 08/16] Enable RTC drivers --- .../coreos-modules/files/arm64_defconfig-6.12 | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index e2d86ddb467..c245146fcea 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -229,3 +229,61 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_RK805=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_RK808=y + +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_AC100=m +CONFIG_RTC_DRV_AS3722=m +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_HYM8563=y +CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_NCT3018Y=m +CONFIG_RTC_DRV_RK808=y +CONFIG_RTC_DRV_ISL12026=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF85363=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BD70528=m +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_RC5T583=m +CONFIG_RTC_DRV_RC5T619=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8010=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3028=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_SD3078=m +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1302=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1343=m +CONFIG_RTC_DRV_DS1347=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_MAX6916=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_PCF2123=m +CONFIG_RTC_DRV_MCP795=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_PCF2127=m +CONFIG_RTC_DRV_RV3029C2=m +CONFIG_RTC_DRV_RX6110=m +CONFIG_RTC_DRV_EFI=y +CONFIG_RTC_DRV_NTXEC=m +CONFIG_RTC_DRV_PL030=m +CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_CADENCE=m +CONFIG_RTC_DRV_HID_SENSOR_TIME=m +CONFIG_RTC_DRV_GOLDFISH=m From 84f0b298a3c88b9151cb0400c0f827638435b0c6 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 15 May 2025 10:11:20 +0200 Subject: [PATCH 09/16] Remove unbuildable RTC configs --- .../coreos-modules/files/arm64_defconfig-6.12 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index c245146fcea..2ce4e056602 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -230,12 +230,16 @@ CONFIG_PINCTRL_RK805=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_RK808=y +CONFIG_OF=y +CONFIG_REGULATOR_RK808=y + +CONFIG_INPUT=y +CONFIG_USB_HID=m +CONFIG_HID_SENSOR_HUB=m + CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_AC100=m -CONFIG_RTC_DRV_AS3722=m CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_HYM8563=y -CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_NCT3018Y=m CONFIG_RTC_DRV_RK808=y CONFIG_RTC_DRV_ISL12026=m @@ -247,10 +251,7 @@ CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_BD70528=m CONFIG_RTC_DRV_BQ32K=m -CONFIG_RTC_DRV_RC5T583=m -CONFIG_RTC_DRV_RC5T619=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m @@ -259,7 +260,6 @@ CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_EM3027=m CONFIG_RTC_DRV_RV3028=m CONFIG_RTC_DRV_RV8803=m -CONFIG_RTC_DRV_S5M=m CONFIG_RTC_DRV_SD3078=m CONFIG_RTC_DRV_M41T93=m CONFIG_RTC_DRV_M41T94=m @@ -280,10 +280,8 @@ CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RX6110=m CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_NTXEC=m CONFIG_RTC_DRV_PL030=m CONFIG_RTC_DRV_PL031=y -CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_CADENCE=m CONFIG_RTC_DRV_HID_SENSOR_TIME=m CONFIG_RTC_DRV_GOLDFISH=m From da143623c8ff2fed2b684e725b6c710a051d4408 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 2 Jul 2025 15:24:26 +0200 Subject: [PATCH 10/16] Enable CONFIG_PCIE_ROCKCHIP_EP and CONFIG_MMC_DW_ROCKCHIP, change some configs to modules --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 2ce4e056602..abfb60b4b61 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -140,6 +140,8 @@ CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_DW_ROCKCHIP=y + # CONFIG_DW_WATCHDOG is not set @@ -148,9 +150,9 @@ CONFIG_MMC_SDHCI_OF_DWCMSHC=y CONFIG_ROCKCHIP_ERRATUM_3588001=y CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIE_ROCKCHIP_HOST=y -# CONFIG_PCIE_ROCKCHIP_EP is not set +CONFIG_PCIE_ROCKCHIP_EP=y CONFIG_PCIE_ROCKCHIP_DW_HOST=y -CONFIG_MTD_NAND_ROCKCHIP=y +CONFIG_MTD_NAND_ROCKCHIP=m CONFIG_MTD_RAW_NAND=y CONFIG_HAS_IOMEM=y # CONFIG_EMAC_ROCKCHIP is not set @@ -158,7 +160,7 @@ CONFIG_ROCKCHIP_PHY=y CONFIG_HW_RANDOM_ROCKCHIP=y CONFIG_SPI_ROCKCHIP=y -CONFIG_SPI_ROCKCHIP_SFC=m=y +CONFIG_SPI_ROCKCHIP_SFC=m CONFIG_PINCTRL_ROCKCHIP=y CONFIG_GPIO_ROCKCHIP=y CONFIG_ROCKCHIP_THERMAL=y From 2bd769b6bbebf688a7f4ae2cd3084f83d156bd8d Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 3 Jul 2025 12:02:29 +0200 Subject: [PATCH 11/16] Try to enable CONFIG_MMC_DW manually --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index abfb60b4b61..4fbfd25b9c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -140,6 +140,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_MMC_SDHCI_OF_DWCMSHC=y +CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y # CONFIG_DW_WATCHDOG is not set @@ -287,3 +288,6 @@ CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_CADENCE=m CONFIG_RTC_DRV_HID_SENSOR_TIME=m CONFIG_RTC_DRV_GOLDFISH=m + +CONFIG_COMMON_CLK_SCMI=y +CONFIG_COMMON_CLK_SCPI=y From 46d458c64f39fb14fce1d6f0d347507533314ad3 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 3 Jul 2025 17:28:15 +0200 Subject: [PATCH 12/16] Enable SCPI and SCMI protocols --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 4fbfd25b9c8..6e5c0c186a7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -291,3 +291,6 @@ CONFIG_RTC_DRV_GOLDFISH=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=y + +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_ARM_SCMI_PROTOCOL=y From 6468b69075eb689b10a2bd2a2667759fc6246883 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 3 Jul 2025 17:28:39 +0200 Subject: [PATCH 13/16] Disable back Rockchip PCIE Endpoint mode --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 6e5c0c186a7..a783212bccb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -151,7 +151,6 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ROCKCHIP_ERRATUM_3588001=y CONFIG_PCIE_ROCKCHIP=y CONFIG_PCIE_ROCKCHIP_HOST=y -CONFIG_PCIE_ROCKCHIP_EP=y CONFIG_PCIE_ROCKCHIP_DW_HOST=y CONFIG_MTD_NAND_ROCKCHIP=m CONFIG_MTD_RAW_NAND=y From 1cc5279596c98ccde11d43aa109cc2c2eb204a0d Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 4 Jul 2025 17:51:57 +0200 Subject: [PATCH 14/16] Add possibly missing HDMI config --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index a783212bccb..a79bd09e897 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -293,3 +293,7 @@ CONFIG_COMMON_CLK_SCPI=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM_SCMI_PROTOCOL=y + +CONFIG_DRM_DW_HDMI_CEC=m +CONFIG_DRM_BRIDGE=m +CONFIG_DRM_DW_HDMI=m From c5e5d028c69c3afa92d47ed65ac3a133406e3c05 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 5 Jul 2025 09:59:31 +0200 Subject: [PATCH 15/16] Add two missing configuration --- .../sys-kernel/coreos-modules/files/arm64_defconfig-6.12 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index a79bd09e897..4c47d56412c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -185,7 +185,7 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_ROCKCHIP_SARADC=y +CONFIG_ROCKCHIP_SARADC=m CONFIG_IIO=y CONFIG_RESET_CONTROLLER=y CONFIG_PWM=y @@ -297,3 +297,6 @@ CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_BRIDGE=m CONFIG_DRM_DW_HDMI=m + +CONFIG_ROCKCHIP_VOP2=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y From 51b283e772c5dbdfe84c62c254d424f902cb0206 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 7 Jul 2025 13:53:53 +0200 Subject: [PATCH 16/16] Add various configurations: DRM/HDMI, clock/timers and errata --- .../coreos-modules/files/arm64_defconfig-6.12 | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 index 4c47d56412c..b48b2b716e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-6.12 @@ -165,6 +165,9 @@ CONFIG_PINCTRL_ROCKCHIP=y CONFIG_GPIO_ROCKCHIP=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_DRM_ROCKCHIP=m +CONFIG_DRM_VGEM=m +CONFIG_DRM_DISPLAY_HDMI_HELPER=y +CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y CONFIG_ROCKCHIP_VOP=y CONFIG_ROCKCHIP_VOP2=y CONFIG_ROCKCHIP_ANALOGIX_DP=y @@ -290,6 +293,16 @@ CONFIG_RTC_DRV_GOLDFISH=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=y +CONFIG_COMMON_CLK_SI544=m +CONFIG_COMMON_CLK_CS2000_CP=y +CONFIG_COMMON_CLK_S2MPS11=y +CONFIG_COMMON_CLK_XGENE=y +CONFIG_COMMON_CLK_PWM=y +CONFIG_CLK_PX30=y + +CONFIG_CLKSRC_MMIO=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM_SCMI_PROTOCOL=y @@ -298,5 +311,16 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_BRIDGE=m CONFIG_DRM_DW_HDMI=m -CONFIG_ROCKCHIP_VOP2=y -CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_INPUT_RK805_PWRKEY=y + +CONFIG_HWSPINLOCK=y + +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y + +CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1530923=y +CONFIG_ARM64_ERRATUM_2441007=y + +CONFIG_HDMI=y