From 7779f6f3aa26f69e81fdb1f69a292960e1258dd8 Mon Sep 17 00:00:00 2001 From: Ian May Date: Wed, 31 May 2023 12:59:49 -0500 Subject: [PATCH] UBUNTU: [Configs] nvidia-5.19: update configs Copied from master Ignore: yes Signed-off-by: Ian May --- .../config/amd64/config.common.amd64 | 2 +- debian.nvidia-5.19/config/annotations | 35 ++++++++++--------- .../config/arm64/config.common.arm64 | 2 +- .../config/config.common.ubuntu | 1 + 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/debian.nvidia-5.19/config/amd64/config.common.amd64 b/debian.nvidia-5.19/config/amd64/config.common.amd64 index 5c15552afedf..36f6077a58fe 100644 --- a/debian.nvidia-5.19/config/amd64/config.common.amd64 +++ b/debian.nvidia-5.19/config/amd64/config.common.amd64 @@ -12,7 +12,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 CONFIG_ARCH_NR_GPIO=1024 CONFIG_ATA_GENERIC=y CONFIG_ATA_PIIX=y -CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" +CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0" # CONFIG_CMA is not set CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CRC8=m diff --git a/debian.nvidia-5.19/config/annotations b/debian.nvidia-5.19/config/annotations index d6818846228b..0bcefbc5b0a9 100644 --- a/debian.nvidia-5.19/config/annotations +++ b/debian.nvidia-5.19/config/annotations @@ -8,26 +8,27 @@ CONFIG_LATENCYTOP policy<{'amd64': 'n', 'amd64-nvi CONFIG_HZ_1000 policy<{'amd64': 'n', 'amd64-nvidia-lowlatency': 'y', 'arm64': 'n'}> CONFIG_HZ_250 policy<{'amd64': 'y', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'y'}> CONFIG_PREEMPT_VOLUNTARY policy<{'amd64': 'y', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'y'}> -CONFIG_PREEMPT policy<{'amd64': 'n', 'amd64-nvidia-lowlatency': 'y', 'arm64': 'n'}> +CONFIG_PREEMPT policy<{'amd64': 'n', 'amd64-nvidia-lowlatency': 'y', 'arm64': 'n'}> -CONFIG_COMEDI_TESTS_EXAMPLE policy<{'amd64': 'm', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'm'}> -CONFIG_TEST_DIV64 policy<{'amd64': 'n', 'amd64-nvidia-lowlatency': 'm', 'arm64': 'n'}> -CONFIG_COMEDI_TESTS_NI_ROUTES policy<{'amd64': 'm', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'm'}> +CONFIG_COMEDI_TESTS_EXAMPLE policy<{'amd64': 'm', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'm'}> +CONFIG_TEST_DIV64 policy<{'amd64': 'n', 'amd64-nvidia-lowlatency': 'm', 'arm64': 'n'}> +CONFIG_COMEDI_TESTS_NI_ROUTES policy<{'amd64': 'm', 'amd64-nvidia-lowlatency': 'n', 'arm64': 'm'}> -CONFIG_ARM64_64K_PAGES policy<{'arm64': 'n', 'arm64-nvidia-64k': 'y'}> -CONFIG_NTFS_RW policy<{'amd64': 'n', 'arm64': 'n', 'arm64-nvidia-64k': '-'}> +CONFIG_ARM64_64K_PAGES policy<{'arm64': 'n', 'arm64-nvidia-64k': 'y'}> +CONFIG_NTFS_RW policy<{'amd64': 'n', 'arm64': 'n', 'arm64-nvidia-64k': '-'}> -CONFIG_MESON_SECURE_PM_DOMAINS policy<{'arm64': 'y', 'arm64-nvidia-64k': '-'}> -CONFIG_INFINIBAND_VMWARE_PVRDMA policy<{'amd64': 'm', 'arm64': 'm', 'arm64-nvidia-64k': '-'}> -CONFIG_MESON_SM policy<{'arm64': 'y', 'arm64-nvidia-64k': '-'}> -CONFIG_VMXNET3 policy<{'amd64': 'm', 'arm64': 'm', 'arm64-nvidia-64k': '-'}> -CONFIG_FORCE_MAX_ZONEORDER policy<{'arm64': '13', 'arm64-nvidia-64k': '14'}> -CONFIG_ARM64_4K_PAGES policy<{'arm64': 'y', 'arm64-nvidia-64k': 'n'}> -CONFIG_MESON_EFUSE policy<{'arm64': 'm', 'arm64-nvidia-64k': '-'}> +CONFIG_MESON_SECURE_PM_DOMAINS policy<{'arm64': 'y', 'arm64-nvidia-64k': '-'}> +CONFIG_INFINIBAND_VMWARE_PVRDMA policy<{'amd64': 'm', 'arm64': 'm', 'arm64-nvidia-64k': '-'}> +CONFIG_MESON_SM policy<{'arm64': 'y', 'arm64-nvidia-64k': '-'}> +CONFIG_VMXNET3 policy<{'amd64': 'm', 'arm64': 'm', 'arm64-nvidia-64k': '-'}> +CONFIG_FORCE_MAX_ZONEORDER policy<{'arm64': '13', 'arm64-nvidia-64k': '14'}> +CONFIG_ARM64_4K_PAGES policy<{'arm64': 'y', 'arm64-nvidia-64k': 'n'}> +CONFIG_MESON_EFUSE policy<{'arm64': 'm', 'arm64-nvidia-64k': '-'}> +CONFIG_PCI_MESON policy<{'amd64': 'n', 'arm64': 'n'}> -CONFIG_ARM64_VA_BITS_39 policy<{'arm64': 'n', 'arm64-nvidia-64k': '-'}> -CONFIG_ARM64_VA_BITS_42 policy<{'arm64-nvidia-64k': 'n'}> -CONFIG_ARM64_VA_BITS_52 policy<{'arm64-nvidia-64k': 'n'}> -CONFIG_ARM64_PA_BITS_52 policy<{'arm64-nvidia-64k': 'n'}> +CONFIG_ARM64_VA_BITS_39 policy<{'arm64': 'n', 'arm64-nvidia-64k': '-'}> +CONFIG_ARM64_VA_BITS_42 policy<{'arm64-nvidia-64k': 'n'}> +CONFIG_ARM64_VA_BITS_52 policy<{'arm64-nvidia-64k': 'n'}> +CONFIG_ARM64_PA_BITS_52 policy<{'arm64-nvidia-64k': 'n'}> CONFIG_NR_CPUS policy<{'amd64': '8192', 'arm64': '512'}> diff --git a/debian.nvidia-5.19/config/arm64/config.common.arm64 b/debian.nvidia-5.19/config/arm64/config.common.arm64 index e85ed2a6730e..484fcd0416dc 100644 --- a/debian.nvidia-5.19/config/arm64/config.common.arm64 +++ b/debian.nvidia-5.19/config/arm64/config.common.arm64 @@ -9,7 +9,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_ARCH_NR_GPIO=2048 CONFIG_ATA_GENERIC=m CONFIG_ATA_PIIX=m -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.3.0-1ubuntu1~22.04.1) 11.3.0" CONFIG_CMA=y CONFIG_COMEDI_TESTS_EXAMPLE=m CONFIG_COMEDI_TESTS_NI_ROUTES=m diff --git a/debian.nvidia-5.19/config/config.common.ubuntu b/debian.nvidia-5.19/config/config.common.ubuntu index cef932bbadc1..f07a203e718e 100644 --- a/debian.nvidia-5.19/config/config.common.ubuntu +++ b/debian.nvidia-5.19/config/config.common.ubuntu @@ -9723,6 +9723,7 @@ CONFIG_SND_HDA_CODEC_VIA=m CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_CORE=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m +# CONFIG_SND_HDA_CTL_DEV_ID is not set CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_EXT_CORE=m CONFIG_SND_HDA_GENERIC=m