summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp/meta-aspeed
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-12-08 22:18:11 +1100
committerPatrick Williams <patrick@stwcx.xyz>2016-12-19 13:29:50 +0000
commitaf7a00aaa885fabcd2dc8457b66f2e22bddd4e4f (patch)
tree7dc9b178c6fd36a585e19c0341dcfa2f111ef39c /meta-openbmc-bsp/meta-aspeed
parent9224355c9745dd07a0e090b7c9ec9bcd2f7d0587 (diff)
downloadtalos-openbmc-af7a00aaa885fabcd2dc8457b66f2e22bddd4e4f.tar.gz
talos-openbmc-af7a00aaa885fabcd2dc8457b66f2e22bddd4e4f.zip
kernel: FSI, Zaius LPC mapping and device tree fixes
- FSI changes * Merge v1 of the FSI patchset as sent to lkml * Merge Jeremy's raw driver for slave address-space access * Define pins in Palmetto DTS * Build the FSI SCOM driver for both ast2400 and ast2500 systems. The driver has not been enabled in the device tree so it will not affect any sytems at this stage. We will enable systems as the userspace changes are made to support the kernel driver. - Zaius * Enable LPC to AHB mapping for flash access - Update the ast2400 systems with the correct amount of RAM * They systems have 512MB, minus the 16MB framebuffer, but our device tree restricted them to 256MB. * We now set them to 512MB with a 16MB no-map reservation at the top for RAM for the PCI framebuffer Change-Id: I7377e0f3bd075b78d923ff7295b133a75158e5d9 Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-bsp/meta-aspeed')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig3
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig3
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
index 05819c679..34b733d5c 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -143,6 +143,9 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ASPEED=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_FSI=y
+CONFIG_FSI_MASTER_GPIO=y
+CONFIG_FSI_SCOM=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FANOTIFY=y
CONFIG_AUTOFS4_FS=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
index ab6f91ba6..2b4b33ae6 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
@@ -147,6 +147,9 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_ASPEED=y
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_FSI=y
+CONFIG_FSI_MASTER_GPIO=y
+CONFIG_FSI_SCOM=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FANOTIFY=y
CONFIG_AUTOFS4_FS=y
OpenPOWER on IntegriCloud