Merge pull request #5199 from jernejsk/var-fixes

Allwinner: Two fixes

projects/Allwinner/devices/H3/options

@@ -51,3 +51,6 @@
 
   # set the addon project
     ADDON_PROJECT="ARMv7"
+
+  # additional kernel parameters
+    EXTRA_CMDLINE="$EXTRA_CMDLINE vmalloc=320M"

projects/Allwinner/devices/R40/options

@@ -48,3 +48,6 @@
 
   # set the addon project
     ADDON_PROJECT="ARMv7"
+
+  # additional kernel parameters
+    EXTRA_CMDLINE="$EXTRA_CMDLINE vmalloc=320M"

projects/Allwinner/filesystem/usr/bin/install2emmc

@@ -11,11 +11,6 @@ UUID_STORAGE="$(uuidgen)"
 BOOT=$(grep /flash /proc/mounts | awk '{print $1}' | sed 's/p[012]//g')
 DISK=""
 
-if [ ! -f /usr/share/bootloader/u-boot-sunxi-with-spl.bin ]; then
-  echo "U-Boot not found. Please update current installation with board specific update or image first."
-  exit 1
-fi
-
 for TYPE in /sys/class/block/mmcblk*/device/type; do
   if grep -q "MMC" "${TYPE}"; then
     DISK="/dev/$(echo "${TYPE}" | awk -F/ '{print $5}')"
@@ -77,7 +72,7 @@ mkfs.ext4 -L STORAGE -U ${UUID_STORAGE} ${DISK}p2 > /dev/null 2>&1
 sync
 
 echo "Installing bootloader"
-dd if=/usr/share/bootloader/u-boot-sunxi-with-spl.bin of="${DISK}" bs=1k seek=8 conv=fsync > /dev/null 2>&1
+dd if="${BOOT}" skip=8 of="${DISK}" bs=1k seek=8 count=768 conv=fsync > /dev/null 2>&1
 
 echo "Copying system files"
 

projects/Allwinner/linux/linux.arm.conf

@@ -5939,7 +5939,7 @@ CONFIG_DMA_CMA=y
 #
 # Default contiguous memory area size:
 #
-CONFIG_CMA_SIZE_MBYTES=256
+CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SIZE_SEL_MIN is not set