diff options
-rw-r--r-- | baseboard/mtscp-rv32i/baseboard.h | 61 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/build.mk | 11 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/mdp.c (renamed from board/asurada_scp/mdp.c) | 0 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/mdp.h (renamed from board/asurada_scp/mdp.h) | 0 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/vdec.c (renamed from board/asurada_scp/vdec.c) | 0 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/vdec.h (renamed from board/asurada_scp/vdec.h) | 0 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/venc.c (renamed from board/asurada_scp/venc.c) | 0 | ||||
-rw-r--r-- | baseboard/mtscp-rv32i/venc.h (renamed from board/asurada_scp/venc.h) | 0 | ||||
-rw-r--r-- | board/asurada_scp/board.h | 51 | ||||
-rw-r--r-- | board/asurada_scp/build.mk | 6 |
10 files changed, 74 insertions, 55 deletions
diff --git a/baseboard/mtscp-rv32i/baseboard.h b/baseboard/mtscp-rv32i/baseboard.h new file mode 100644 index 0000000000..a8f3b522a0 --- /dev/null +++ b/baseboard/mtscp-rv32i/baseboard.h @@ -0,0 +1,61 @@ +/* Copyright 2021 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +/* MT SCP RV32i board configuration */ + +#ifndef __CROS_EC_BASEBOARD_H +#define __CROS_EC_BASEBOARD_H + +#define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_HOSTCMD) | CC_MASK(CC_IPI))) + +#define CONFIG_FLASH_SIZE_BYTES CONFIG_RAM_BASE +#define CONFIG_LTO +#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE +#define CONFIG_UART_CONSOLE 0 + +/* IPI configs */ +#define CONFIG_IPC_SHARED_OBJ_BUF_SIZE 288 +#define CONFIG_IPC_SHARED_OBJ_ADDR \ + (SCP_FW_END - \ + (CONFIG_IPC_SHARED_OBJ_BUF_SIZE + 2 * 4 /* int32_t */) * 2) +#define CONFIG_IPI +#define CONFIG_RPMSG_NAME_SERVICE + +#define SCP_IPI_INIT 0 +#define SCP_IPI_VDEC_H264 1 +#define SCP_IPI_VDEC_VP8 2 +#define SCP_IPI_VDEC_VP9 3 +#define SCP_IPI_VENC_H264 4 +#define SCP_IPI_VENC_VP8 5 +#define SCP_IPI_MDP_INIT 6 +#define SCP_IPI_MDP_DEINIT 7 +#define SCP_IPI_MDP_FRAME 8 +#define SCP_IPI_DIP 9 +#define SCP_IPI_ISP_CMD 10 +#define SCP_IPI_ISP_FRAME 11 +#define SCP_IPI_FD_CMD 12 +#define SCP_IPI_HOST_COMMAND 13 +#define SCP_IPI_VDEC_LAT 14 +#define SCP_IPI_VDEC_CORE 15 +#define SCP_IPI_COUNT 16 + +#define IPI_COUNT SCP_IPI_COUNT + +#define SCP_IPI_NS_SERVICE 0xFF + +/* Access DRAM through cached access */ +#define CONFIG_DRAM_BASE 0x10000000 +/* Shared memory address in AP physical address space. */ +#define CONFIG_DRAM_BASE_LOAD 0x50000000 +#define CONFIG_DRAM_SIZE 0x01400000 /* 20 MB */ + +/* MPU settings */ +#define NR_MPU_ENTRIES 16 + +#ifndef __ASSEMBLER__ +#include "gpio_signal.h" +#endif /* !__ASSEMBLER__ */ + +#endif /* __CROS_EC_BASEBOARD_H */ diff --git a/baseboard/mtscp-rv32i/build.mk b/baseboard/mtscp-rv32i/build.mk new file mode 100644 index 0000000000..5835fa2909 --- /dev/null +++ b/baseboard/mtscp-rv32i/build.mk @@ -0,0 +1,11 @@ +# -*- makefile -*- +# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# Baseboard specific files build +# + +baseboard-$(HAS_TASK_VDEC_SERVICE)+=vdec.o +baseboard-$(HAS_TASK_VENC_SERVICE)+=venc.o +baseboard-$(HAS_TASK_MDP_SERVICE)+=mdp.o diff --git a/board/asurada_scp/mdp.c b/baseboard/mtscp-rv32i/mdp.c index 44b7df714e..44b7df714e 100644 --- a/board/asurada_scp/mdp.c +++ b/baseboard/mtscp-rv32i/mdp.c diff --git a/board/asurada_scp/mdp.h b/baseboard/mtscp-rv32i/mdp.h index eea3ffb289..eea3ffb289 100644 --- a/board/asurada_scp/mdp.h +++ b/baseboard/mtscp-rv32i/mdp.h diff --git a/board/asurada_scp/vdec.c b/baseboard/mtscp-rv32i/vdec.c index 441440ba3f..441440ba3f 100644 --- a/board/asurada_scp/vdec.c +++ b/baseboard/mtscp-rv32i/vdec.c diff --git a/board/asurada_scp/vdec.h b/baseboard/mtscp-rv32i/vdec.h index cdc16ba9e0..cdc16ba9e0 100644 --- a/board/asurada_scp/vdec.h +++ b/baseboard/mtscp-rv32i/vdec.h diff --git a/board/asurada_scp/venc.c b/baseboard/mtscp-rv32i/venc.c index de993209ec..de993209ec 100644 --- a/board/asurada_scp/venc.c +++ b/baseboard/mtscp-rv32i/venc.c diff --git a/board/asurada_scp/venc.h b/baseboard/mtscp-rv32i/venc.h index 47454c4507..47454c4507 100644 --- a/board/asurada_scp/venc.h +++ b/baseboard/mtscp-rv32i/venc.h diff --git a/board/asurada_scp/board.h b/board/asurada_scp/board.h index 0158387f84..e25a26dec0 100644 --- a/board/asurada_scp/board.h +++ b/board/asurada_scp/board.h @@ -8,11 +8,7 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -#define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_HOSTCMD) | CC_MASK(CC_IPI))) - -#define CONFIG_FLASH_SIZE_BYTES CONFIG_RAM_BASE -#define CONFIG_LTO -#define CONFIG_UART_CONSOLE 0 +#include "baseboard.h" /* * RW only, no flash @@ -34,49 +30,4 @@ #define SCP_FW_END 0x100000 -/* IPI configs */ -#define CONFIG_IPC_SHARED_OBJ_BUF_SIZE 288 -#define CONFIG_IPC_SHARED_OBJ_ADDR \ - (SCP_FW_END - \ - (CONFIG_IPC_SHARED_OBJ_BUF_SIZE + 2 * 4 /* int32_t */) * 2) -#define CONFIG_IPI -#define CONFIG_RPMSG_NAME_SERVICE - -#define SCP_IPI_INIT 0 -#define SCP_IPI_VDEC_H264 1 -#define SCP_IPI_VDEC_VP8 2 -#define SCP_IPI_VDEC_VP9 3 -#define SCP_IPI_VENC_H264 4 -#define SCP_IPI_VENC_VP8 5 -#define SCP_IPI_MDP_INIT 6 -#define SCP_IPI_MDP_DEINIT 7 -#define SCP_IPI_MDP_FRAME 8 -#define SCP_IPI_DIP 9 -#define SCP_IPI_ISP_CMD 10 -#define SCP_IPI_ISP_FRAME 11 -#define SCP_IPI_FD_CMD 12 -#define SCP_IPI_HOST_COMMAND 13 -#define SCP_IPI_VDEC_LAT 14 -#define SCP_IPI_VDEC_CORE 15 -#define SCP_IPI_COUNT 16 - -#define IPI_COUNT SCP_IPI_COUNT - -#define SCP_IPI_NS_SERVICE 0xFF - -/* MPU settings */ -#define NR_MPU_ENTRIES 16 - -/* Access DRAM through cached access */ -#define CONFIG_DRAM_BASE 0x10000000 -/* Shared memory address in AP physical address space. */ -#define CONFIG_DRAM_BASE_LOAD 0x50000000 -#define CONFIG_DRAM_SIZE 0x01400000 /* 20 MB */ - -#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE - -#ifndef __ASSEMBLER__ -#include "gpio_signal.h" -#endif /* !__ASSEMBLER__ */ - #endif /* __CROS_EC_BOARD_H */ diff --git a/board/asurada_scp/build.mk b/board/asurada_scp/build.mk index 6c52513faa..1095ad66d3 100644 --- a/board/asurada_scp/build.mk +++ b/board/asurada_scp/build.mk @@ -8,10 +8,6 @@ CHIP:=mt8192_scp CHIP_VARIANT:=mt8192 +BASEBOARD:=mtscp-rv32i board-y=board.o -board-$(HAS_TASK_VDEC_SERVICE)+=vdec.o -board-$(HAS_TASK_VENC_SERVICE)+=venc.o - -# MDP3 -board-$(HAS_TASK_MDP_SERVICE)+=mdp.o |