From d7c960a6a073527b6ccde498cefaafb263cedd9e Mon Sep 17 00:00:00 2001 From: yuanbo Date: Wed, 27 Apr 2022 14:26:11 +0800 Subject: [PATCH] fix: standalone obj dir for kernel build Signed-off-by: yuanbo --- linux-5.10/rk3568_patch/hdf.patch | 28 ++++++++++++++-------------- linux-5.10/rk3568_patch/kernel.patch | 11 +++++++---- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/linux-5.10/rk3568_patch/hdf.patch b/linux-5.10/rk3568_patch/hdf.patch index 2dd60b6..1651f9d 100644 --- a/linux-5.10/rk3568_patch/hdf.patch +++ b/linux-5.10/rk3568_patch/hdf.patch @@ -307,20 +307,20 @@ index a48e5f2d8..90d25f224 100644 obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o -+ccflags-y +=-Idrivers/hdf/framework/model/input/driver \ -+ -Idrivers/hdf/framework/model/input/driver/input_bus_ops \ -+ -Idrivers/hdf/framework/include/core \ -+ -Idrivers/hdf/framework/core/common/include/host \ -+ -Idrivers/hdf/framework/include/utils \ -+ -Idrivers/hdf/framework/include/osal \ -+ -Idrivers/hdf/framework/include/platform \ -+ -Idrivers/hdf/framework/include/config \ -+ -Idrivers/hdf/framework/core/host/include \ -+ -Idrivers/hdf/framework/core/shared/include \ -+ -Idrivers/hdf/framework/utils/include \ -+ -Idrivers/hdf/khdf/osal/include -+ccflags-y +=-Ibounds_checking_function/include \ -+ -Idrivers/hdf/evdev ++ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/input/driver \ ++ -I$(srctree)/drivers/hdf/framework/model/input/driver/input_bus_ops \ ++ -I$(srctree)/drivers/hdf/framework/include/core \ ++ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ ++ -I$(srctree)/drivers/hdf/framework/include/utils \ ++ -I$(srctree)/drivers/hdf/framework/include/osal \ ++ -I$(srctree)/drivers/hdf/framework/include/platform \ ++ -I$(srctree)/drivers/hdf/framework/include/config \ ++ -I$(srctree)/drivers/hdf/framework/core/host/include \ ++ -I$(srctree)/drivers/hdf/framework/core/shared/include \ ++ -I$(srctree)/drivers/hdf/framework/utils/include \ ++ -I$(srctree)/drivers/hdf/khdf/osal/include ++ccflags-y +=-I$(srctree)/bounds_checking_function/include \ ++ -I$(srctree)/drivers/hdf/evdev diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c index 3fb64dbda..394cd5912 100644 --- a/drivers/input/misc/rk805-pwrkey.c diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index 9fdccc0..7aa468a 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -932918,8 +932918,8 @@ index 000000000..1d9f6d0c0 + -DPOWERUP_MAX_RETRY=0 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \ + -DWL_EXT_IAPSTA -DWL_ESCAN -DCCODE_LIST \ + -DENABLE_INSMOD_NO_FW_LOAD \ -+ -Idrivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6 \ -+ -Idrivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include ++ -I$(srctree)/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6 \ ++ -I$(srctree)/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_wifi6/include + +DHDOFILES = aiutils.o siutils.o sbutils.o bcmutils.o bcmwifi_channels.o \ + dhd_linux.o dhd_linux_platdev.o dhd_linux_sched.o dhd_pno.o \ @@ -1664646,6 +1664646,9 @@ index 000000000..81b93d71e +EXTLINUX_PATH=${BUILD_PATH}/extlinux +EXTLINUX_CONF=${EXTLINUX_PATH}/extlinux.conf +TOYBRICK_DTB=toybrick.dtb ++if [ ${KBUILD_OUTPUT} ]; then ++ OBJ_PATH=${KBUILD_OUTPUT}/ ++fi + +ID_MODEL=1 +ID_ARCH=2 @@ -1664741,8 +1664744,8 @@ index 000000000..81b93d71e + exit 1 + fi + make_extlinux_conf ${dtb_path} ${uart} ${image} -+ cp -f arch/${arch}/boot/${image} ${EXTLINUX_PATH}/ -+ cp -f ${dtb_path}/${dtb}.dtb ${EXTLINUX_PATH}/${TOYBRICK_DTB} ++ cp -f ${OBJ_PATH}arch/${arch}/boot/${image} ${EXTLINUX_PATH}/ ++ cp -f ${OBJ_PATH}${dtb_path}/${dtb}.dtb ${EXTLINUX_PATH}/${TOYBRICK_DTB} + cp -f logo*.bmp ${BUILD_PATH}/ + if [ "enable_ramdisk" != "${ramdisk_flag}" ]; then + make_ext2_image -- Gitee