Merge pull request #280 from widgetii/hisi_cma_unify

[EV300] Unify hisi and cma allocators in single module
pull/282/head
Igor Zalatov 2022-07-27 14:55:02 +03:00 committed by GitHub
commit d12d915c9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 4 deletions

View File

@ -76,7 +76,7 @@ insert_osal()
if [ -z "$MMZ" ]; then
insmod hi_osal.ko anony=1 mmz_allocator=hisi mmz=anonymous,0,$mmz_start,$mmz_size || report_error
else
insmod cma_osal.ko anony=1 mmz_allocator=cma mmz=$MMZ || report_error
insmod hi_osal.ko anony=1 mmz_allocator=cma mmz=$MMZ || report_error
fi
}
@ -98,7 +98,6 @@ remove_detect()
rmmod -w hi3516ev200_isp
rmmod -w hi3516ev200_base
rmmod -w hi_osal
rmmod -w cma_osal
rmmod -w sys_config.ko
}
@ -229,7 +228,6 @@ remove_ko()
rmmod -w hi3516ev200_sys
rmmod -w hi3516ev200_base
rmmod -w hi_osal
rmmod -w cma_osal
rmmod -w sys_config
}

View File

@ -26,7 +26,6 @@ define HISILICON_OSDRV_HI3516EV300_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.37/hisilicon
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/kmod/camhi-motor.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/kmod/cma_osal.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/kmod/hi3516ev200_acodec.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/kmod/hi3516ev200_adec.ko
$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/kmod/hi3516ev200_aenc.ko