ASPEED defconfig updates for 5.16

- Add options that are enabled in the common OpenBMC kernel
 
  - Re-enable DRM_FBDEV_EMULATION
 
  - Turn on the various sensor drivers that are used in BMC systems,
  so we can boot test where they are modelled in Qemu
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAmFw+20ACgkQa3ZZB4FH
 cJ6PQRAAmFrMn2Dak9lELNM1nqdzTzadBqQEyZd4i81NRNGmNdg4sLd9kXcQ40mQ
 vuTPkbH91LpDnkZKv7aDpmP1bAXoi8sWkxMeG7THultEmsLJ44wE5kwPH0XnCs0G
 SqdGX1fvLhur0qPBG6tO1cZ6R3tdosLOZQF4q7xPKHsmWszuogiNcp0p42tpkP74
 tw9KuM9bv6zl2OngemSse1s92xx+t8m4/T31YC1KAwIdA74EZvWV6Pu3G7SOAq9U
 X5iiJEcbiUSTto0FLLYmAP9PeHiB6u4a6MxpVYXFAQiAVZQvjh+IZwjUCkwzrnj+
 3u8485T2BMByyvVX77TAaF5edQ0AKV51E2unRXICPcAe7SUKMGMIgBUdR9ewitt8
 v71fWlbJCu/adEn2YYpiiaRIZVN02iKj9cqK0pevHjOsNGVTTySJp1Ifl/lo5hst
 Re12vTMnaOCtaMo7uOkYoDFpjDSjSg+gKp+8FslUBphf8Oeo8y/u8a2DWsPkDWmc
 P7rcmtboe3shqTJlzRBFwcDAAC2WpIBp8ivCccdJDnwjDUhj3rd3NCx+fsAgnUZd
 m8WTxKDFopHv+ArUyp0bcS3YsxbIxcX3nTB5qPOsSkJ9lBVAAeQxgB2tvtrSI8cl
 w+TcJyWJKQtydwJmMnX/u/YC+dZNFIJolPBWu+y3NfSo8I/bBn4=
 =PGcn
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFxv/EACgkQmmx57+YA
 GNmX7g//YHfW/u+b28HQnWSwga904mHMiA1wziDyLhvH0Haxz/51k3qKu0f9B4yA
 qgLBV1juzofkiluyI2TRBDo16f/JpHvbhCfQALijjwTapdfCpAg5P6HrXPlBDBwH
 sJGB7n9Noq16GCPgjI2WudvxP8Iuqn5a0xQncgB7qAKK3KzitJ2OXFJ7zMZnFtko
 Yu4Eopwd9frf+iQga1mK6MYbpbZzUJkvzioVOOTMsVYJaAOwyTyUYtIHup7yFbDL
 lv8/YuQ007afx6AQNJ5lnlxoYGaNQI1u6C5gcw+DUfgvV8wn9LrDhws8rQFk37vo
 V9+3C5CWB+m+cijTpCVTeAqIkfeE4Tiuh7LWmi0xDN0dJDuBX2AkSRop0qX//OYS
 SQ6yHx96DpaXz9w36JJggcBOvmfu8CCP5xcRBPIB97W4nhF88VhRaNfpdG8kxuGV
 H1YbJSLzZW0BZjwd2aYiT+vIt5pRz68LcwZvwrUE43JdnzJ4Te/mXMH+1dAixRXE
 CcYl25/Zgy5NFwLq9nzQqFQ0rAJvgVYi4ihC7Wa+MvT0Ip0YgxcVe2uQJgw3UdwQ
 6oBPB3gm43Rjee4uLwZTpo3Ng+eWzQ1U1hWxZE8dkoHv+66rAE/oaLNPCx3lcySA
 GeyL3uW1ljLpfiD9XCxVF0FW96x169ibL0O28yKu9FRqSR/gjbc=
 =D/YI
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/defconfigs

ASPEED defconfig updates for 5.16

 - Add options that are enabled in the common OpenBMC kernel

 - Re-enable DRM_FBDEV_EMULATION

 - Turn on the various sensor drivers that are used in BMC systems,
 so we can boot test where they are modelled in Qemu

* tag 'aspeed-5.16-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: configs: aspeed: Remove unused USB gadget devices
  ARM: config: aspeed: Enable Network Block Device
  ARM: configs: aspeed: Enable pstore and lockup detectors
  ARM: configs: aspeed: Enable commonly used drivers
  ARM: configs: aspeed: Disable IPV6 SIT device
  ARM: configs: aspeed_g5: Reneable DRM_FBDEV_EMULATION

Link: https://lore.kernel.org/r/CACPK8Xd0mVn2Cy7d=VBTDMpU=WHrftsiihwH224ekFSDGKAbyA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-21 21:30:42 +02:00
Родитель 48fe205ada 52a490e0ef
Коммит 6fc04eacf1
2 изменённых файлов: 23 добавлений и 13 удалений

Просмотреть файл

@ -48,6 +48,7 @@ CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
CONFIG_SYN_COOKIES=y CONFIG_SYN_COOKIES=y
# CONFIG_INET_DIAG is not set # CONFIG_INET_DIAG is not set
# CONFIG_IPV6_SIT is not set
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
# CONFIG_NETFILTER_ADVANCED is not set # CONFIG_NETFILTER_ADVANCED is not set
CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q=y

Просмотреть файл

