[SRU][G/linux-oracle][PATCH 04/18] UBUNTU: [config] arm64: Modify configs to make master annotations happy
Khalid Elmously
khalid.elmously at canonical.com
Fri May 21 07:00:28 UTC 2021
BugLink: https://bugs.launchpad.net/bugs/1925421
Then run updateconfigs again to split any configs from amd64
No change to amd64 configs
Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
.../config/amd64/config.common.amd64 | 12 +++++
.../config/arm64/config.common.arm64 | 16 ++++++-
debian.oracle/config/config.common.ubuntu | 45 +++++++++++--------
3 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/debian.oracle/config/amd64/config.common.amd64 b/debian.oracle/config/amd64/config.common.amd64
index 3f6ccd2283a0..707cf3b1ee4d 100644
--- a/debian.oracle/config/amd64/config.common.amd64
+++ b/debian.oracle/config/amd64/config.common.amd64
@@ -8,9 +8,21 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=32
CONFIG_ARCH_MMAP_RND_BITS_MIN=28
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ATA_PIIX=y
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0"
+# CONFIG_CMA is not set
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_HIBERNATION=y
+CONFIG_HIO=m
+CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_KVM=m
CONFIG_NR_CPUS=8192
# CONFIG_OF is not set
CONFIG_PGTABLE_LEVELS=5
+CONFIG_TOUCHSCREEN_ELAN=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_VFIO=y
+CONFIG_VFIO_IOMMU_TYPE1=y
+CONFIG_VFIO_PCI=y
+CONFIG_VFIO_VIRQFD=y
diff --git a/debian.oracle/config/arm64/config.common.arm64 b/debian.oracle/config/arm64/config.common.arm64
index a248cdefa5bf..3e125ea48f8b 100644
--- a/debian.oracle/config/arm64/config.common.arm64
+++ b/debian.oracle/config/arm64/config.common.arm64
@@ -4,13 +4,25 @@
CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ATA_PIIX=m
CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.2.0-8ubuntu1) 10.2.0"
+CONFIG_CMA=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+# CONFIG_HIBERNATION is not set
+# CONFIG_HIO is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
# CONFIG_KVM is not set
CONFIG_NR_CPUS=256
CONFIG_OF=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_VIRQFD=m
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 204a4716d38c..442dc5e19149 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -497,14 +497,14 @@ CONFIG_ARM64_SVE=y
CONFIG_ARM64_TAGGED_ADDR_ABI=y
CONFIG_ARM64_UAO=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
-# CONFIG_ARM64_VA_BITS_48 is not set
+CONFIG_ARM64_VA_BITS=48
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
CONFIG_ARM64_VHE=y
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
-# CONFIG_ARMV8_DEPRECATED is not set
+CONFIG_ARMV8_DEPRECATED=y
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -568,7 +568,6 @@ CONFIG_ATA_BMDMA=y
CONFIG_ATA_FORCE=y
CONFIG_ATA_GENERIC=y
CONFIG_ATA_OVER_ETH=m
-CONFIG_ATA_PIIX=y
CONFIG_ATA_SFF=y
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATH10K=m
@@ -762,6 +761,7 @@ CONFIG_BACKLIGHT_QCOM_WLED=m
CONFIG_BACKLIGHT_RAVE_SP=m
CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_SKY81452=m
+# CONFIG_BACKLIGHT_TPS65217 is not set
CONFIG_BACKLIGHT_WM831X=m
CONFIG_BALLOON_COMPACTION=y
CONFIG_BAREUDP=m
@@ -1251,6 +1251,7 @@ CONFIG_CHARGER_RT9455=m
CONFIG_CHARGER_SBS=m
CONFIG_CHARGER_SMB347=m
CONFIG_CHARGER_TPS65090=m
+# CONFIG_CHARGER_TPS65217 is not set
CONFIG_CHARGER_TWL4030=m
# CONFIG_CHARGER_UCS1002 is not set
CONFIG_CHARGER_WILCO=m
@@ -1314,7 +1315,15 @@ CONFIG_CM3232=m
CONFIG_CM3323=m
# CONFIG_CM3605 is not set
CONFIG_CM36651=m
-# CONFIG_CMA is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_SIZE_MBYTES=32
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
CONFIG_CMDLINE=""
# CONFIG_CMDLINE_BOOL is not set
CONFIG_CMDLINE_PARTITION=y
@@ -1505,6 +1514,7 @@ CONFIG_COREDUMP=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CORTINA_PHY=m
CONFIG_COUNTER=m
+CONFIG_CP15_BARRIER_EMULATION=y
# CONFIG_CPA_DEBUG is not set
CONFIG_CPU5_WDT=m
# CONFIG_CPUFREQ_DT is not set
@@ -1661,9 +1671,10 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
# CONFIG_CRYPTO_DEV_CCREE is not set
CONFIG_CRYPTO_DEV_CHELSIO=m
# CONFIG_CRYPTO_DEV_HISI_HPRE is not set
+CONFIG_CRYPTO_DEV_HISI_QM=m
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
CONFIG_CRYPTO_DEV_NITROX=m
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
CONFIG_CRYPTO_DEV_PADLOCK=y
@@ -1900,7 +1911,6 @@ CONFIG_DEFAULT_CUBIC=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_SECURITY_APPARMOR=y
# CONFIG_DEFAULT_SECURITY_DAC is not set
@@ -1955,6 +1965,7 @@ CONFIG_DLM=m
CONFIG_DLN2_ADC=m
CONFIG_DM9102=m
CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS_CMA is not set
CONFIG_DMABUF_HEAPS_SYSTEM=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_SELFTESTS is not set
@@ -1967,6 +1978,7 @@ CONFIG_DMAR_TABLE=y
# CONFIG_DMATEST is not set
CONFIG_DMA_ACPI=y
# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_CMA=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DECLARE_COHERENT=y
CONFIG_DMA_DIRECT_REMAP=y
@@ -2071,7 +2083,7 @@ CONFIG_DRM_GMA3600=y
CONFIG_DRM_GMA500=m
CONFIG_DRM_GMA600=y
# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_HISI_HIBMC is not set
+CONFIG_DRM_HISI_HIBMC=m
# CONFIG_DRM_HISI_KIRIN is not set
# CONFIG_DRM_I2C_ADV7511 is not set
CONFIG_DRM_I2C_CH7006=m
@@ -3190,7 +3202,6 @@ CONFIG_HFSPLUS_FS=m
CONFIG_HFS_FS=m
CONFIG_HI8435=m
CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
CONFIG_HIBERNATION_SNAPSHOT_DEV=y
CONFIG_HID=m
CONFIG_HIDRAW=y
@@ -3310,7 +3321,6 @@ CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
CONFIG_HIGH_RES_TIMERS=y
CONFIG_HINIC=m
-CONFIG_HIO=m
# CONFIG_HIP04_ETH is not set
# CONFIG_HIPPI is not set
CONFIG_HISILICON_ERRATUM_161010101=y
@@ -3784,6 +3794,7 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
CONFIG_INPUT_SPARSEKMAP=m
CONFIG_INPUT_TABLET=y
CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
CONFIG_INPUT_TWL4030_PWRBUTTON=m
CONFIG_INPUT_TWL4030_VIBRA=m
CONFIG_INPUT_TWL6040_VIBRA=m
@@ -4058,7 +4069,6 @@ CONFIG_IQS621_ALS=m
CONFIG_IQS624_POS=m
CONFIG_IRQCHIP=y
# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_IRQ_BYPASS_MANAGER=y
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_FORCED_THREADING=y
@@ -4815,7 +4825,7 @@ CONFIG_MFD_TI_LP873X=m
# CONFIG_MFD_TI_LP87565 is not set
CONFIG_MFD_TPS65086=m
CONFIG_MFD_TPS65090=y
-# CONFIG_MFD_TPS65217 is not set
+CONFIG_MFD_TPS65217=m
# CONFIG_MFD_TPS65218 is not set
CONFIG_MFD_TPS6586X=y
CONFIG_MFD_TPS65910=y
@@ -6599,6 +6609,7 @@ CONFIG_REGULATOR_TPS6507X=m
CONFIG_REGULATOR_TPS65086=m
CONFIG_REGULATOR_TPS65090=m
CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS65217=m
CONFIG_REGULATOR_TPS6524X=m
CONFIG_REGULATOR_TPS6586X=m
CONFIG_REGULATOR_TPS65910=m
@@ -7369,6 +7380,7 @@ CONFIG_SERIO_PCIPS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_RAW=m
CONFIG_SERIO_SERPORT=m
+CONFIG_SETEND_EMULATION=y
CONFIG_SFC=m
CONFIG_SFC_FALCON=m
CONFIG_SFC_FALCON_MTD=y
@@ -8087,6 +8099,7 @@ CONFIG_SWAP=y
CONFIG_SWIOTLB=y
CONFIG_SWIOTLB_XEN=y
CONFIG_SWPHY=y
+CONFIG_SWP_EMULATION=y
CONFIG_SW_SYNC=y
CONFIG_SX9310=m
CONFIG_SX9500=m
@@ -8319,7 +8332,6 @@ CONFIG_TOUCHSCREEN_EETI=m
# CONFIG_TOUCHSCREEN_EGALAX is not set
CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
CONFIG_TOUCHSCREEN_EKTF2127=m
-CONFIG_TOUCHSCREEN_ELAN=y
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_EXC3000=m
CONFIG_TOUCHSCREEN_FUJITSU=m
@@ -8607,7 +8619,6 @@ CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_EG20T=m
CONFIG_USB_EHCI_FSL=m
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_PCI=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -8971,18 +8982,14 @@ CONFIG_VETH=m
# CONFIG_VF610_ADC is not set
# CONFIG_VF610_DAC is not set
CONFIG_VFAT_FS=y
-CONFIG_VFIO=y
-CONFIG_VFIO_IOMMU_TYPE1=y
CONFIG_VFIO_MDEV=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_NOIOMMU=y
-CONFIG_VFIO_PCI=y
CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI_INTX=y
CONFIG_VFIO_PCI_MMAP=y
CONFIG_VFIO_PCI_VGA=y
# CONFIG_VFIO_PLATFORM is not set
-CONFIG_VFIO_VIRQFD=y
CONFIG_VGASTATE=m
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
--
2.17.1
More information about the kernel-team
mailing list