Unverified Commit a3906a9c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2462 ub: change name in kconfig, and kconfig content of ub 

Merge Pull Request from: @yizhen-fan 
 
driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I88XTY


CVE: NA

--------------------------------

Change kconfig name of urma from config_ub to config_ub_urma.
Currently ub urma module can also compile on x86 structure.

Signed-off-by: default avatarGuoxin Qian <qianguoxin@huawei.com>
Signed-off-by: default avatarYizhen Fan <fanyizhen@huawei.com>
 
Link:https://gitee.com/openeuler/kernel/pulls/2462

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarLin Yunsheng <linyunsheng@huawei.com>
Reviewed-by: default avatarLijun Li <jerry.lilijun@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 9358e1f4 aeda8188

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6208,6 +6208,7 @@ CONFIG_TEE=m 
CONFIG_ROH=m

CONFIG_ROH_HNS=m

CONFIG_UB=m

CONFIG_UB_URMA=m

# end of Device Drivers



#

drivers/ub/Kconfig

+19 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menuconfig UB

	tristate "Unified Bus (UB) support"

	depends on ARM64

	tristate "Unified Bus (UB) core support"

	depends on ARM64 || X86_64 || COMPILE_TEST

	default n

	help

	  Core support for Unified Bus (UB).

	  Currently it only support arm64 structure.

	  Default option is close.

	  If you have a hardware that support ub protocol,

	  Say m here. By Default this option is closed.

	  To compile UB core as module, choose M here.



if UB



config UB_URMA

	tristate "Unified Bus (UB) urma support"

	depends on UB

	default m

	help

	  Unified remote memory access(URMA) support. This

	  is the kernel side of the userspace urma support, which allows

	  userspace processes to send and receive urma cmd. You will also

	  need liburma from umdk

	  <https://gitee.com/openeuler/umdk>.



endif # UB

drivers/ub/urma/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 
#



obj-$(CONFIG_UB)		+= ubcore/

obj-$(CONFIG_UB)		+= uburma/
 
obj-$(CONFIG_UB_URMA)	+= uburma/

drivers/ub/urma/uburma/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ uburma-objs := uburma_main.o \ 
			uburma_event.o \

			uburma_uobj.o



obj-$(CONFIG_UB) += uburma.o
 
obj-$(CONFIG_UB_URMA) += uburma.o