tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

ASPEED defconfig updates for 6.1

- A long awaited sync to make the config closer to that used by OpenBMC
machines

- Enable PECI to provide defconfig coverage for the subsystem

* tag 'aspeed-6.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: config: aspeed_g5: Enable PECI
ARM: configs: aspeed_g4: Remove appended DTB and ATAG
ARM: configs: aspeed: Refresh defconfigs
ARM: config: aspeed: Enable namespaces
ARM: configs: aspeed_g4: Enable IPV6 options
ARM: configs: aspeed_g4: Enable OCC and NBD drivers
ARM: configs: aspeed_g5: Enable MCTP stack
ARM: configs: aspeed_g5: Add PL2303 USB serial driver
ARM: configs: aspeed_g5: Add TPM TIS I2C driver
ARM: configs: aspeed_g5: Add mp5023 driver
ARM: configs: aspeed: Add support for USB flash drives

Link: https://lore.kernel.org/r/CACPK8XeLzL3hT8fwVw9fV7Ccduz_PNhZn_67z2yXefCEha6jJg@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann ffc79c20 15116bf6

+26 -4
+7 -3
arch/arm/configs/aspeed_g4_defconfig
··· 7 7 CONFIG_IKCONFIG_PROC=y 8 8 CONFIG_LOG_BUF_SHIFT=16 9 9 CONFIG_CGROUPS=y 10 + CONFIG_NAMESPACES=y 10 11 CONFIG_BLK_DEV_INITRD=y 11 12 # CONFIG_RD_BZIP2 is not set 12 13 # CONFIG_RD_LZO is not set ··· 24 23 CONFIG_AEABI=y 25 24 CONFIG_UACCESS_WITH_MEMCPY=y 26 25 # CONFIG_ATAGS is not set 27 - CONFIG_ARM_APPENDED_DTB=y 28 - CONFIG_ARM_ATAG_DTB_COMPAT=y 29 26 CONFIG_KEXEC=y 30 27 CONFIG_JUMP_LABEL=y 31 28 CONFIG_STRICT_KERNEL_RWX=y 32 - # CONFIG_BLK_DEV_BSG is not set 33 29 # CONFIG_BLK_DEBUG_FS is not set 34 30 # CONFIG_MQ_IOSCHED_DEADLINE is not set 35 31 # CONFIG_MQ_IOSCHED_KYBER is not set ··· 45 47 CONFIG_IP_MULTICAST=y 46 48 CONFIG_SYN_COOKIES=y 47 49 # CONFIG_INET_DIAG is not set 50 + CONFIG_IPV6_ROUTER_PREF=y 51 + CONFIG_IPV6_ROUTE_INFO=y 52 + CONFIG_IPV6_OPTIMISTIC_DAD=y 48 53 # CONFIG_IPV6_SIT is not set 54 + CONFIG_IPV6_MULTIPLE_TABLES=y 49 55 CONFIG_NETFILTER=y 50 56 # CONFIG_NETFILTER_ADVANCED is not set 51 57 CONFIG_VLAN_8021Q=y ··· 68 66 CONFIG_MTD_UBI_FASTMAP=y 69 67 CONFIG_MTD_UBI_BLOCK=y 70 68 CONFIG_BLK_DEV_LOOP=y 69 + CONFIG_BLK_DEV_NBD=y 71 70 CONFIG_EEPROM_AT24=y 72 71 CONFIG_NETDEVICES=y 73 72 CONFIG_NETCONSOLE=y ··· 148 145 CONFIG_SENSORS_IIO_HWMON=y 149 146 CONFIG_SENSORS_LM75=y 150 147 CONFIG_SENSORS_NCT7904=y 148 + CONFIG_SENSORS_OCC_P8_I2C=y 151 149 CONFIG_PMBUS=y 152 150 CONFIG_SENSORS_ADM1275=y 153 151 CONFIG_SENSORS_IBM_CFFPS=y
+19 -1
arch/arm/configs/aspeed_g5_defconfig
··· 7 7 CONFIG_IKCONFIG_PROC=y 8 8 CONFIG_LOG_BUF_SHIFT=16 9 9 CONFIG_CGROUPS=y 10 + CONFIG_NAMESPACES=y 10 11 CONFIG_BLK_DEV_INITRD=y 11 12 # CONFIG_RD_BZIP2 is not set 12 13 # CONFIG_RD_LZO is not set ··· 34 33 CONFIG_NEON=y 35 34 CONFIG_KERNEL_MODE_NEON=y 36 35 CONFIG_JUMP_LABEL=y 37 - # CONFIG_BLK_DEV_BSG is not set 38 36 # CONFIG_BLK_DEBUG_FS is not set 39 37 # CONFIG_MQ_IOSCHED_DEADLINE is not set 40 38 # CONFIG_MQ_IOSCHED_KYBER is not set ··· 65 65 # CONFIG_NETFILTER_ADVANCED is not set 66 66 CONFIG_VLAN_8021Q=y 67 67 CONFIG_NET_NCSI=y 68 + CONFIG_MCTP=y 68 69 # CONFIG_WIRELESS is not set 69 70 CONFIG_DEVTMPFS=y 70 71 CONFIG_DEVTMPFS_MOUNT=y ··· 83 82 CONFIG_BLK_DEV_NBD=y 84 83 CONFIG_EEPROM_AT24=y 85 84 CONFIG_EEPROM_AT25=y 85 + CONFIG_SCSI=y 86 + CONFIG_BLK_DEV_SD=y 86 87 CONFIG_NETDEVICES=y 87 88 CONFIG_NETCONSOLE=y 88 89 # CONFIG_NET_VENDOR_ALACRITECH is not set ··· 122 119 # CONFIG_NET_VENDOR_WIZNET is not set 123 120 CONFIG_BROADCOM_PHY=y 124 121 CONFIG_REALTEK_PHY=y 122 + CONFIG_MCTP_SERIAL=y 123 + CONFIG_MCTP_TRANSPORT_I2C=y 125 124 # CONFIG_USB_NET_DRIVERS is not set 126 125 # CONFIG_WLAN is not set 127 126 CONFIG_INPUT_EVDEV=y ··· 151 146 CONFIG_IPMI_KCS_BMC_SERIO=y 152 147 CONFIG_ASPEED_BT_IPMI_BMC=y 153 148 CONFIG_HW_RANDOM_TIMERIOMEM=y 149 + CONFIG_TCG_TPM=y 150 + CONFIG_TCG_TIS_I2C=y 154 151 # CONFIG_I2C_COMPAT is not set 155 152 CONFIG_I2C_CHARDEV=y 156 153 CONFIG_I2C_MUX_GPIO=y ··· 187 180 CONFIG_SENSORS_ISL68137=y 188 181 CONFIG_SENSORS_LM25066=y 189 182 CONFIG_SENSORS_MAX31785=y 183 + CONFIG_SENSORS_MP5023=y 190 184 CONFIG_SENSORS_UCD9000=y 191 185 CONFIG_SENSORS_UCD9200=y 192 186 CONFIG_SENSORS_SBTSI=y ··· 208 200 CONFIG_USB_EHCI_HCD=y 209 201 CONFIG_USB_EHCI_ROOT_HUB_TT=y 210 202 CONFIG_USB_EHCI_HCD_PLATFORM=y 203 + CONFIG_USB_STORAGE=y 204 + CONFIG_USB_SERIAL=y 205 + CONFIG_USB_SERIAL_PL2303=y 211 206 CONFIG_USB_GADGET=y 212 207 CONFIG_USB_ASPEED_VHUB=y 213 208 CONFIG_USB_CONFIGFS=y ··· 254 243 CONFIG_FSI_SCOM=y 255 244 CONFIG_FSI_SBEFIFO=y 256 245 CONFIG_FSI_OCC=y 246 + CONFIG_PECI=y 247 + CONFIG_PECI_CPU=y 248 + CONFIG_PECI_ASPEED=y 257 249 CONFIG_EXT4_FS=y 258 250 CONFIG_FANOTIFY=y 259 251 CONFIG_OVERLAY_FS=y 252 + CONFIG_VFAT_FS=y 260 253 CONFIG_TMPFS=y 261 254 CONFIG_JFFS2_FS=y 262 255 # CONFIG_JFFS2_FS_WRITEBUFFER is not set ··· 276 261 CONFIG_PSTORE_FTRACE=y 277 262 CONFIG_PSTORE_RAM=y 278 263 # CONFIG_NETWORK_FILESYSTEMS is not set 264 + CONFIG_NLS_CODEPAGE_437=y 265 + CONFIG_NLS_ISO8859_1=y 266 + # CONFIG_SECURITYFS is not set 279 267 CONFIG_HARDENED_USERCOPY=y 280 268 CONFIG_FORTIFY_SOURCE=y 281 269 CONFIG_CRYPTO_HMAC=y