diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-08-10 10:58:27 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-08-10 09:13:35 +0000 |
| commit | da3c3ef8d98b7ba08828daa5b40f59b2dbc0ceaf (patch) | |
| tree | cd4238787235a47f1fc5cca8024c031317bfb13f /dashboard/config/linux | |
| parent | c7f6fc5b21cf154fabe12125d2cd1b274c57cb53 (diff) | |
dashboard: make qemu arm64 configs compile again
We've been running into the following error:
error: static declaration of 'mem_encrypt_init' follows non-static declaration
The problem was caused by Kconfig not being able to adjust the
depenencies, the fix is already coming:
https://lore.kernel.org/lkml/CANp29Y6AnNeouWgAevBEDZcYcOjzDQwxLDfLxe41Lp3BC=h8bA@mail.gmail.com/T/
After it's merged, we'll have to update our configs anyway. So let's do
it now.
Diffstat (limited to 'dashboard/config/linux')
| -rw-r--r-- | dashboard/config/linux/bits/arm64_emu.yml | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-arm64-kasan.config | 5 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-arm64-mte.config | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dashboard/config/linux/bits/arm64_emu.yml b/dashboard/config/linux/bits/arm64_emu.yml index e9ad37c34..b0db50a01 100644 --- a/dashboard/config/linux/bits/arm64_emu.yml +++ b/dashboard/config/linux/bits/arm64_emu.yml @@ -24,6 +24,8 @@ config: - DRM_LIMA: n - DRM_PANFROST: n - DRM_LEGACY: n + - DRM_SAMSUNG_DSIM: n + - DRM_NWL_MIPI_DSI: n - FB_IBM_GXT4500: n - SMS_SIANO_RC: n - V4L_PLATFORM_DRIVERS: n diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config index 10e667d2c..f3b8fd3a5 100644 --- a/dashboard/config/linux/upstream-arm64-kasan.config +++ b/dashboard/config/linux/upstream-arm64-kasan.config @@ -3816,11 +3816,11 @@ CONFIG_DRM_LONTIUM_LT9611UXC=y # CONFIG_DRM_ITE_IT66121 is not set # CONFIG_DRM_LVDS_CODEC is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set # CONFIG_DRM_PARADE_PS8622 is not set CONFIG_DRM_PARADE_PS8640=y -CONFIG_DRM_SAMSUNG_DSIM=y +# CONFIG_DRM_SAMSUNG_DSIM is not set # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SII902X is not set # CONFIG_DRM_SII9234 is not set @@ -5925,7 +5925,6 @@ CONFIG_RESET_SIMPLE=y # PHY Subsystem # # CONFIG_GENERIC_PHY is not set -CONFIG_GENERIC_PHY_MIPI_DPHY=y # CONFIG_PHY_CAN_TRANSCEIVER is not set # diff --git a/dashboard/config/linux/upstream-arm64-mte.config b/dashboard/config/linux/upstream-arm64-mte.config index 5ae23b863..d136aaef7 100644 --- a/dashboard/config/linux/upstream-arm64-mte.config +++ b/dashboard/config/linux/upstream-arm64-mte.config @@ -3806,11 +3806,11 @@ CONFIG_DRM_LONTIUM_LT9611UXC=y # CONFIG_DRM_ITE_IT66121 is not set # CONFIG_DRM_LVDS_CODEC is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_NWL_MIPI_DSI is not set # CONFIG_DRM_NXP_PTN3460 is not set # CONFIG_DRM_PARADE_PS8622 is not set CONFIG_DRM_PARADE_PS8640=y -CONFIG_DRM_SAMSUNG_DSIM=y +# CONFIG_DRM_SAMSUNG_DSIM is not set # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SII902X is not set # CONFIG_DRM_SII9234 is not set @@ -5911,7 +5911,6 @@ CONFIG_RESET_SIMPLE=y # PHY Subsystem # # CONFIG_GENERIC_PHY is not set -CONFIG_GENERIC_PHY_MIPI_DPHY=y # CONFIG_PHY_CAN_TRANSCEIVER is not set # |