aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-12-20 00:23:00 -0200
committerJohn Rigby <john.rigby@linaro.org>2012-08-17 10:07:53 -0600
commit9f3969c3cb2918feaf515d44843d8f96012f2ddf (patch)
tree94fcc39307b03597f2af7c232ec282217a85b281 /arch/arm/include
parent502afac1e0f8e509ecce1260375e987d04dd0a5f (diff)
downloadu-boot-linaro-stable-2012.08-1.tar.gz
Revert "armv7: adapt omap3 to the new cache maintenance framework"2012.08.12012.08-1
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 <ricardo.salveti@linaro.org>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-omap3/omap3.h20
-rw-r--r--arch/arm/include/asm/arch-omap3/sys_proto.h9
2 files changed, 2 insertions, 27 deletions
diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h
index 2b5e9aeae..7a0853829 100644
--- a/arch/arm/include/asm/arch-omap3/omap3.h
+++ b/arch/arm/include/asm/arch-omap3/omap3.h
@@ -155,14 +155,8 @@ struct gpio {
SRAM_OFFSET2)
#define SRAM_CLK_CODE (SRAM_VECT_CODE + 64)
-#define OMAP3_PUBLIC_SRAM_BASE 0x40208000 /* Works for GP & EMU */
-#define OMAP3_PUBLIC_SRAM_END 0x40210000
-
#define LOW_LEVEL_SRAM_STACK 0x4020FFFC
-/* scratch area - accessible on both EMU and GP */
-#define OMAP3_PUBLIC_SRAM_SCRATCH_AREA OMAP3_PUBLIC_SRAM_BASE
-
#define DEBUG_LED1 149 /* gpio */
#define DEBUG_LED2 150 /* gpio */
@@ -239,18 +233,4 @@ struct gpio {
#define OMAP3730 0x0c00
-/*
- * ROM code API related flags
- */
-#define OMAP3_GP_ROMCODE_API_L2_INVAL 1
-#define OMAP3_GP_ROMCODE_API_WRITE_ACR 3
-
-/*
- * EMU device PPA HAL related flags
- */
-#define OMAP3_EMU_HAL_API_L2_INVAL 40
-#define OMAP3_EMU_HAL_API_WRITE_ACR 42
-
-#define OMAP3_EMU_HAL_START_HAL_CRITICAL 4
-
#endif
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