Odroid C2 boot scripts update. It boots into all kernels now ... initrd unresolved in mainline.

config/boards/odroidc2.conf

@@ -8,9 +8,9 @@ MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
-CLI_BETA_TARGET="xenial:default"
+CLI_BETA_TARGET="xenial:next"
 DESKTOP_TARGET="xenial:default"
-DESKTOP_BETA_TARGET="xenial:default"
+DESKTOP_BETA_TARGET="xenial:next"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_default:90"
 #

config/bootscripts/boot-odroid-c2.ini

@@ -110,14 +110,17 @@ setenv maxcpus "4"
 setenv max_freq "1536"  # 1.536GHz
 
 # Default Console Device Setting
-setenv condev "console=ttyS0,115200n8 console=tty0 consoleblank=0"   # on both
+if test -e mmc 0:1 boot/.next; then setenv condev "console=ttyAML0,115200n8"; else setenv condev "console=ttyS0,115200n8 console=tty0"; fi
 
 ###########################################
 setenv verbosity "1"
 
-# Boot Arguments
+# Boot arguments
 setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} no_console_suspend consoleblank=0 hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}"
 
+# Mainline boot arguments
+if test -e mmc 0:1 boot/.next; then setenv bootargs "root=/dev/mmcblk0p1 rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}"; fi
+
 # Booting
 
 setenv loadaddr "0x11000000"
@@ -127,10 +130,13 @@ setenv initrd_loadaddr "0x13000000"
 ext4load mmc 0:1 ${initrd_loadaddr} /boot/uInitrd || fatload mmc 0:1 ${initrd_loadaddr} uInitrd || ext4load mmc 0:1 ${initrd_loadaddr} uInitrd
 ext4load mmc 0:1 ${loadaddr} /boot/zImage || fatload mmc 0:1 ${loadaddr} zImage || ext4load mmc 0:1 ${loadaddr} zImage
 ext4load mmc 0:1 ${dtb_loadaddr} /boot/dtb/meson64_odroidc2.dtb || fatload mmc 0:1 ${dtb_loadaddr} dtb/meson64_odroidc2.dtb || ext4load mmc 0:1 ${dtb_loadaddr} dtb/meson64_odroidc2.dtb
+ext4load mmc 0:1 ${dtb_loadaddr} /boot/dtb/amlogic/meson-gxbb-odroidc2.dtb
 
 fdt addr ${dtb_loadaddr}
 if test "${mesontimer}" = "0"; then fdt rm /meson_timer; fdt rm /cpus/cpu@0/timer; fdt rm /cpus/cpu@1/timer; fdt rm /cpus/cpu@2/timer; fdt rm /cpus/cpu@3/timer; fi
 if test "${mesontimer}" = "1"; then fdt rm /timer; fi
 if test "${nographics}" = "1"; then fdt rm /meson-fb; fdt rm /amhdmitx; fdt rm /picdec; fdt rm /ppmgr; fdt rm /meson-vout; fdt rm /mesonstream; fdt rm /deinterlace; fdt rm /codec_mm; fdt rm /reserved-memory; fdt rm /aocec; fi
 
-booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
+if test -e mmc 0:1 boot/.next; then ext4load mmc 0:1 ${dtb_loadaddr} boot/dtb/amlogic/meson-gxbb-odroidc2.dtb; fi
+if test -e mmc 0:1 boot/.next; then ext4load mmc 0:1 0x01080000 boot/uImage; fi
+if test -e mmc 0:1 boot/.next; then bootm 0x01080000 - ${dtb_loadaddr}; else booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}; fi

patch/kernel/odroidc2-dev/packaging-4.x-odroid.patch

@@ -0,0 +1,14 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 750d70e..8fc16c9 100755
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -267,7 +267,8 @@ mountpoint -q /boot || mount /boot
+ cp /tmp/uImage /boot/uImage
+ rm -f /$installed_image_path
+ else
+-ln -sf $(basename $installed_image_path) /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
++rm -f /boot/zImage;gunzip -c /boot/$(basename $installed_image_path) > /boot/xImage
++mkimage -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 -n "Linux kernel" -d /boot/xImage /boot/uImage; rm -f /boot/xImage
+ fi
+ touch /boot/.next
+ exit 0

patch/kernel/odroidc2-next/packaging-4.x-odroid.patch

@@ -0,0 +1,14 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 750d70e..8fc16c9 100755
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -267,7 +267,8 @@ mountpoint -q /boot || mount /boot
+ cp /tmp/uImage /boot/uImage
+ rm -f /$installed_image_path
+ else
+-ln -sf $(basename $installed_image_path) /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
++rm -f /boot/zImage;gunzip -c /boot/$(basename $installed_image_path) > /boot/xImage
++mkimage -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 -n "Linux kernel" -d /boot/xImage /boot/uImage; rm -f /boot/xImage
+ fi
+ touch /boot/.next
+ exit 0

scripts/c2_init.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# disable for mainline kernel
+[ -f /boot/.next ] && exit
+
 for x in $(cat /proc/cmdline); do
         case ${x} in
                 m_bpp=*) export bpp=${x#*=} ;;