- 论坛徽章:
- 1
|
本帖最后由 308123027 于 2016-07-08 09:59 编辑
有两个Kconfig文件,A和B,现在要将B的内容同步到A,由于B不是从A直接修改过来(因此不能用diff + patch动作来操作),需要将B的内容找出来对应修改A的内容,
比如:A中config MTK_NET下default n,B中为default y
其中if MTK_NET ... endif中有config NET_AAAAA_GF_TEE,现在要将起替换为B中内容
所有这些必须在menu ... endmenu, if MTK_NET ... endif这样的对应范围内修改
最后将修改后内容写回A
KconfigA内容如下:
#
#NET
#
menu "NET support"
depends on !UML
config MTK_NET
tristate "Mediatek NET"
default n
---help---
NET mtk driver enable/disable in the kernel.
Say Y here if you want to use mediatek NET driver,
NET driver will support NET function in REE,
it supports BBBBB's N/K device.
if MTK_NET
config BBBBB_NET
tristate "BBBBB NET"
default n
---help---
BBBBB NET BBBBB's N/K device.
config NET_AAAAA_GF_TEE
tristate "AAAAA NET"
default n
---help---
AAAAA NET chip M TEE driver
endif
endmenu
KconfigB,内容如下:
menu "NET support"
depends on !UML
config MTK_NET
tristate "Mediatek NET"
default y
---help---
NET mtk driver enable/disable in the kernel.
Say Y here if you want to use mediatek NET driver,
NET driver will support NET function in REE,
it supports AAAAA's M... device.
if MTK_NET
config AAAAA_NET
tristate "AAAAA NET"
default y
---help---
AAAAA NET chip M TEE driver
config AAAAA_SENSOR_TYPE
string "SENSOR_TYPE"
default "M"
---help---
Must input sensor type, or default is M
endif
endmenu
|
|