From f1ade61b5994799a4cffca0c124b2ed36e640cbf Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 28 Aug 2018 11:09:10 -0700 Subject: linux: Move to 4.18 based tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This rebases the OpenBMC kernel tree on a 4.18 base. There are 85 patches backported from 4.19-rc1, and the following 39 out of tree patches: Alexander Amelkin (1): mtd: spi-nor: fix options for mx66l51235f Andrew Jeffery (8): ARM: dts: aspeed: witherspoon: Update max31785 node dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): One-shot retries for failure to set page pmbus (core): Use driver callbacks in pmbus_get_fan_rate() pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers soc: aspeed: Miscellaneous control interfaces ARM: dts: aspeed-g5: Expose VGA and SuperIO scratch registers Benjamin Herrenschmidt (4): ARM: dts: aspeed: Romulus system can use coprocessor for FSI ARM: dts: aspeed: Palmetto system can use coprocessor for FSI ARM: dts: aspeed: Add Power8 CFAM description for use by Palmetto ARM: dts: aspeed: Add Power9 CFAM description Brad Bishop (1): ARM: configs: Remove atags from Aspeed G4 config Christopher Bostic (1): iio: dps310: Temperature measurement errata Cyril Bur (1): misc: Add ASPEED mbox driver Cédric Le Goater (6): mtd: spi-nor: aspeed: use command mode for reads mtd: spi-nor: aspeed: add support for SPI dual IO read mode mtd: spi-nor: aspeed: link controller with the ahb clock mtd: spi-nor: aspeed: optimize read mode mtd: spi-nor: aspeed: limit the maximum SPI frequency ARM: dts: aspeed: Add "spi-max-frequency" property Edward A. James (2): drivers/fsi: Add On-Chip Controller (OCC) driver hwmon: Add On-Chip Controller (OCC) hwmon driver Joel Stanley (15): ARM: dts: aspeed-palmetto: Add LPC control node ARM: dts: aspeed-palmetto: Add i2c OCC hwmon node ARM: dts: aspeed-ast2500: Update flash layout ARM: dts: aspeed: Add LPC mailbox node ARM: dts: aspeed: Enable mbox iio: Add driver for Infineon DPS310 ARM: dts: aspeed-g4: Expose SuperIO scratch registers ARM: dts: aspeed-g5: Add resets and clocks to GFX node ARM: dts: aspeed: Enable the GFX IP ARM: dts: aspeed: Enable VHUB on Romulus drm: Add ASPEED GFX driver drm: aspeed: Debugfs interface for GFX registers dt-bindings: gpu: Add ASPEED GFX bindings document ARM: config: aspeed: Add out of tree drivers ARM: dts: Add OCC description to Power9 dtsi (From meta-aspeed rev: 2f1187b1bff8d52ddd93f2c5b598eec7ddc9f4f6) Change-Id: I4035abcdcfa9a083599e27661fed5351fc6532fd Signed-off-by: Joel Stanley Signed-off-by: Brad Bishop --- meta-aspeed/recipes-kernel/linux/ast2400/defconfig | 11 ++++------- meta-aspeed/recipes-kernel/linux/ast2500/defconfig | 10 ++++++---- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/recipes-kernel/linux/ast2400/defconfig b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig index 5c789d7ae..bc85ca85f 100644 --- a/meta-aspeed/recipes-kernel/linux/ast2400/defconfig +++ b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig @@ -21,8 +21,6 @@ CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_JUMP_LABEL=y -CONFIG_GCC_PLUGINS=y -CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_STRICT_KERNEL_RWX=y # CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set @@ -41,8 +39,6 @@ CONFIG_SECCOMP=y # CONFIG_ATAGS is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_NET=y @@ -80,7 +76,6 @@ CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y CONFIG_ASPEED_LPC_CTRL=y CONFIG_ASPEED_LPC_SNOOP=y CONFIG_ASPEED_LPC_MBOX=y @@ -91,8 +86,8 @@ CONFIG_NETCONSOLE=y # CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_EZCHIP is not set @@ -103,6 +98,7 @@ CONFIG_FTGMAC100=y # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set @@ -115,9 +111,9 @@ CONFIG_FTGMAC100=y # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_NET_VENDOR_SYNOPSYS is not set CONFIG_BROADCOM_PHY=y CONFIG_REALTEK_PHY=y # CONFIG_USB_NET_DRIVERS is not set @@ -192,6 +188,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y +# CONFIG_RTC_DRV_DS1307_HWMON is not set CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_RV8803=y # CONFIG_VIRTIO_MENU is not set diff --git a/meta-aspeed/recipes-kernel/linux/ast2500/defconfig b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig index 12234dfb0..b477200d1 100755 --- a/meta-aspeed/recipes-kernel/linux/ast2500/defconfig +++ b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig @@ -21,9 +21,8 @@ CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_JUMP_LABEL=y -CONFIG_GCC_PLUGINS=y -CONFIG_CC_STACKPROTECTOR_STRONG=y CONFIG_STRICT_KERNEL_RWX=y +CONFIG_GCC_PLUGINS=y # CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEBUG_FS is not set @@ -90,8 +89,10 @@ CONFIG_NETCONSOLE=y # CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AQUANTIA is not set # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_AURORA is not set # CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CADENCE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_NET_VENDOR_CORTINA is not set # CONFIG_NET_VENDOR_EZCHIP is not set @@ -102,6 +103,7 @@ CONFIG_FTGMAC100=y # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROSEMI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set @@ -114,9 +116,9 @@ CONFIG_FTGMAC100=y # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_NET_VENDOR_SYNOPSYS is not set CONFIG_BROADCOM_PHY=y CONFIG_REALTEK_PHY=y # CONFIG_USB_NET_DRIVERS is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index d719ac7bb..46884a37b 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ -KBRANCH ?= "dev-4.17" -LINUX_VERSION ?= "4.17.18" +KBRANCH ?= "dev-4.18" +LINUX_VERSION ?= "4.18.5" -SRCREV="80d901318acc389e6e09698a8927bf6eb29da314" +SRCREV="b9bdffdd891707c4d6995fbc7118fdb9ea426c47" require linux-aspeed.inc -- cgit v1.2.1