Add support for Jetson TX2

Author: alfonsosanchezbeato

.gitignore

@@ -1 +1,2 @@
 /out-tx1/
+/out-tx2/

README.md

@@ -1,7 +1,7 @@
-# Ubuntu Core for Jetson TX1
+# Ubuntu Core for Jetson TX1/TX2
 
 This repository contains scripts to create a tarball with all what is
-needed to flash Ubuntu Core 18 in a Jetson TX1 device.
+needed to flash Ubuntu Core 18 in a Jetson TX1 or TX2 device.
 
 ## Build instructions
 
@@ -15,7 +15,7 @@ instructions in the respective README.md files:
 Once you have created the snaps, you can create an installation tarball
 by running
 
-`./build-core.sh tx1 <snap_account_id> <gadget_snap_file> <kernel_snap_file> [key_name]`
+`./build-core.sh <tx1|tx2> <snap_account_id> <gadget_snap_file> <kernel_snap_file> [key_name]`
 
 The snap account id can be found in your account details in
 <https://dashboard.snapcraft.io>. You will need an Ubuntu One account
@@ -25,7 +25,7 @@ able to create a model for the device. The key name parameter is
 necessary only if different from `default`.
 
 After building, you will find a file named
-`out-tx1/core-18-jetson-tx1.tar.xz` that contains instructions and all
+`out-tx1/core-18-jetson-<tx1|tx2>.tar.xz` that contains instructions and all
 needed files to flash UC18 into the device.
 
 You can also download the latest tarball from the [releases tab](

build-core.sh

@@ -71,13 +71,19 @@ ubuntu-image snap --output-dir "$outdir" --workdir "$outdir" \
 # Generate tarball with all the needed parts for flashing
 final_tree="$outdir"/final_tree
 bootloader_dir="$final_tree"/bootloader
-u_boot_dir="$bootloader_dir"/t210ref/p2371-2180
+if [ "$board" = tx1 ]; then
+    u_boot_dir="$bootloader_dir"/t210ref/p2371-2180
+    writable_part=18
+else
+    u_boot_dir="$bootloader_dir"/t186ref/p2771-0000/500
+    writable_part=30
+fi
 mkdir -p "$u_boot_dir"
 cp "$outdir"/unpack/gadget/u-boot.bin "$u_boot_dir"
 cp "$outdir"/volumes/jetson/part0.img "$bootloader_dir"/system.img
-cp "$outdir"/volumes/jetson/part18.img "$bootloader_dir"/system-data.ext4
-cp tarball-parts/* "$final_tree"
+cp "$outdir"/volumes/jetson/part"$writable_part".img "$bootloader_dir"/system-data.ext4
+cp tarball-parts/"$board"/* "$final_tree"
 pushd .
 cd "$final_tree"
-tar -cJf ../core-18-jetson-"$board".tar.xz *
+tar -cJf ../core-18-jetson-"$board".tar.xz -- *
 popd

tarball-parts/README.md renamed to tarball-parts/tx1/README.md

@@ -0,0 +1,25 @@
+# Intructions for flashing Ubuntu Core 18 in Jetson TX2
+
+Download and extract the 32.1 L4T release from nvidia:
+
+```
+wget https://developer.nvidia.com/embedded/dlc/l4t-jetson-driver-package-32-1-JAX-TX2 \
+     -O JAX-TX2-Jetson_Linux_R32.1.0_aarch64.tbz2
+tar xf JAX-TX2-Jetson_Linux_R32.1.0_aarch64.tbz2
+```
+
+Extract the UC tarball inside the L4T directory and apply the
+necessary patches:
+
+```
+cd Linux_for_Tegra
+tar xvf <path_to_tarball>/core-18-jetson-tx2.tar.xz
+patch -p1 < p2771-0000.conf.common.patch
+patch -p1 < flash_l4t_t186.xml.patch
+```
+
+Then, put the device in [recovery mode](https://docs.nvidia.com/jetson/archives/l4t-archived/l4t-321/index.html#page/Tegra%2520Linux%2520Driver%2520Package%2520Development%2520Guide%2Fflashing.html)
+and flash it. The only difference with normal flashing is that you need
+to use the `'-r'` flag to avoid creating a new system image:
+
+`sudo ./flash.sh -r jetson-tx2 mmcblk0p1`

tarball-parts/gnu_linux_tegraboot_emmc_full.xml.patch renamed to tarball-parts/tx1/gnu_linux_tegraboot_emmc_full.xml.patch

@@ -0,0 +1,10 @@
+--- a/bootloader/t186ref/cfg/flash_l4t_t186.xml	2019-03-27 13:43:33.172843137 +0100
++++ b/bootloader/t186ref/cfg/flash_l4t_t186.xml	2019-03-27 13:46:23.119618269 +0100
+@@ -449,6 +449,7 @@
+             <file_system_attribute> 0 </file_system_attribute>
+             <allocation_attribute> 0x808 </allocation_attribute>
+             <percent_reserved> 0 </percent_reserved>
++            <filename> system-data.ext4 </filename>
+         </partition>
+         <partition name="secondary_gpt" type="secondary_gpt">
+             <allocation_policy> sequential </allocation_policy>

tarball-parts/p2371-2180-devkit.conf.patch renamed to tarball-parts/tx1/p2371-2180-devkit.conf.patch

@@ -0,0 +1,11 @@
+--- a/p2771-0000.conf.common	2019-03-27 13:50:19.427467184 +0100
++++ b/p2771-0000.conf.common	2019-03-28 11:54:31.556401208 +0100
+@@ -228,7 +228,7 @@
+ if [ -z "${USE_UBOOT}" ]; then
+ 	USE_UBOOT=1;
+ fi;
+-ROOTFSSIZE=28GiB;
++ROOTFSSIZE=67108864;
+ CMDLINE_ADD="console=ttyS0,115200n8 console=tty0 fbcon=map:0 net.ifnames=0";
+ target_board="t186ref";
+ ROOT_DEV="mmcblk0p12 ------------ internal eMMC.