[Review] Update commit of supporting armada3700

1. change the build command 2. fix the checkpatch warnings Signed-off-by: wangwen <[email protected]> Acked-by: Kevin Peng <[email protected]>
OP-TEE · Nov 16, 2017 · 2f4c2ab · 2f4c2ab
1 parent ceeb073
commit 2f4c2ab
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/.shippable.yml b/.shippable.yml
@@ -151,8 +151,8 @@ build:
     - _make PLATFORM=rockchip-rk322x
     - _make PLATFORM=rockchip-rk322x CFG_TEE_CORE_LOG_LEVEL=4 DEBUG=1
     - _make PLATFORM=sam
-    - _make PLATFORM=marvell-armada7k8k CFG_ARM64_core=y
-    - _make PLATFORM=marvell-armada3700 CFG_ARM64_core=y CFG_ARM_GICV3=y
+    - _make PLATFORM=marvell-armada7k8k
+    - _make PLATFORM=marvell-armada3700
 
     #
     # Regressions tests (QEMU)

diff --git a/.travis.yml b/.travis.yml
@@ -253,10 +253,10 @@ script:
   - $make PLATFORM=sam
 
   # Marvell ARMADA 7K 8K
-  - $make PLATFORM=marvell-armada7k8k CFG_ARM64_core=y
+  - $make PLATFORM=marvell-armada7k8k
 
   # Marvell ARMADA 3700
-  - $make PLATFORM=marvell-armada3700 CFG_ARM64_core=y CFG_ARM_GICV3=y
+  - $make PLATFORM=marvell-armada3700
 
   # Run regression tests (xtest in QEMU)
   - (cd ${HOME}/optee_repo/build && $make check CROSS_COMPILE="ccache arm-linux-gnueabihf-" AARCH32_CROSS_COMPILE=arm-linux-gnueabihf- CFG_TEE_CORE_DEBUG=y DUMP_LOGS_ON_ERROR=1)

diff --git a/core/arch/arm/plat-marvell/armada3700/hal_sec_perf.c b/core/arch/arm/plat-marvell/armada3700/hal_sec_perf.c
@@ -228,7 +228,8 @@ static void _set_range(uint32_t addr, uint32_t size, uint32_t perm)
 {
 	uint32_t rgn_addr = addr;
 	uint32_t rgn_size = size;
-	uint32_t p = 0x100000;    /* minium region size is 1M and must be times of 1M */
+	/* minimum region size is 1M and must be times of 1M */
+	uint32_t p = 0x100000;
 
 	while (1) {
 		if ((p * 2) > rgn_size) {

diff --git a/core/arch/arm/plat-marvell/conf.mk b/core/arch/arm/plat-marvell/conf.mk
@@ -13,6 +13,7 @@ ifeq ($(PLATFORM_FLAVOR),armada3700)
 include core/arch/arm/cpu/cortex-armv8-0.mk
 platform-debugger-arm := 1
 $(call force,CFG_MVEBU_UART,y)
+$(call force,CFG_ARM_GICV3,y)
 endif
 
 ifeq ($(platform-debugger-arm),1)
@@ -22,10 +23,9 @@ platform-aflags-debug-info = -gdwarf-2
 endif
 
 $(call force,CFG_WITH_ARM_TRUSTED_FW,y)
-
+$(call force,CFG_ARM64_core,y)
 $(call force,CFG_GENERIC_BOOT,y)
 $(call force,CFG_GIC,y)
-
 $(call force,CFG_PM_STUBS,y)
 $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
 $(call force,CFG_CORE_CLUSTER_SHIFT,1)

diff --git a/core/arch/arm/plat-marvell/main.c b/core/arch/arm/plat-marvell/main.c
@@ -108,8 +108,8 @@ void console_init(void)
 	serial8250_uart_init(&console_data, CONSOLE_UART_BASE,
 		CONSOLE_UART_CLK_IN_HZ, CONSOLE_BAUDRATE);
 #elif defined(PLATFORM_FLAVOR_armada3700)
-	mvebu_uart_init(&console_data, CONSOLE_UART_BASE, CONSOLE_UART_CLK_IN_HZ,
-		CONSOLE_BAUDRATE);
+	mvebu_uart_init(&console_data, CONSOLE_UART_BASE,
+		CONSOLE_UART_CLK_IN_HZ, CONSOLE_BAUDRATE);
 #endif
 	register_serial_console(&console_data.chip);
 }
diff --git a/core/arch/arm/plat-marvell/sub.mk b/core/arch/arm/plat-marvell/sub.mk
@@ -1,9 +1,4 @@
 global-incdirs-y += .
 srcs-y += main.c
-ifeq ($(PLATFORM_FLAVOR_armada7k8k),y)
-srcs-y += armada7k8k/hal_sec_perf.c
-endif
-
-ifeq ($(PLATFORM_FLAVOR_armada3700),y)
-srcs-y += armada3700/hal_sec_perf.c
-endif
+srcs-$(PLATFORM_FLAVOR_armada7k8k) += armada7k8k/hal_sec_perf.c
+srcs-$(PLATFORM_FLAVOR_armada3700) += armada3700/hal_sec_perf.c
diff --git a/core/drivers/mvebu_uart.c b/core/drivers/mvebu_uart.c
@@ -113,8 +113,8 @@ static const struct serial_ops mvebu_uart_ops = {
 };
 KEEP_PAGER(mvebu_uart_ops);
 
-void mvebu_uart_init(struct mvebu_uart_data *pd, paddr_t pbase, uint32_t uart_clk,
-		uint32_t baud_rate)
+void mvebu_uart_init(struct mvebu_uart_data *pd, paddr_t pbase,
+		uint32_t uart_clk, uint32_t baud_rate)
 {
 	vaddr_t base;
 	uint32_t tmp = 0;
@@ -137,7 +137,8 @@ void mvebu_uart_init(struct mvebu_uart_data *pd, paddr_t pbase, uint32_t uart_cl
 	write32(0, base + UART_POSSR_REG);
 
 	/* reset FIFO */
-	write32((UART_CTRL_RXFIFO_RESET | UART_CTRL_TXFIFO_RESET), base + UART_CTRL_REG);
+	write32((UART_CTRL_RXFIFO_RESET | UART_CTRL_TXFIFO_RESET),
+		base + UART_CTRL_REG);
 
 	/* No Parity, 1 stop */
 	write32(0, base + UART_CTRL_REG);

diff --git a/core/include/drivers/mvebu_uart.h b/core/include/drivers/mvebu_uart.h
@@ -35,7 +35,7 @@ struct mvebu_uart_data {
 	struct serial_chip chip;
 };
 
-void mvebu_uart_init(struct mvebu_uart_data *pd, paddr_t pbase, uint32_t uart_clk,
-		uint32_t baud_rate);
+void mvebu_uart_init(struct mvebu_uart_data *pd, paddr_t pbase,
+		uint32_t uart_clk, uint32_t baud_rate);
 
 #endif /* MVEBU_UART_H */