Skip to content

Commit 64c48ef

Browse files
author
Su Yue
committed
Kconfigs: Adjust CONFIG_CMA_SIZE_PERCENTAGE to 25 for 2G device
For small memory devices, we can't hardcode the cma memory size. Or kernel won't start because of failure of cma memory allocation. Switching cma size to 25% of total memory seems reasonable. Tested on 2G memory rockpi4b SOC. Signed-off-by: Su Yue <[email protected]>
1 parent e2f3a4f commit 64c48ef

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

kconfigs/fydeos-r96-4_4-def

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,12 +1160,12 @@ CONFIG_DMA_CMA=y
11601160
#
11611161
# Default contiguous memory area size:
11621162
#
1163-
CONFIG_CMA_SIZE_MBYTES=124
1164-
CONFIG_CMA_SIZE_SEL_MBYTES=y
1165-
# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
1163+
CONFIG_CMA_SIZE_PERCENTAGE=25
1164+
# CONFIG_CMA_SIZE_SEL_MBYTES is not set
1165+
CONFIG_CMA_SIZE_SEL_PERCENTAGE=y
11661166
# CONFIG_CMA_SIZE_SEL_MIN is not set
11671167
# CONFIG_CMA_SIZE_SEL_MAX is not set
1168-
CONFIG_CMA_ALIGNMENT=8
1168+
CONFIG_CMA_ALIGNMENT=12
11691169

11701170
#
11711171
# Bus devices
@@ -4577,7 +4577,7 @@ CONFIG_LEDS_TRIGGERS=y
45774577
#
45784578
# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
45794579
# CONFIG_LEDS_TRIGGER_CAMERA is not set
4580-
CONFIG_SWITCH=m
4580+
CONFIG_SWITCH=y
45814581
CONFIG_SWITCH_GPIO=m
45824582
# CONFIG_ACCESSIBILITY is not set
45834583
# CONFIG_INFINIBAND is not set
@@ -4989,6 +4989,7 @@ CONFIG_EXTCON=y
49894989
# CONFIG_EXTCON_RT8973A is not set
49904990
# CONFIG_EXTCON_SM5502 is not set
49914991
# CONFIG_EXTCON_USB_GPIO is not set
4992+
# CONFIG_EXTCON_PD_VIRTUAL is not set
49924993
CONFIG_MEMORY=y
49934994
# CONFIG_ARM_PL172_MPMC is not set
49944995
CONFIG_IIO=y
@@ -5042,7 +5043,7 @@ CONFIG_MAX1363=m
50425043
CONFIG_MCP320X=m
50435044
CONFIG_MCP3422=m
50445045
CONFIG_NAU7802=m
5045-
CONFIG_ROCKCHIP_SARADC=m
5046+
CONFIG_ROCKCHIP_SARADC=y
50465047
CONFIG_TI_ADC081C=m
50475048
CONFIG_TI_ADC128S052=m
50485049
CONFIG_VF610_ADC=m
@@ -5322,7 +5323,7 @@ CONFIG_TEE=y
53225323
#
53235324
# Headset device support
53245325
#
5325-
# CONFIG_RK_HEADSET is not set
5326+
CONFIG_RK_HEADSET=y
53265327
CONFIG_PKGLIST=y
53275328
CONFIG_PKGLIST_USE_CONFIGFS=y
53285329
# CONFIG_PKGLIST_NO_CONFIG is not set

0 commit comments

Comments
 (0)