diff options
| author | Dan Murphy <DMurphy@ti.com> | 2014-09-01 18:10:24 -0500 |
|---|---|---|
| committer | Dan Murphy <DMurphy@ti.com> | 2014-09-01 18:10:24 -0500 |
| commit | 17773a3e5bc492dbf761e0453475b48451c2bef5 (patch) | |
| tree | 975eb38e0c3eed92354caec0adb04db139cacf06 /arch/arm/Kconfig | |
| parent | bb64ec6cc542c0b2e6f5ca9a895f5c9fd66c2ebd (diff) | |
| parent | 85fb3b934edae5ad862b0b52a117d7a6e517c30c (diff) | |
Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux-3.14.y
TI-Feature: rpmsg-ti-linux-3.14.y
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch:
* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg: (128 commits)
ti_config_fragments: rpmsg: Add remoteproc and rpmsg modules
net/rpmsg: add support for new rpmsg sockets
rpmsg: add api for creating and deleting rpmsg channels
drm/omap: flush the mapped page in kmap/kunmap
rpmsg: rpc: introduce a new rpmsg_rpc driver
ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot
ARM: dts: beagle-x15: Enable IPU & DSP rproc and CMA nodes
ARM: dts: beagle-x15: Add mailboxes, timers for rprocs
ARM: dts: beagle-x15: Add CMA reserved memory nodes for IPUs & DSPs
ARM: dts: dra72-evm: Enable DSP1 & IPU rproc and CMA nodes
ARM: dts: dra72-evm: Add mailboxes, timers for rprocs
ARM: dts: dra72-evm: Add CMA reserved memory nodes for IPUs & DSP1
ARM: dts: dra7-evm: Add watchdog timers for IPU2
ARM: dts: dra7-evm: Enable IPU & DSP rproc and CMA nodes
ARM: dts: dra7-evm: Add timers to IPUs and DSPs
ARM: dts: dra7-evm: Add mailboxes to IPU and DSP nodes
ARM: dts: dra7-evm: Add CMA reserved memory nodes for IPUs & DSPs
ARM: dts: DRA72x: Add aliases for rproc nodes
ARM: dts: DRA74x: Add aliases for rproc nodes
ARM: OMAP2+: Add pdata-quirks for DSP2 rproc on DRA74x
...
Conflicts:
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/dra72x.dtsi
arch/arm/boot/dts/dra74x.dtsi
arch/arm/mach-omap2/pdata-quirks.c
Signed-off-by: Dan Murphy <DMurphy@ti.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24cb58d19c1..a1bc1ae7f78 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1923,6 +1923,7 @@ config USE_OF select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE + select OF_RESERVED_MEM help Include support for flattened device tree machine descriptions. |