Revert "armv7: adapt omap3 to the new cache maintenance framework"2011.08.3

This reverts commit 1de97fff9699bf5614e84b95c4e947496b8425cd.

Conflicts:

	arch/arm/cpu/armv7/omap3/board.c

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 995e7cb57..4a28ba1c4 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -27,11 +27,6 @@ typedef struct {
 	char *nand_string;
 } omap3_sysinfo;
 
-struct emu_hal_params {
-	u32 num_params;
-	u32 param1;
-};
-
 void prcm_init(void);
 void per_clocks_enable(void);
 
@@ -58,7 +53,9 @@ u32 is_running_in_sdram(void);
 u32 is_running_in_sram(void);
 u32 is_running_in_flash(void);
 u32 get_device_type(void);
+void l2cache_enable(void);
 void secureworld_exit(void);
+void setup_auxcr(void);
 void try_unlock_memory(void);
 u32 get_boot_type(void);
 void invalidate_dcache(u32);
@@ -69,6 +66,5 @@ void make_cs1_contiguous(void);
 void omap_nand_switch_ecc(int);
 void power_init_r(void);
 void dieid_num_r(void);
-void do_omap3_emu_romcode_call(u32 service_id, u32 parameters);
-void omap3_gp_romcode_call(u32 service_id, u32 parameter);
+
 #endif