From 8188c331134a469a4cb85e754b09c618632d6ba3 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 12 Jul 2016 22:09:43 +0930 Subject: [PATCH] arm/configs/openbmc_defconfig: Regenerate for 4.6 tree Signed-off-by: Joel Stanley --- arch/arm/configs/openbmc_defconfig | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/arm/configs/openbmc_defconfig b/arch/arm/configs/openbmc_defconfig index d2266e9bb7441..975bdd41b0e9f 100644 --- a/arch/arm/configs/openbmc_defconfig +++ b/arch/arm/configs/openbmc_defconfig @@ -2,7 +2,6 @@ CONFIG_CROSS_COMPILE="arm-linux-" CONFIG_KERNEL_XZ=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y -CONFIG_FHANDLE=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y @@ -19,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_CFQ is not set # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ASPEED=y -CONFIG_MACH_OPP_PALMETTO_BMC=y +CONFIG_MACH_ASPEED_G4=y CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y # CONFIG_ATAGS is not set @@ -58,10 +57,10 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_PARTITIONED_MASTER=y CONFIG_MTD_DATAFLASH=y CONFIG_MTD_NAND=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y CONFIG_MTD_SPI_NOR=y CONFIG_ASPEED_FLASH_SPI=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_GLUEBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 @@ -124,21 +123,15 @@ CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_ASPEED_VUART=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_HW_RANDOM=y -CONFIG_I2C=y CONFIG_I2C_CHARDEV=y -CONFIG_I2C_SLAVE_EEPROM=y CONFIG_SPI=y CONFIG_DEBUG_PINCTRL=y CONFIG_GPIO_ASPEED=y CONFIG_SENSORS_POWER8_OCC_I2C=y CONFIG_PMBUS=y -CONFIG_SENSORS_PMBUS=y CONFIG_SENSORS_ADM1275=y -CONFIG_WATCHDOG=y -CONFIG_ASPEED_24xx_WATCHDOG=y CONFIG_SSB=y CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y @@ -167,7 +160,6 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_RV3029C2=y CONFIG_DMADEVICES=y @@ -209,4 +201,3 @@ CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_GHASH=y # CONFIG_CRYPTO_HW is not set CONFIG_CRC_CCITT=y -CONFIG_AVERAGE=y