@ -60,6 +60,7 @@ CONFIG_SYN_COOKIES=y
CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_IPV6_OPTIMISTIC_DAD=y
# CONFIG_IPV6_SIT is not set
CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
# CONFIG_NETFILTER_ADVANCED is not set # CONFIG_NETFILTER_ADVANCED is not set
@ -79,7 +80,9 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP=y
CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_BLOCK=y
CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=y
CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_NETDEVICES=y CONFIG_NETDEVICES=y
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
# CONFIG_NET_VENDOR_ALACRITECH is not set # CONFIG_NET_VENDOR_ALACRITECH is not set
@ -140,6 +143,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_ASPEED_KCS_IPMI_BMC=y CONFIG_ASPEED_KCS_IPMI_BMC=y
CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y
CONFIG_IPMI_KCS_BMC_SERIO=y CONFIG_IPMI_KCS_BMC_SERIO=y
CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_ASPEED_BT_IPMI_BMC=y
CONFIG_HW_RANDOM_TIMERIOMEM=y CONFIG_HW_RANDOM_TIMERIOMEM=y
@ -152,25 +156,33 @@ CONFIG_I2C_ASPEED=y
CONFIG_I2C_FSI=y CONFIG_I2C_FSI=y
CONFIG_I2C_SLAVE=y CONFIG_I2C_SLAVE=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_FSI=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_ASPEED=y CONFIG_GPIO_ASPEED=y
CONFIG_GPIO_ASPEED_SGPIO=y CONFIG_GPIO_ASPEED_SGPIO=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_W1=y CONFIG_W1=y
CONFIG_W1_MASTER_GPIO=y CONFIG_W1_MASTER_GPIO=y
CONFIG_W1_SLAVE_THERM=y CONFIG_W1_SLAVE_THERM=y
CONFIG_SENSORS_ADT7475=y
CONFIG_SENSORS_ASPEED=y CONFIG_SENSORS_ASPEED=y
CONFIG_SENSORS_IIO_HWMON=y CONFIG_SENSORS_IIO_HWMON=y
CONFIG_SENSORS_LM75=y CONFIG_SENSORS_LM75=y
CONFIG_SENSORS_NCT7904=y CONFIG_SENSORS_NCT7904=y
CONFIG_SENSORS_OCC_P9_SBE=y
CONFIG_PMBUS=y CONFIG_PMBUS=y
CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_ADM1275=y
CONFIG_SENSORS_IBM_CFFPS=y CONFIG_SENSORS_IBM_CFFPS=y
CONFIG_SENSORS_IR35221=y CONFIG_SENSORS_IR35221=y
CONFIG_SENSORS_IR38064=y
CONFIG_SENSORS_ISL68137=y
CONFIG_SENSORS_LM25066=y CONFIG_SENSORS_LM25066=y
CONFIG_SENSORS_MAX31785=y CONFIG_SENSORS_MAX31785=y
CONFIG_SENSORS_UCD9000=y CONFIG_SENSORS_UCD9000=y
CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_UCD9200=y
CONFIG_SENSORS_SBTSI=y
CONFIG_SENSORS_TMP421=y CONFIG_SENSORS_TMP421=y
CONFIG_SENSORS_W83773G=y CONFIG_SENSORS_W83773G=y
CONFIG_WATCHDOG_SYSFS=y CONFIG_WATCHDOG_SYSFS=y
@ -181,6 +193,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ASPEED=y CONFIG_VIDEO_ASPEED=y
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_ASPEED_GFX=y CONFIG_DRM_ASPEED_GFX=y
CONFIG_FB=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_DYNAMIC_MINORS=y
@ -188,22 +201,10 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_U_SERIAL_CONSOLE=y
CONFIG_USB_ASPEED_VHUB=y CONFIG_USB_ASPEED_VHUB=y
CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ACM=y
CONFIG_USB_CONFIGFS_OBEX=y
CONFIG_USB_CONFIGFS_NCM=y
CONFIG_USB_CONFIGFS_ECM=y
CONFIG_USB_CONFIGFS_ECM_SUBSET=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_EEM=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y
CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_HID=y
CONFIG_USB_CONFIGFS_F_PRINTER=y
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_PLTFM=y
@ -230,7 +231,9 @@ CONFIG_RTC_DRV_ASPEED=y
CONFIG_IIO=y CONFIG_IIO=y
CONFIG_ASPEED_ADC=y CONFIG_ASPEED_ADC=y
CONFIG_MAX1363=y CONFIG_MAX1363=y
CONFIG_SI7020=y
CONFIG_BMP280=y CONFIG_BMP280=y
CONFIG_DPS310=y
CONFIG_RAS=y CONFIG_RAS=y
CONFIG_FSI=y CONFIG_FSI=y
CONFIG_FSI_MASTER_GPIO=y CONFIG_FSI_MASTER_GPIO=y
@ -252,6 +255,11 @@ CONFIG_UBIFS_FS=y
CONFIG_SQUASHFS=y CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_XZ=y
CONFIG_SQUASHFS_ZSTD=y CONFIG_SQUASHFS_ZSTD=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_PMSG=y
CONFIG_PSTORE_FTRACE=y
CONFIG_PSTORE_RAM=y
# CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
CONFIG_FORTIFY_SOURCE=y CONFIG_FORTIFY_SOURCE=y
@ -276,7 +284,8 @@ CONFIG_SCHED_STACK_END_CHECK=y
CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_ON_OOPS=y
CONFIG_PANIC_TIMEOUT=-1 CONFIG_PANIC_TIMEOUT=-1
CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y
# CONFIG_DETECT_HUNG_TASK is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
CONFIG_WQ_WATCHDOG=y CONFIG_WQ_WATCHDOG=y
# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHED_DEBUG is not set
CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_TRACER=y