Update Allwinner Settings

build-armbian/armbian-files/common-files/usr/sbin/armbian-update

@@ -419,15 +419,15 @@ update_kernel() {
 
  # 01. For /boot five files
  tar -xzf boot-${kernel_name}.tar.gz -C /boot
- [[ "${PLATFORM}" == "amlogic" ]] && (cd /boot && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} zImage)
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && (cd /boot && ln -sf uInitrd-${kernel_name} uInitrd && ln -sf vmlinuz-${kernel_name} Image)
+ [[ "${PLATFORM}" == "amlogic" || "${PLATFORM}" == "allwinner" ]] && (cd /boot && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} zImage)
+ [[ "${PLATFORM}" == "rockchip" ]] && (cd /boot && ln -sf uInitrd-${kernel_name} uInitrd && ln -sf vmlinuz-${kernel_name} Image)
  [[ "$(ls /boot/*${kernel_name}* -l 2>/dev/null | grep "^-" | wc -l)" -ge "4" ]] || error_msg "The /boot files is missing."
  echo -e "${INFO} (1/4) Unpacking [ boot-${kernel_name}.tar.gz ] done."
 
  # 02. For /boot/dtb/${PLATFORM}/*
  [[ -d "/boot/dtb/${PLATFORM}" ]] || mkdir -p /boot/dtb/${PLATFORM}
  tar -xzf dtb-${PLATFORM}-${kernel_name}.tar.gz -C /boot/dtb/${PLATFORM}
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && ln -sf dtb /boot/dtb-${kernel_name}
+ [[ "${PLATFORM}" == "rockchip" ]] && ln -sf dtb /boot/dtb-${kernel_name}
  [[ "$(ls /boot/dtb/${PLATFORM} -l 2>/dev/null | grep "^-" | wc -l)" -ge "2" ]] || error_msg "/boot/dtb/${PLATFORM} files is missing."
  echo -e "${INFO} (2/4) Unpacking [ dtb-${PLATFORM}-${kernel_name}.tar.gz ] done."
 

build-armbian/armbian-files/platform-files/allwinner/bootfs/boot.cmd

@@ -3,20 +3,33 @@
 # Please edit /boot/armbianEnv.txt to set supported parameters
 #
 
-# default values
 setenv load_addr "0x45000000"
 setenv overlay_error "false"
-setenv rootdev "/dev/mmcblk0p1"
+# default values
 setenv verbosity "1"
-setenv rootfstype "ext4"
 setenv console "both"
+setenv disp_mem_reserves "off"
+setenv disp_mode "1920x1080p60"
+setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv bootlogo "false"
+setenv devnum "0"
+setenv rootdev "/dev/mmcblk${devnum}p1"
+setenv earlycon "off"
 
 # Print boot source
-itest.b *0x10028 == 0x00 && echo "U-boot loaded from SD"
-itest.b *0x10028 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
-itest.b *0x10028 == 0x03 && echo "U-boot loaded from SPI"
+itest.b *0x28 == 0x00 && echo "U-boot loaded from SD"
+itest.b *0x28 == 0x01 && echo "U-boot loaded from NAND"
+itest.b *0x28 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
+itest.b *0x28 == 0x03 && echo "U-boot loaded from SPI"
+
+# get PARTUUID of first partition on SD/eMMC it was loaded from
+# mmc 0 is always mapped to device u-boot (2016.09+) was loaded from
+if test "${devtype}" = "mmc"; then
+ part uuid mmc ${devnum}:1 partuuid;
+ setenv devnum ${mmc_bootdev}
+ setenv rootdev "/dev/mmcblk${mmc_bootdev}p1"
+fi
 
 echo "Boot script loaded from ${devtype}"
 
@@ -27,54 +40,58 @@ fi
 
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
 if test "${bootlogo}" = "true"; then
  setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
  setenv consoleargs "splash=verbose ${consoleargs}"
 fi
 
-# get PARTUUID of first partition on SD/eMMC it was loaded from
-# mmc 0 is always mapped to device u-boot (2016.09+) was loaded from
-if test "${devtype}" = "mmc"; then part uuid mmc 0:1 partuuid; fi
-
-setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} ubootsource=${devtype} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
 
+if test "${disp_mem_reserves}" = "off"; then setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"; fi
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
 
-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
-fdt addr ${fdt_addr_r}
-fdt resize 65536
-for overlay_file in ${overlays}; do
- if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
- echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
- fdt apply ${load_addr} || setenv overlay_error "true"
- fi
-done
-for overlay_file in ${user_overlays}; do
- if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
- echo "Applying user provided DT overlay ${overlay_file}.dtbo"
- fdt apply ${load_addr} || setenv overlay_error "true"
- fi
-done
-if test "${overlay_error}" = "true"; then
- echo "Error applying DT overlays, restoring original DT"
+load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage
+
+if test -e ${devtype} ${devnum} "${prefix}.next"; then
+ echo "Found mainline kernel configuration"
  load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
-else
- if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-fixup.scr; then
- echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
- source ${load_addr}
- fi
- if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
- load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
- echo "Applying user provided fixup script (fixup.scr)"
- source ${load_addr}
+ fdt addr ${fdt_addr_r}
+ fdt resize 65536
+ for overlay_file in ${overlays}; do
+ if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+ echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+ fdt apply ${load_addr} || setenv overlay_error "true"
+ fi
+ done
+ for overlay_file in ${user_overlays}; do
+ if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+ echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+ fdt apply ${load_addr} || setenv overlay_error "true"
+ fi
+ done
+ if test "${overlay_error}" = "true"; then
+ echo "Error applying DT overlays, restoring original DT"
+ load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+ else
+ if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
+ echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+ source ${load_addr}
+ fi
+ if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
+ load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+ echo "Applying user provided fixup script (fixup.scr)"
+ source ${load_addr}
+ fi
  fi
+ bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+else
+ echo "Found legacy kernel configuration"
+ load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}script.bin
+ bootz ${kernel_addr_r} ${ramdisk_addr_r}
 fi
 
-load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
-load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
-
-booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
-
 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

rebuild

@@ -436,9 +436,14 @@ confirm_version() {
  # Set up the welcome board
  bd_name="${board}"
  # Set Armbian image file parameters
- [[ "${PLATFORM}" == "rockchip" ]] && partition_table_type="gpt"
- [[ "${PLATFORM}" == "allwinner" ]] && partition_table_type="msdos"
- bootfs_type="ext4"
+ [[ "${PLATFORM}" == "rockchip" ]] && {
+ partition_table_type="gpt"
+ bootfs_type="ext4"
+ }
+ [[ "${PLATFORM}" == "allwinner" ]] && {
+ partition_table_type="msdos"
+ bootfs_type="fat32"
+ }
  # Set directory name
  platform_bootfs="${platform_files}/${PLATFORM}/bootfs"
  platform_rootfs="${platform_files}/${PLATFORM}/rootfs"
@@ -515,10 +520,11 @@ make_image() {
  [[ -n "${loop_new}" ]] || error_msg "losetup ${build_image_file} failed."
 
  # Format bootfs partition
- [[ "${PLATFORM}" == "amlogic" ]] && mkfs.vfat -F 32 -n "BOOT" ${loop_new}p1 >/dev/null 2>&1
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && {
+ if [[ "${bootfs_type}" == "fat32" ]]; then
+ mkfs.vfat -F 32 -n "BOOT" ${loop_new}p1 >/dev/null 2>&1
+ else
  mkfs.ext4 -F -q -U ${BOOT_UUID} -L "BOOT" -b 4k -m 0 ${loop_new}p1 >/dev/null 2>&1
- }
+ fi
 
  # Format rootfs partition
  if [[ "${ROOTFS_TYPE}" == "btrfs" ]]; then
@@ -587,7 +593,7 @@ copy_files() {
  mkdir -p ${tag_bootfs} ${tag_rootfs}
 
  # Mount bootfs
- if [[ "${PLATFORM}" == "amlogic" ]]; then
+ if [[ "${bootfs_type}" == "fat32" ]]; then
  mount -t vfat -o discard ${loop_new}p1 ${tag_bootfs}
  else
  mount -t ext4 -o discard ${loop_new}p1 ${tag_bootfs}
@@ -637,15 +643,15 @@ replace_kernel() {
 
  # 01. For /boot five files
  tar -xzf ${kernel_boot} -C ${tag_bootfs}
- [[ "${PLATFORM}" == "amlogic" ]] && (cd ${tag_bootfs} && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} zImage)
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && (cd ${tag_bootfs} && ln -sf uInitrd-${kernel_name} uInitrd && ln -sf vmlinuz-${kernel_name} Image)
+ [[ "${PLATFORM}" == "amlogic" || "${PLATFORM}" == "allwinner" ]] && (cd ${tag_bootfs} && cp -f uInitrd-${kernel_name} uInitrd && cp -f vmlinuz-${kernel_name} zImage)
+ [[ "${PLATFORM}" == "rockchip" ]] && (cd ${tag_bootfs} && ln -sf uInitrd-${kernel_name} uInitrd && ln -sf vmlinuz-${kernel_name} Image)
  [[ "$(ls ${tag_bootfs}/*${kernel_name} -l 2>/dev/null | grep "^-" | wc -l)" -ge "2" ]] || error_msg "The /boot files is missing."
  [[ "${PLATFORM}" == "amlogic" ]] && get_textoffset "${tag_bootfs}/zImage"
 
  # 02. For /boot/dtb/${PLATFORM}/*
  [[ -d "${tag_bootfs}/dtb/${PLATFORM}" ]] || mkdir -p ${tag_bootfs}/dtb/${PLATFORM}
  tar -xzf ${kernel_dtb} -C ${tag_bootfs}/dtb/${PLATFORM}
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && ln -sf dtb ${tag_bootfs}/dtb-${kernel_name}
+ [[ "${PLATFORM}" == "rockchip" ]] && ln -sf dtb ${tag_bootfs}/dtb-${kernel_name}
  [[ "$(ls ${tag_bootfs}/dtb/${PLATFORM} -l 2>/dev/null | grep "^-" | wc -l)" -ge "2" ]] || error_msg "/boot/dtb/${PLATFORM} files is missing."
 
  # 03. For /usr/src/linux-headers-${kernel_name}
@@ -789,7 +795,7 @@ refactor_files() {
  # Edit the etc/fstab
  [[ -f "etc/fstab" ]] || error_msg "The etc/fstab File does not exist."
  sed -i "s|LABEL=ROOTFS.*|UUID=${ROOTFS_UUID} / ${ROOTFS_TYPE} ${fstab_string} 0 1|g" etc/fstab
- [[ "${PLATFORM}" == "rockchip" || "${PLATFORM}" == "allwinner" ]] && {
+ [[ "${PLATFORM}" == "rockchip" ]] && {
  sed -i "s|LABEL=BOOT.*|UUID=${BOOT_UUID} /boot ext4 discard,defaults 0 2|g" etc/fstab
  }