From 6c737a6dc1fe13c3fd27caafe7c415c1e7d7eefe Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Tue, 7 Sep 2021 19:12:40 +0200 Subject: ARM: replicant_defconfig: override default firmware lookup directory fw_search_path.rst[1] states that: The following search paths are used to look for firmware on your root filesystem. * fw_path_para - module parameter - default is empty so this is ignored * /lib/firmware/updates/UTS_RELEASE/ [...] As we need the firmwares to be loaded and the system typically adds them in /vendor/lib/firmware as other hardware specific code is typically in /vendor/[2]. [1]Documentation/driver-api/firmware/fw_search_path.rst [2]https://source.android.com/devices/architecture/vndk Signed-off-by: Denis 'GNUtoo' Carikli --- arch/arm/configs/replicant_defconfig | 2 +- build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/replicant_defconfig b/arch/arm/configs/replicant_defconfig index 78699f228818..0a3daf2c7b12 100644 --- a/arch/arm/configs/replicant_defconfig +++ b/arch/arm/configs/replicant_defconfig @@ -36,7 +36,7 @@ CONFIG_HIGHMEM=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y -CONFIG_CMDLINE="root=PARTLABEL=SYSTEM init=/init rootwait console=ttySAC2,115200 loglevel=8 androidboot.hardware=smdk4x12 androidboot.selinux=permissive enforcing=0 exynosdrm.pixel_order=1" +CONFIG_CMDLINE="root=PARTLABEL=SYSTEM init=/init rootwait firmware_class.path=/vendor/lib/firmware console=ttySAC2,115200 loglevel=8 androidboot.hardware=smdk4x12 androidboot.selinux=permissive enforcing=0 exynosdrm.pixel_order=1" CONFIG_CMDLINE_EXTEND=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y diff --git a/build.sh b/build.sh index 279e0b4cb896..f0e5b5b1838f 100755 --- a/build.sh +++ b/build.sh @@ -231,6 +231,7 @@ make replicant_defconfig if [ "${os}" = "Android" ] ; then set_kconfig_y CONFIG_USB_FUNCTIONFS cmdline_append "root=PARTLABEL=SYSTEM init=/init rootwait" + cmdline_append "firmware_class.path=/vendor/lib/firmware" if [ ${device} == "i9100" ] ; then cmdline_remove "androidboot.hardware=smdk4210" else -- cgit v1.2.3