Explorar o código

exynos: move tzpc_init to armv7/exynos

tzpc_init is common for all exynos5 boards, hence move it to
armv7/exynos so that all other boards can use it.

Also update the smdk5250 Makefile and config file.

Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
Acked-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Inderpal Singh %!s(int64=12) %!d(string=hai) anos
pai
achega
72af2fc850

+ 1 - 1
arch/arm/cpu/armv7/exynos/Makefile

@@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
 
 
 LIB	= $(obj)lib$(SOC).o
 LIB	= $(obj)lib$(SOC).o
 
 
-COBJS	+= clock.o power.o soc.o system.o pinmux.o
+COBJS	+= clock.o power.o soc.o system.o pinmux.o tzpc.o
 
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))

+ 1 - 1
board/samsung/smdk5250/tzpc_init.c → arch/arm/cpu/armv7/exynos/tzpc.c

@@ -23,7 +23,7 @@
  */
  */
 
 
 #include <asm/arch/tzpc.h>
 #include <asm/arch/tzpc.h>
-#include"setup.h"
+#include <asm/io.h>
 
 
 /* Setting TZPC[TrustZone Protection Controller] */
 /* Setting TZPC[TrustZone Protection Controller] */
 void tzpc_init(void)
 void tzpc_init(void)

+ 28 - 0
arch/arm/include/asm/arch-exynos/tzpc.h

@@ -47,6 +47,34 @@ struct exynos_tzpc {
 	unsigned int pcellid2;
 	unsigned int pcellid2;
 	unsigned int pcellid3;
 	unsigned int pcellid3;
 };
 };
+
+/* TZPC : Register Offsets */
+#define TZPC0_BASE		0x10100000
+#define TZPC1_BASE		0x10110000
+#define TZPC2_BASE		0x10120000
+#define TZPC3_BASE		0x10130000
+#define TZPC4_BASE		0x10140000
+#define TZPC5_BASE		0x10150000
+#define TZPC6_BASE		0x10160000
+#define TZPC7_BASE		0x10170000
+#define TZPC8_BASE		0x10180000
+#define TZPC9_BASE		0x10190000
+
+#define TZPC_BASE_OFFSET		0x10000
+
+/*
+ * TZPC Register Value :
+ * R0SIZE: 0x0 : Size of secured ram
+ */
+#define R0SIZE			0x0
+
+/*
+ * TZPC Decode Protection Register Value :
+ * DECPROTXSET: 0xFF : Set Decode region to non-secure
+ */
+#define DECPROTXSET		0xFF
+void tzpc_init(void);
+
 #endif
 #endif
 
 
 #endif
 #endif

+ 0 - 1
board/samsung/smdk5250/Makefile

@@ -28,7 +28,6 @@ SOBJS	:= lowlevel_init.o
 
 
 COBJS	:= clock_init.o
 COBJS	:= clock_init.o
 COBJS	+= dmc_common.o dmc_init_ddr3.o
 COBJS	+= dmc_common.o dmc_init_ddr3.o
-COBJS	+= tzpc_init.o
 COBJS	+= smdk5250_spl.o
 COBJS	+= smdk5250_spl.o
 
 
 ifndef CONFIG_SPL_BUILD
 ifndef CONFIG_SPL_BUILD

+ 0 - 25
board/samsung/smdk5250/setup.h

@@ -28,18 +28,6 @@
 #include <config.h>
 #include <config.h>
 #include <asm/arch/dmc.h>
 #include <asm/arch/dmc.h>
 
 
-/* TZPC : Register Offsets */
-#define TZPC0_BASE		0x10100000
-#define TZPC1_BASE		0x10110000
-#define TZPC2_BASE		0x10120000
-#define TZPC3_BASE		0x10130000
-#define TZPC4_BASE		0x10140000
-#define TZPC5_BASE		0x10150000
-#define TZPC6_BASE		0x10160000
-#define TZPC7_BASE		0x10170000
-#define TZPC8_BASE		0x10180000
-#define TZPC9_BASE		0x10190000
-
 /* APLL_CON1	*/
 /* APLL_CON1	*/
 #define APLL_CON1_VAL	(0x00203800)
 #define APLL_CON1_VAL	(0x00203800)
 
 
@@ -458,18 +446,6 @@
 /* CLK_GATE_IP_DISP1 */
 /* CLK_GATE_IP_DISP1 */
 #define CLK_GATE_DP1_ALLOW	(1 << 4)
 #define CLK_GATE_DP1_ALLOW	(1 << 4)
 
 
-/*
- * TZPC Register Value :
- * R0SIZE: 0x0 : Size of secured ram
- */
-#define R0SIZE			0x0
-
-/*
- * TZPC Decode Protection Register Value :
- * DECPROTXSET: 0xFF : Set Decode region to non-secure
- */
-#define DECPROTXSET		0xFF
-
 #define DDR3PHY_CTRL_PHY_RESET	(1 << 0)
 #define DDR3PHY_CTRL_PHY_RESET	(1 << 0)
 #define DDR3PHY_CTRL_PHY_RESET_OFF	(0 << 0)
 #define DDR3PHY_CTRL_PHY_RESET_OFF	(0 << 0)
 
 
@@ -590,5 +566,4 @@ void update_reset_dll(struct exynos5_dmc *, enum ddr_mode);
 void sdelay(unsigned long);
 void sdelay(unsigned long);
 void mem_ctrl_init(void);
 void mem_ctrl_init(void);
 void system_clock_init(void);
 void system_clock_init(void);
-void tzpc_init(void);
 #endif
 #endif

+ 0 - 2
include/configs/exynos5250-dt.h

@@ -93,8 +93,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	EXYNOS_DEVICE_SETTINGS
 	EXYNOS_DEVICE_SETTINGS
 
 
-#define TZPC_BASE_OFFSET		0x10000
-
 /* SD/MMC configuration */
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
 #define CONFIG_MMC