Skip to content

Commit ebd233b

Browse files
committed
eib_image: Drop customized CMA parameter from RPi's boot arguments
RPi firmware coworks with device tree to decide the CMA size automatically. Then, kernel allocates the CMA memory. So, there is no need to insert the customized cma argument into the boot command. https://app.asana.com/1/1203676861188277/project/1211061530470838/task/1211645002178218
1 parent 4e4c43a commit ebd233b

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

stages/eib_image

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ else
7070
ostree --repo="${REPOPATH}" config set sysroot.bootloader none
7171
fi
7272

73-
# Platform dependent boot arguments
74-
platform_bootargs="platform_bootargs="
75-
if [ "${EIB_PLATFORM:0:3}" == "rpi" ]; then
76-
# Raspberry Pi needs the memory config if vc4 is loaded
77-
# https://phabricator.endlessm.com/T27774#757530
78-
platform_bootargs+="cma=256M@512M"
79-
fi
80-
8173
# 62MB seems to be arbitrarily chosen to minimize the impact of the ESP
8274
# on non-EFI and low storage (small EMMC) devices.
8375
esp_size=62
@@ -338,12 +330,9 @@ EOF
338330
# Install bootloader
339331
case "${EIB_ARCH}" in
340332
arm64)
341-
cp "${EIB_DATADIR}"/arm64/boot.src "${EIB_TMPDIR}"/boot.src
342-
sed -i "1s/^/"$platform_bootargs"\n/" "${EIB_TMPDIR}"/boot.src
343-
344333
# Make a boot script for u-boot
345334
mkimage -T script -C none -n "Endless OS arm64 boot script" -d \
346-
"${EIB_TMPDIR}"/boot.src \
335+
"${EIB_DATADIR}"/arm64/boot.src \
347336
"${ROOT}"/boot/boot.scr
348337

349338
case "${EIB_PLATFORM}" in

0 commit comments

Comments
 (0)