diff options
| author |   Ross Burton <ross@burtonini.com> | 2022-01-11 12:02:36 +0000 |
|---|---|---|
| committer |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-01-12 22:09:40 -0500 |
| commit | de38418105c976c8158b6d5ca016eed77d35a53a (patch) | |
| tree | 08a3391a9a9c47f4f5b847516ef8abf7589ad3de | |
| parent | 319ed97374b4c0ce2e4cefac557b77a379447c80 (diff) | |
| download | linux-yocto-v5.14/standard/qemuarm64.tar.gz linux-yocto-v5.14/standard/qemuarm64.tar.bz2 linux-yocto-v5.14/standard/qemuarm64.zip | |
arm64: defconfig: cleanup config optionsv5.14/standard/xilinx-zynqmpv5.14/standard/x86v5.14/standard/tiny/x86v5.14/standard/tiny/common-pcv5.14/standard/tiny/basev5.14/standard/ti-am335xv5.14/standard/qemuppcv5.14/standard/qemuarm64v5.14/standard/nxp-ls20xxv5.14/standard/edgerouterv5.14/standard/beaglebonev5.14/standard/bcm-2xxx-rpiv5.14/standard/base
arm64: defconfig: drop unused POWER_AVS option
Commit 785b5bb41b0a ("PM: AVS: Drop the avs directory and the
corresponding Kconfig") moved AVS code to SOC-specific folders, and
removed corresponding Kconfig from drivers/power, leaving original
POWER_AVS config option enabled in some defconfigs.
Remove the options, which have no references in the tree anymore.
arm64: defconfig: set CONFIG_USB_CONN_GPIO=y
Since 10a7b37b5b ("arm64: Update default configuration") PHY_TEGRA_XUSB
is set to y. That option needs USB_CONN_GPIO to also be y not m, so
set USB_CONN_GPIO explicitly to y to reflect reality.
arm64: defconfig: remove obsolete CONFIG_ARCH_AGILEX and CONFIG_ARCH_N5X
These config options were removed in 4a9a1a5602 ("arm64: socfpga: merge
Agilex and N5X into ARCH_INTEL_SOCFPGA"), so remove them from the
defconfig.
arm64: defconfig: don't set CONFIG_ACPI_APEI_PCIEAER
Since 8c8ff55 ("PCI/AER: Don't select CONFIG_PCIEAER by default"), PCIe
Advanced Error Reporting isn't enabled by default.. As this means just
enabling CONFIG_CPI_APEI_PCIEAR does not have an effect, remove it from
the defconfig for clarity.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | arch/arm64/configs/defconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f423d08b9a71..d588237aec9e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -28,8 +28,6 @@ CONFIG_KALLSYMS_ALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_ARCH_ACTIONS=y -CONFIG_ARCH_AGILEX=y -CONFIG_ARCH_N5X=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_ALPINE=y CONFIG_ARCH_APPLE=y @@ -112,7 +110,6 @@ CONFIG_IMX_SCU_PD=y CONFIG_ACPI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=y CONFIG_VIRTUALIZATION=y @@ -540,7 +537,6 @@ CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_BD9571MWV=m CONFIG_GPIO_MAX77620=y CONFIG_GPIO_SL28CPLD=m -CONFIG_POWER_AVS=y CONFIG_QCOM_CPR=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_MSM=y @@ -796,7 +792,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m CONFIG_HID_MULTITOUCH=m CONFIG_I2C_HID_ACPI=m CONFIG_I2C_HID_OF=m -CONFIG_USB_CONN_GPIO=m +CONFIG_USB_CONN_GPIO=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y |