diff options
Diffstat (limited to 'meta-aspeed/recipes-kernel')
-rw-r--r-- | meta-aspeed/recipes-kernel/linux/ast2400/defconfig | 11 | ||||
-rwxr-xr-x | meta-aspeed/recipes-kernel/linux/ast2500/defconfig | 10 | ||||
-rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 6 |
3 files changed, 13 insertions, 14 deletions
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 |