From a57315679772e2dba656e8ef9b7deaf43c5868e1 Mon Sep 17 00:00:00 2001 From: Jesse Villarreal Date: Thu, 14 Jun 2012 19:54:32 -0500 Subject: Revert "omap4: sdp/panda/tablet: reserve memory for dsp" This reverts commit e699cc2c4cc3f369108d83370172138294f9840f. DSP currently requires 4MB of memory to be set-aside to meet its firmware requirements and can use either a fixed carveout or a dynamically assigned carveout. The above commit uses static carveouts for DSP in various board files. DSP does not have a mandatory requirement to use this fixed carveout, and has been switched over to use a dynamically allocated carveout address. The above commit is therefore being reverted to free up unused carveout memory. This change simultaneously fixes a build error when the DSP remoteproc is included in the build configuration. The build was by the following commit: "OMAP4: ion: remove hardcoded carveout sizes" Conflicts: arch/arm/mach-omap2/include/mach/omap4_ion.h Change-Id: Iee9be7dbc19dd580fabce6ae966cf86d1f54b5cb Signed-off-by: Jesse Villarreal Signed-off-by: Suman Anna Conflicts: arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-44xx-tablet.c arch/arm/mach-omap2/board-omap4panda.c --- arch/arm/mach-omap2/include/mach/omap4_ion.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-omap2/include/mach/omap4_ion.h b/arch/arm/mach-omap2/include/mach/omap4_ion.h index e9ba577..9e07559 100755 --- a/arch/arm/mach-omap2/include/mach/omap4_ion.h +++ b/arch/arm/mach-omap2/include/mach/omap4_ion.h @@ -38,13 +38,6 @@ #define OMAP4_ION_HEAP_NONSECURE_TILER_SIZE \ (omap_ion_heap_nonsec_tiler_mem_size()) -#ifdef CONFIG_OMAP_REMOTE_PROC_DSP -#define PHYS_ADDR_TESLA_SIZE (SZ_1M * 4) -#define PHYS_ADDR_TESLA_MEM (PHYS_ADDR_DUCATI_MEM - \ - OMAP4_ION_HEAP_TILER_SIZE - \ - PHYS_ADDR_TESLA_SIZE) -#endif - struct omap_ion_platform_data { struct ion_platform_data *ion; -- cgit v1.1