diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-02-04 16:08:23 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-02-04 16:08:23 +0000 |
| commit | 0d13672449e3e30baff49fd47fe69303e4a39d0f (patch) | |
| tree | 0cc61f418dbbf6744682c61656ffa53835877d6e /drivers/base/ump/src/arch-arm/config.h | |
| parent | 2333e36efb821bf4fb57b276aeb55f268fbe41cc (diff) | |
| parent | dc02b233f167b7bd3b5ee8030fd9f06e5f884b63 (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20160204
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/base/ump/src/arch-arm/config.h')
| -rwxr-xr-x | drivers/base/ump/src/arch-arm/config.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/base/ump/src/arch-arm/config.h b/drivers/base/ump/src/arch-arm/config.h new file mode 100755 index 000000000000..152d98f38af8 --- /dev/null +++ b/drivers/base/ump/src/arch-arm/config.h @@ -0,0 +1,27 @@ +/* + * + * (C) COPYRIGHT 2008-2009, 2013 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation, and any use by you of this program is subject to the terms + * of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained + * from Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + + + + + +#ifndef __ARCH_CONFIG_H__ +#define __ARCH_CONFIG_H__ + +#define ARCH_UMP_BACKEND_DEFAULT 1 +#define ARCH_UMP_MEMORY_ADDRESS_DEFAULT 0x00000000 +#define ARCH_UMP_MEMORY_SIZE_DEFAULT 32UL * 1024UL * 1024UL + +#endif /* __ARCH_CONFIG_H__ */ |