| author | apollo.ling <apollo.ling@amlogic.com> | 2020-06-15 06:14:22 (GMT) |
|---|---|---|
| committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2020-06-18 03:18:50 (GMT) |
| commit | ff87bfb40c0c50fcc37a1c9932c3a09fac609ce1 (patch) | |
| tree | a1612366a063074ad8ecc0e372abde47ca6e051b | |
| parent | deb35d45d697c28f18bfa406e4eabbdd430be88a (diff) | |
| download | media_modules-ff87bfb40c0c50fcc37a1c9932c3a09fac609ce1.zip media_modules-ff87bfb40c0c50fcc37a1c9932c3a09fac609ce1.tar.gz media_modules-ff87bfb40c0c50fcc37a1c9932c3a09fac609ce1.tar.bz2 | |
vdec: adjust CONFIG_AMLOGIC_TEE to fit android R style [1/1]
PD#SWPL-26738
Problem:
CONFIG_AMLOGIC_XXX style changed in android R
Solution:
adjust CONFIG_AMLOGIC_TEE to fit android R
verify:
AC214
Change-Id: I0af2bb9fb64645414347a9af3bfaa514c2037eb3
Signed-off-by: apollo.ling <apollo.ling@amlogic.com>
| -rw-r--r-- | drivers/frame_provider/decoder/utils/firmware.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/frame_provider/decoder/utils/firmware.h b/drivers/frame_provider/decoder/utils/firmware.h index 78c90f7..cd48036 100644 --- a/drivers/frame_provider/decoder/utils/firmware.h +++ b/drivers/frame_provider/decoder/utils/firmware.h @@ -22,7 +22,7 @@ #include "../../../common/firmware/firmware_type.h" #include <linux/amlogic/media/utils/vformat.h> -#ifdef CONFIG_AMLOGIC_TEE +#if defined(CONFIG_AMLOGIC_TEE) || defined(CONFIG_AMLOGIC_TEE_MODULE) #include <linux/amlogic/tee.h> #endif @@ -41,7 +41,7 @@ extern int get_data_from_name(const char *name, char *buf); extern int get_firmware_data(unsigned int foramt, char *buf); extern int video_fw_reload(int mode); -#ifndef CONFIG_AMLOGIC_TEE +#if !defined(CONFIG_AMLOGIC_TEE) && !defined(CONFIG_AMLOGIC_TEE_MODULE) static inline bool tee_enabled(void) { return false; } static inline int tee_load_video_fw_swap(u32 index, u32 vdec, bool is_swap) { |