From f5719063b6f6be9c387494042bcbf9b340f4cd2a Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 23 Oct 2024 18:01:29 +0900 Subject: [PATCH] ODROID-C5: Add new submodule 'media_modules' to media drivers Change-Id: I683fd590315157ce77b1672ab1b947b1104641d9 Signed-off-by: Dongjin Kim --- .gitmodules | 5 +++++ Kconfig | 2 ++ Makefile | 2 ++ media_modules | 1 + 4 files changed, 10 insertions(+) create mode 160000 media_modules diff --git a/.gitmodules b/.gitmodules index db0e21a66755..280068026abe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,8 @@ path = common_drivers url = https://git.odroid.com/yocto/kernel/common_drivers branch = odroids7d-5.15.y + +[submodule "media_modules"] + path = media_modules + url = https://git.odroid.com/yocto/platform/hardware/amlogic/media_modules + branch = odroids7d-5.15.y diff --git a/Kconfig b/Kconfig index 57a142d8d8b4..f700b74b4e7a 100644 --- a/Kconfig +++ b/Kconfig @@ -33,3 +33,5 @@ source "Documentation/Kconfig" # ANDROID: Set KCONFIG_EXT_PREFIX to decend into an external project. source "$(KCONFIG_EXT_PREFIX)Kconfig.ext" + +source "media_modules/Kconfig" diff --git a/Makefile b/Makefile index c0f451d2b99d..5de5af96b618 100644 --- a/Makefile +++ b/Makefile @@ -442,6 +442,7 @@ endif # config cannot be used here to mark AMLOGIC modifications # If these three variables are not set externally, set their default values export COMMON_DRIVERS_DIR ?= common_drivers +export MEDIA_DRIVERS_DIR ?= media_modules dtstree ?= $(COMMON_DRIVERS_DIR)/arch/$(SRCARCH)/boot/dts/ export DTC_INCLUDE ?= $(srctree)/$(COMMON_DRIVERS_DIR)/include # endif @@ -716,6 +717,7 @@ drivers-y := drivers/ sound/ ifdef CONFIG_AMLOGIC_IN_KERNEL_MODULES drivers-y += $(COMMON_DRIVERS_DIR)/drivers/ $(COMMON_DRIVERS_DIR)/sound/ drivers-y += $(COMMON_DRIVERS_DIR)/samples/ +drivers-y += $(MEDIA_DRIVERS_DIR)/drivers/ endif drivers-$(CONFIG_SAMPLES) += samples/ drivers-$(CONFIG_NET) += net/ diff --git a/media_modules b/media_modules new file mode 160000 index 000000000000..61d677d72386 --- /dev/null +++ b/media_modules @@ -0,0 +1 @@ +Subproject commit 61d677d7238671960b4bf2d544d1abc1ab688be4