From 9f3969c3cb2918feaf515d44843d8f96012f2ddf Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 20 Dec 2011 00:23:00 -0200 Subject: Revert "armv7: adapt omap3 to the new cache maintenance framework" This reverts commit 45bf05854bc94ed8bae9e9114292895b990327ea. Conflicts: arch/arm/cpu/armv7/omap3/board.c arch/arm/cpu/armv7/omap3/lowlevel_init.S arch/arm/include/asm/arch-omap3/sys_proto.h Signed-off-by: Ricardo Salveti de Araujo --- arch/arm/include/asm/arch-omap3/sys_proto.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'arch/arm/include/asm/arch-omap3/sys_proto.h') diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index f48b17ae8..5f82626db 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); void ehci_clocks_enable(void); @@ -61,7 +56,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); @@ -72,8 +69,6 @@ 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); u32 warm_reset(void); void omap3_die_id_to_ethernet_mac(u8 *, int); #endif -- cgit v1.2.3