summaryrefslogtreecommitdiffstats
path: root/meta-aspeed/recipes-kernel
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2018-10-22 09:07:20 +1030
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-19 23:02:51 -0500
commit3a3c5850abe27e5604ea021ed77115828a8587bf (patch)
tree02c95d864c1dd8cb6630eaaa2e553ba3fb4070b6 /meta-aspeed/recipes-kernel
parenta16f7d77564b822758b87349b7b68442cfcc8e7b (diff)
downloadtalos-openbmc-3a3c5850abe27e5604ea021ed77115828a8587bf.tar.gz
talos-openbmc-3a3c5850abe27e5604ea021ed77115828a8587bf.zip
linux-aspeed: Add devmem kernel parameter
From the kernel commit message: For security reasons, some configuration needs to run without /dev/mem but on some occasions, to debug HW for instance, it's still useful to be able to reboot the system with access to physical memory. Add a kernel parameter which activates the /dev/mem device only when 'mem.devmem' is enabled. (From meta-aspeed rev: 0c9f70d50d2bcab214e8b49fd76df23f58d6d9da) Change-Id: I5f4c66c9fbaece1c62c3ff4ef608a4c24505630a Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-aspeed/recipes-kernel')
-rw-r--r--meta-aspeed/recipes-kernel/linux/ast2400/defconfig2
-rwxr-xr-xmeta-aspeed/recipes-kernel/linux/ast2500/defconfig2
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/ast2400/defconfig b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
index faacdc670..4e3bcd366 100644
--- a/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/ast2400/defconfig
@@ -125,7 +125,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVMEM is not set
+CONFIG_DEVMEM_BOOTPARAM=y
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/meta-aspeed/recipes-kernel/linux/ast2500/defconfig b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
index 626d67bfb..5e8e9b93a 100755
--- a/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/ast2500/defconfig
@@ -128,7 +128,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVMEM is not set
+CONFIG_DEVMEM_BOOTPARAM=y
CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
CONFIG_SERIAL_8250_CONSOLE=y
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 0a29f95ed..5dbd607ad 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.18"
LINUX_VERSION ?= "4.18.16"
-SRCREV="ac3d5d4192df9eeeb513cc2a6259718335a4f569"
+SRCREV="d5a1e731ff9ad09c61756fe0e0ebfbb65ad3405b"
require linux-aspeed.inc
OpenPOWER on IntegriCloud