Merge ~fisterra-team/fisterra/+git/nitrogen6x-gadget:18-classic into ~fisterra-team/fisterra/+git/nitrogen6x-gadget:18-classic-mp

[ethan.hsieh]

[Łukasz Zemczak (sil2100)]

I am slightly confused here.

First of all, and this regards both this 18-classic and the 18 branch of the gadget tree, but I was wondering if it was really needed to have different code for classic and core?
So currently we do something like that for the pi3, but this is a left-over from the times where the snappy team was working on the gadgets. Ideally we'd want to have one repository and branch for both core and classic. Meaning, one gadget code that could be built with `make` (or `snapcraft prime`) to get a compiled gadget tree to be used for building a classic image and, in the same way, just running `snapcraft` to build a gadget snap to be used for core. Currently we have those two separate branches because we're still working on 'integrating' those two into one code-base. It's a bit difficult with pi3 because we already have users using the old gadget snaps, and due to some design decisions, switching both core and classic to one common gadget requires some migration effort.

But for new platforms, I would prefer if we could do it the 'right way' and have just one gadget repository that would work for both core and classic cases. Would that be possible?

Also, it feels to me that these branches might be missing something! So for instance for a 'classic' gadget tree, I would expect to find a Makefile. In the best case I would like to see both the core and classic gadget code to provide a Makefile and use it to pull all the needed packages from the archives and install them in the right places. But this branch for instance has no Makefile. The snapcraft.yaml doesn't seem to have the 'gadget' target here for instance.

So basically, in the perfect scenario, we would want to have one gadget repository/branch that would work and have all that's needed for core and classic. Once one pulls the branch, as mentioned earlier, a `snapcraft` call on it should create a working snap and, for now, a call to `make` should result in a built gadget tree for ubuntu-image to consume. Basically `snapcraft` should use the Makefile as well + some additional steps that would be needed to get the snap prepared.
I understand the biggest challenge might be having one bootscript (uboot.env or boot.scr) that would support both core and classic. Dave from our team is working on that for pi3, so best if you could poke him for some advice. If it's not easily possible for some reason, I guess we could provide both boot.scr and uboot.env in the gadget repository and then just decide which one to use depending whether snapcraft is run or not.

review: Needs Information

[jeremyszu (os369510)]

Hi Lukasz,

As previous talk with Dave on IRC, Dave plans to send a PR for integrating pi3 gadge snap to https://github.com/snapcore/pi3-gadget recently. We are integrating the uboot script first and waiting for Dave's PR as the reference method to improve this merge proposal.

[jeremyszu (os369510)]

Hi Lukasz, Dave,

Hope everything is well with you.
I'm working on integrating gadget snap.
I have a question that is why the boot file only supports 'uboot.env' if bootloader is uboot?
(https://github.com/snapcore/snapd/blob/3e442d10db595c15400c9b574318ed700d5ad4cf/bootloader/uboot.go#L64)
For instance, the gadget snap of classic is use 'boot.scr' as boot script and I would like to use 'boot.scr' for both classic and core, but it will fail on core because of missing kernel arguments (snap_core, snap_kernel and snap_menuentry).

c110be1... by jeremyszu on 2019-09-27

Integrate gadget for both classic and core

1. For Classic,
1.1. Require parts:
      - uboot-fw # Uboot firmware
      - uboot-bootscript # Boot script
      - cloud-init-configs # Cloud-init configs
      - devicetrees # Device tree
2. For Core,
2.1. Require parts:
      - uboot-fw # Uboot firmware
      - uboot-env # Uboot environment
3. gadget.yaml is compitable for both core and classic
4. boot.scr.in should be compitable for both core and classic if required
    snap_* kernel arguments could be added in uboot.env (even if
    uboot.env.in doesn't exist) or boot.scr.in.
5. snap.yaml was be generated manually.
6. snapcraft.yaml describes all parts those are both classic and core needed
    and the build.sh will build their corresponding required parts by
    giving --classic or --core.

[Łukasz Zemczak (sil2100)]

Hey Jeremy! I have sent the link of this MP to Dave so that he can review it as well. Dave might be able to answer your question regarding using boot.scr for both core and classic. Ideally we'd just want to have boot.scr doing all the work, without the need for uboot.env, but from what I remember there's still something that needs to be changed in snapd to make this transition possible. Anyway, hopefully Dave will provide more input.

In the meantime, I'll review the current state of the MP shortly.

[Dave Jones (waveform)]

Just a few possible comments on the boot scripts; I can add more detail on the core/classic boot script situation but have to dash out right now - will reply further when I'm back!

review: Needs Fixing

[Dave Jones (waveform)]

> I have a question that is why the boot file only supports 'uboot.env' if
> bootloader is uboot?
> (https://github.com/snapcore/snapd/blob/3e442d10db595c15400c9b574318ed700d5ad4
> cf/bootloader/uboot.go#L64)
> For instance, the gadget snap of classic is use 'boot.scr' as boot script and
> I would like to use 'boot.scr' for both classic and core, but it will fail on
> core because of missing kernel arguments (snap_core, snap_kernel and
> snap_menuentry).

Good question: at present, the A/B boot support in snapd only supports the uboot.env style of boot script, not boot.scr. Hence Core images must use uboot.env, while Classic images can use either style. However, we'd generally prefer Classic use the boot.scr style as firstly that's what Debian upstream use exclusively and what Ubuntu uses for the vast majority of its boot scripts (on Classic).

Ideally, we want to update snapd (during the Core 20 cycle) to support the boot.scr style so that we can move the Core over to using the boot.scr style. This is partially because we'd like to merge the Core and Classic gadgets, but also because I'm uncomfortable with the way the A/B support with uboot is handled (the environment rewrites itself during the boot sequence and I'd much rather have a static boot script with a separate mutable state file). The theoretical boot script would detect whether it's booting a Core or Classic image (most likely by looking for the existence of the aforementioned A/B boot state), and act accordingly (using snap_core et al in the Core case and a fixed boot sequence in the Classic case).

I've got a prototype of this that theoretically works for the Pi, but it's largely untested (and probably won't get any serious attention until we look at the required snapd changes).

Anyway, for the time being I'm afraid that means you've got a choice with regards to this gadget snap:

1) Have a uboot.env script for the Core build, and a boot.scr script for the Classic build. Annoying as this is, this is the option I'd currently pick (and have picked for the pi images).

2) Have a uboot.env script for both Core and Classic. While this might seem easier *now*, I'd advise against this as it'll just mean more work when we start looking at snapd's A/B boot configuration.

f577e60... by jeremyszu on 2019-10-04

Remove unnecessary variables

1. Correct the source of uboot-imx in Makefile
2. Remove vendor specific variables from boot.scr.in due to this gadget
snap should focus on supporting iMAX6.
3. Correct some typo and unnecessary parameters.

[jeremyszu (os369510)]

Hi Dave,

> Ideally, we want to update snapd (during the Core 20 cycle) to support the boot.scr style so that we can move the Core over to using the boot.scr style.
Good news!

> also because I'm uncomfortable with the way the A/B support with uboot is handled (the environment rewrites itself during the boot sequence and I'd much rather have a static boot script with a separate mutable state file).
Yes, that's what I prefer also.
Thus, the boot.scr.in as this MP is designed for both Core and Classic. It *should* works but not yet to test because snapd only supports appending related kernel arguments in "uboot.env.in" (the kernel arguments won't be appended if file not found).

> The theoretical boot script would detect whether it's booting a Core or Classic image
Could you please share more details about how did you implemented it?
I used an ugly condition as "if test -e ${devtype} ${devnum}:2 /boot/${initrd_image}; then" line#124 in "boot.scr.in".

> 1) Have a uboot.env script for the Core build, and a boot.scr script for the Classic build. Annoying as this is, this is the option I'd currently pick (and have picked for the pi images).
Yes, that is what I did as this MP. (I handled both case separately in snapcrafy.yaml)

However, I remove some unnecessary parts as you commented before.
Please kindly to help to review it.
Many thanks!

[ethan.hsieh (ethan.hsieh)]

review: Needs Resubmitting

[Dave Jones (waveform)]

> > The theoretical boot script would detect whether it's booting a Core or
> Classic image
> Could you please share more details about how did you implemented it?
> I used an ugly condition as "if test -e ${devtype} ${devnum}:2
> /boot/${initrd_image}; then" line#124 in "boot.scr.in".

I'm afraid my method is about as elegant :). Though, instead of testing for the initrd.img I instead test for the existence of my (not-yet-implemented) boot.dat file which (theoretically) holds the boot state (snappy_kernel etc). If that file exists, it goes the Core route, reading that file and re-writing it accordingly, otherwise it goes the Classic route and just boots vmlinuz (after optional gunzipping).

> > 1) Have a uboot.env script for the Core build, and a boot.scr script for the
> Classic build. Annoying as this is, this is the option I'd currently pick (and
> have picked for the pi images).
> Yes, that is what I did as this MP. (I handled both case separately in
> snapcrafy.yaml)

Sorry I didn't get to this last night - will take a look now!

[Dave Jones (waveform)]

The code looks much better, no major objections from me on that. However, I did attempt to prime the gadget as a quick experiment and it wound up throwing an error regarding conflicting boot.scr outputs; more detail in the diff comment below.

review: Needs Fixing

[jeremyszu (os369510)]

Hi Dave,

For your error, I comment it below.
It seems like your test command is 'sudo snapcraft --target-arch armhf prime'.

For currently design, I use a script to build it separately as README mentioned.
If we don't want to separate the build method for both classic and core then we will need to put everything in one gadget snap together.
(such as cloud-init config and device-tree (device-tree provided by kernel for core) )

I'd leave it as a open question and would like to know your opinion about that.

[Dave Jones (waveform)]

Sorry, I'd managed to completely miss the README (too used to dealing with the Pi's images)! The solution for dealing with the disparity between the core and classic images sounds good (for now, as you note; in future once snapd supports boot scripts we can move them closer and potentially remove the requirement to specify a particular part).

Anyway, that resolves the last query I had, so thumbs up from me!

review: Approve

3895908... by ethan.hsieh on 2020-01-03

Add necessary variables

[ethan.hsieh (ethan.hsieh)]

initrd_high and fdt_high are required for booting
Add initrd_high into boot.scr.in and uboot.env.in.

9a1c073... by jeremyszu on 2020-06-16

fix build fail when using snapcraft from snap repo

1c8a737... by jeremyszu on 2020-06-16

fix warning from shellcheck

1a6382b... by jeremyszu on 2020-06-17

correct args as an array

Unmerged commits

1a6382b... by jeremyszu on 2020-06-17

correct args as an array

1c8a737... by jeremyszu on 2020-06-16

fix warning from shellcheck

9a1c073... by jeremyszu on 2020-06-16

fix build fail when using snapcraft from snap repo

3895908... by ethan.hsieh on 2020-01-03

Add necessary variables

f577e60... by jeremyszu on 2019-10-04

Remove unnecessary variables

1. Correct the source of uboot-imx in Makefile
2. Remove vendor specific variables from boot.scr.in due to this gadget
snap should focus on supporting iMAX6.
3. Correct some typo and unnecessary parameters.

c110be1... by jeremyszu on 2019-09-27

Integrate gadget for both classic and core

1. For Classic,
1.1. Require parts:
      - uboot-fw # Uboot firmware
      - uboot-bootscript # Boot script
      - cloud-init-configs # Cloud-init configs
      - devicetrees # Device tree
2. For Core,
2.1. Require parts:
      - uboot-fw # Uboot firmware
      - uboot-env # Uboot environment
3. gadget.yaml is compitable for both core and classic
4. boot.scr.in should be compitable for both core and classic if required
    snap_* kernel arguments could be added in uboot.env (even if
    uboot.env.in doesn't exist) or boot.scr.in.
5. snap.yaml was be generated manually.
6. snapcraft.yaml describes all parts those are both classic and core needed
    and the build.sh will build their corresponding required parts by
    giving --classic or --core.

3423f93... by ethan.hsieh on 2019-08-09

Init commit

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0de6317
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,47 @@
+STAGEDIR := $(CURDIR)/stage
+DESTDIR := $(CURDIR)/install
+
+ARCH ?= $(shell dpkg --print-architecture)
+UBOOT_TARGET := 'nitrogen6q2g'
+UBOOT_BIN := 'u-boot.imx'
+
+SOURCES_HOST ?= "/etc/apt/sources.list"
+SOURCES_MULTIVERSE := "$(STAGEDIR)/apt/uboot-imx.sources.list"
+
+define stage_package
+	(cd $(2)/debs && apt-get download -o Dir::Etc::sourcelist=$(SOURCES_MULTIVERSE) -oAPT::Architecture=$(3) $(1);)
+	dpkg-deb --vextract $$(ls $(2)/debs/$(1)*.deb | tail -1) $(2)/unpack
+endef
+
+preparation:
+	# The only supported architecture is armhf
+	if [ "$(ARCH)" != "armhf" ] ; then \
+		echo "Build architecture is not supported."; \
+		exit 1; \
+	fi
+	mkdir -p $(STAGEDIR) $(DESTDIR)
+uboot-env: clean preparation uboot.env.in
+	cp uboot.env.in $(STAGEDIR)/
+	mkenvimage -r -s 131072 -o $(STAGEDIR)/uboot.env $(STAGEDIR)/uboot.env.in
+	make uboot-env-install
+uboot-fw: clean preparation
+	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3850E699B57D9F62
+	# Prepare working directories
+	mkdir -p $(STAGEDIR)/apt $(STAGEDIR)/debs $(STAGEDIR)/unpack
+	cp $(SOURCES_HOST) $(SOURCES_MULTIVERSE)
+	# Download u-boot package
+	apt-get update -o Dir::Etc::sourcelist=$(SOURCES_MULTIVERSE) -oAPT::Architecture=$(ARCH) 2>/dev/null
+	# Extract u-boot
+	$(call stage_package,u-boot-imx,$(STAGEDIR),$(ARCH))
+	# Staging stage
+	mkdir -p $(DESTDIR)/boot-assets
+	make uboot-fw-install
+
+uboot-env-install:
+	cp $(STAGEDIR)/uboot.env $(DESTDIR)
+uboot-fw-install:
+	cp $(STAGEDIR)/unpack/usr/lib/u-boot/$(UBOOT_TARGET)/$(UBOOT_BIN) $(DESTDIR)/boot-assets/$(UBOOT_BIN)
+
+clean:
+	rm -rf $(DESTDIR)
+	rm -rf $(STAGEDIR)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..068098e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,40 @@
+# Nitrogen6x Gadget Tree
+
+This repository contains the source for an Ubuntu classic gadget tree for the Nitrogen6x.
+
+Building it follow 'Building' section will automatically pull all the required
+binaries from the Ubuntu archive and stage it to a directory for ubuntu-image
+to consume.
+
+## Gadget Snaps
+
+Gadget snaps are a special type of snaps that contain device specific support
+code and data. You can read more about them in the snapd wiki
+https://github.com/snapcore/snapd/wiki/Gadget-snap
+
+## Gadget Trees
+
+Gadget trees are nothing more than gadget snaps before they have been packed
+into a snap. These compiled gadget trees are used by ubuntu-image in the classic
+mode when a classic image is to be built using this tool.
+
+## Reporting Issues
+
+Please report all issues on the Launchpad project page
+https://bugs.launchpad.net/snap-imx/+filebug
+
+We use Launchpad to track issues as this allows us to coordinate multiple
+projects better than what is available with Github issues.
+
+## Building
+
+To build the gadget tree, please use:
+`bash build.sh --core` for building gadget snap for core
+or
+`bash build.sh --classic` for building gadget snap for classic
+
+## Launchpad Mirror.
+
+All commits from the master branch of https://github.com/CanonicalLtd/imx are
+automatically mirrored by Launchpad to the https://launchpad.net/snap-imx
+project.
diff --git a/boot.scr.in b/boot.scr.in
new file mode 100644
index 0000000..6377e5b
--- /dev/null
+++ b/boot.scr.in
@@ -0,0 +1,81 @@
+# Load default boot configuration
+setenv bootargs ''
+setenv initrd_high 0xffffffff
+setenv a_base 0x10000000
+setenv console ttymxc1
+setenv fdt_file imx6q-nitrogen6x.dtb
+setenv initrd_image initrd.img
+setenv kernel_image vmlinuz
+setenv bootcommand bootz
+setenv distro_bootpart 1
+setenv devnum_mmcblk 1
+setenv devtype mmc
+setenv devnum 0
+
+setexpr a_kernel  ${a_base} + 0x00800000
+setexpr a_fdt     ${a_base} + 0x03000000
+setexpr a_initrd  ${a_base} + 0x03a00000
+
+# Setup files path
+if test -e ${devtype} ${devnum}:2 /boot/${initrd_image}; then
+    setenv distro_rootfs 2
+    setexpr b0 ${distro_rootfs} % 0x0a
+    setexpr b1 ${distro_rootfs} / 0x0a
+    setexpr bpart ${b1} * 0x10
+    setexpr bpart ${bpart} + ${b0}
+    setenv kernel_image vmlinuz
+    setenv loadkernel load ${devtype} ${devnum}:${distro_rootfs} ${a_kernel} /boot/${kernel_image}
+    setenv loadinitrd load ${devtype} ${devnum}:${distro_rootfs} ${a_initrd} /boot/${initrd_image}
+    setenv loadfdt load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} /dtbs/${fdt_file}
+    setenv mmcroot "/dev/mmcblk${devnum_mmcblk}p${bpart}"
+else
+    setenv distro_rootfs 1
+    setenv kernel_image kernel.img
+    setenv loadkernel fatload ${devtype} ${devnum}:${distro_rootfs} ${a_kernel} ${snap_kernel}/${kernel_image}
+    setenv loadinitrd fatload ${devtype} ${devnum}:${distro_rootfs} ${a_initrd} ${snap_kernel}/${initrd_image}
+    setenv loadfdt fatload ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${snap_kernel}/dtbs/${fdt_file}
+    setenv snappy_cmdline rng_core.default_quality=700 net.ifnames=0 init=/lib/systemd/systemd ro panic=-1 fixrtc usbcore.autosuspend=-1
+    setenv mmcroot "/dev/disk/by-label/writable ${snappy_cmdline} snap_core=${snap_core} snap_kernel=${snap_kernel}"
+    if test "${snap_mode}" = "try"; then
+        setenv snap_mode "trying"
+        saveenv
+        if test "${snap_try_core}" != ""; then
+            setenv snap_core "${snap_try_core}"
+        fi
+        if test "${snap_try_kernel}" != ""; then
+            setenv snap_kernel "${snap_try_kernel}"
+        fi
+    elif test "${snap_mode}" = "trying"; then
+        setenv snap_mode ""
+        saveenv
+    fi
+fi
+
+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc root=${mmcroot} clk_ignore_unused"
+
+echo "Trying to load ${fdt_file}.."
+if run loadfdt; then
+	fdt addr ${a_fdt}
+	setenv fdt_high 0xffffffff
+else
+	echo "Error: Failed to load ${fdt_file}"
+	exit
+fi
+
+echo "Trying to load ${initrd_image}.."
+if run loadinitrd; then
+	setenv initrd_size ${filesize}
+else
+	echo "Error: Failed to load ${initrd_image}"
+	exit
+fi
+
+echo "Trying to load ${kernel_image}.."
+if run loadkernel; then
+    echo "Loading file successful."
+else
+    echo "Error: Failed to load ${kernel_image}"
+    exit
+fi
+
+${bootcommand} ${a_kernel} ${a_initrd}:${initrd_size} ${a_fdt}
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..9d99ac2
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+# Copyright (C) 2019 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+usage()
+{
+	echo "Please use either --core or --classic"
+	exit 255
+}
+
+core=""
+classic=""
+parts=()
+args=(--target-arch armhf)
+while [ -n "$1" ]; do
+    case "$1" in
+        --core)
+			core="yes"
+			parts=(core-meta)
+            shift 1;;
+        --classic)
+			classic="yes"
+			parts=(classic-meta)
+            shift 1;;
+        *) 
+			usage;;
+    esac
+done
+
+set -x
+
+if [ "$(systemd-detect-virt)" != "none" ]; then
+	destructive_mode="--destructive-mode"
+else
+	destructive_mode=""
+fi
+
+if [ -z "${core}" ] && [ -z "${classic}" ]; then
+	usage
+elif [ -n "${core}" ] && [ -n "${classic}" ]; then
+	usage
+fi
+sudo snapcraft clean "${destructive_mode}"
+sudo snapcraft "${args[@]}" prime "${parts[@]}" "${destructive_mode}"
+sudo snapcraft "${args[@]}" pack prime
diff --git a/configs/meta-data b/configs/meta-data
new file mode 100644
index 0000000..e19f347
--- /dev/null
+++ b/configs/meta-data
@@ -0,0 +1 @@
+instance_id: cloud-image
diff --git a/configs/network-config b/configs/network-config
new file mode 100644
index 0000000..3570789
--- /dev/null
+++ b/configs/network-config
@@ -0,0 +1,5 @@
+version: 2
+ethernets:
+    eth0:
+        dhcp4: true
+        optional: true
diff --git a/configs/user-data b/configs/user-data
new file mode 100644
index 0000000..8490d04
--- /dev/null
+++ b/configs/user-data
@@ -0,0 +1,4 @@
+#cloud-config
+password: ubuntu
+chpasswd: ubuntu
+ssh_pwauth: True
diff --git a/gadget.yaml b/gadget.yaml
new file mode 100644
index 0000000..86de078
--- /dev/null
+++ b/gadget.yaml
@@ -0,0 +1,31 @@
+device-tree-origin: kernel
+device-tree: imx6q-nitrogen6x.dtb
+volumes:
+  nitrogen6x:
+    schema: mbr
+    bootloader: u-boot
+    structure:
+      - type: 0C
+        filesystem: vfat
+        filesystem-label: system-boot
+        size: 256M
+        content:
+          - source: boot-assets/
+            target: /
+          - source: boot.scr
+            target: boot.scr
+          - source: configs/
+            target: /
+      - type: 83
+        filesystem: ext4
+        filesystem-label: writable
+        size: 512M
+        role: system-data
+  u-boot-nitrogen6x:
+    structure:
+      - name: u-boot
+        type: bare
+        size: 786432
+        offset: 1024
+        content:
+          - image: boot-assets/u-boot.imx
diff --git a/helpers/sources.list.cross b/helpers/sources.list.cross
new file mode 100644
index 0000000..9a3d575
--- /dev/null
+++ b/helpers/sources.list.cross
@@ -0,0 +1,8 @@
+deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe multiverse restricted
+deb-src [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic main universe multiverse restricted
+deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe multiverse restricted
+deb-src [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe multiverse restricted
+deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main universe multiverse restricted
+deb-src [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main universe multiverse restricted
+deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-proposed main universe multiverse restricted
+deb-src [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic-proposed main universe multiverse restricted
diff --git a/helpers/sources.list.ppa b/helpers/sources.list.ppa
new file mode 100644
index 0000000..e60381e
--- /dev/null
+++ b/helpers/sources.list.ppa
@@ -0,0 +1,2 @@
+deb [arch=armhf] http://ppa.launchpad.net/shrirang-bagul/hwe/ubuntu bionic main
+deb-src [arch=armhf] http://ppa.launchpad.net/shrirang-bagul/hwe/ubuntu bionic main
diff --git a/snap.yaml b/snap.yaml
new file mode 100644
index 0000000..ff227ee
--- /dev/null
+++ b/snap.yaml
@@ -0,0 +1,12 @@
+name: nitrogen6x
+version: 18
+summary: Nitrogen6x support package
+description: 'Support files for booting Boundary devices Nitrogen6x
+
+  '
+type: gadget
+base: core18
+architectures:
+- armhf
+confinement: strict
+grade: stable
diff --git a/snap/gui/icon.png b/snap/gui/icon.png
new file mode 100644
index 0000000..6aa523a
Binary files /dev/null and b/snap/gui/icon.png differ
diff --git a/snap/hooks/configure b/snap/hooks/configure
new file mode 100755
index 0000000..38371e1
--- /dev/null
+++ b/snap/hooks/configure
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+# do nothing for now
diff --git a/snapcraft.yaml b/snapcraft.yaml
new file mode 100644
index 0000000..16bd3cf
--- /dev/null
+++ b/snapcraft.yaml
@@ -0,0 +1,97 @@
+name: nitrogen6x
+version: "18"
+summary: Nitrogen6x support package
+description: |
+ Support files for booting Boundary devices Nitrogen6x
+type: gadget
+base: core18
+architectures:
+  - armhf
+confinement: strict
+grade: stable
+parts:
+  core-meta:
+    plugin: nil
+    source: .
+    after:
+      - uboot-fw
+      - uboot-env
+    override-build: |
+      mkdir $SNAPCRAFT_PART_INSTALL/configs
+      mkdir $SNAPCRAFT_PART_INSTALL/boot-assets
+      touch $SNAPCRAFT_PART_INSTALL/boot.scr
+      mkdir -p $SNAPCRAFT_PART_INSTALL/meta
+      cp gadget.yaml $SNAPCRAFT_PART_INSTALL/meta
+      cp snap.yaml $SNAPCRAFT_PART_INSTALL/meta
+  classic-meta:
+    plugin: nil
+    source: .
+    after:
+      - uboot-fw
+      - uboot-bootscript
+      - cloud-init-configs
+      - devicetrees
+    override-build: |
+      mkdir -p $SNAPCRAFT_PART_INSTALL/meta
+      cp gadget.yaml $SNAPCRAFT_PART_INSTALL/meta
+      cp snap.yaml $SNAPCRAFT_PART_INSTALL/meta
+  cloud-init-configs:
+    plugin: nil
+    override-build: |
+      cp -a configs -r $SNAPCRAFT_PART_INSTALL/
+  uboot-bootscript:
+    plugin: nil
+    override-build: |
+      mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" -d boot.scr.in $SNAPCRAFT_PART_INSTALL/boot.scr
+    build-packages:
+      - u-boot-tools
+  uboot-env:
+    source: .
+    plugin: nil
+    override-build: |
+      fakeroot make ARCH=$(dpkg-architecture -t$SNAPCRAFT_ARCH_TRIPLET -qDEB_HOST_ARCH) \
+        uboot-env
+      cp -a install/* $SNAPCRAFT_PART_INSTALL/
+    override-prime: |
+      snapcraftctl prime
+      ln -s uboot.env uboot.conf
+    build-packages:
+      - u-boot-tools
+      - fakeroot
+      - dpkg-dev
+  uboot-fw:
+    source: .
+    plugin: nil
+    override-build: |
+      use_test_ppa="true"
+      if [ "$(arch)" = "x86_64" ]; then
+        echo "Cross-compilation detected, using pre-defined sources.list."
+        OPTIONAL_ARGUMENTS="SOURCES_HOST=\"./helpers/sources.list.cross\""
+      fi
+      if [ ! -z "$use_test_ppa" ]; then
+        echo "Use test ppa for u-boot-imx package using pre-defined sources.list.ppa"
+        OPTIONAL_ARGUMENTS="SOURCES_HOST=\"./helpers/sources.list.ppa\""
+      fi
+      fakeroot make ARCH=$(dpkg-architecture -t$SNAPCRAFT_ARCH_TRIPLET -qDEB_HOST_ARCH) \
+        ${OPTIONAL_ARGUMENTS:-} uboot-fw
+      cp -a install/* $SNAPCRAFT_PART_INSTALL/
+    build-packages:
+      - fakeroot
+      - dpkg-dev
+  devicetrees:
+    plugin: nil
+    source: .
+    override-build: |
+      PACKAGES="http://ports.ubuntu.com/ubuntu-ports/dists/bionic-updates/main/binary-armhf/Packages.gz"
+      PKGPATH="$(wget -q -O- $PACKAGES|zcat|grep Filename |\
+        grep linux-modules-4.15 | grep -ve lpae|tail -1| sed 's/^Filename: //')"
+      wget http://ports.ubuntu.com/ubuntu-ports/$PKGPATH
+      dpkg -x $(basename $PKGPATH) unpack/
+      mkdir -p $SNAPCRAFT_PART_INSTALL/boot-assets/dtbs
+      cp -a unpack/lib/firmware/*/device-tree/imx6q-nitrogen6* $SNAPCRAFT_PART_INSTALL/boot-assets/dtbs
+      rm -rf unpack
+    build-packages:
+      - coreutils
+      - dctrl-tools
+      - sed
+      - wget
diff --git a/uboot.env.in b/uboot.env.in
new file mode 100644
index 0000000..08e5070
--- /dev/null
+++ b/uboot.env.in
@@ -0,0 +1,24 @@
+arch=arm
+baudrate=115200
+stderr=serial,lcd
+stdin=serial,usbkbd
+stdout=serial,lcd
+fdt_file=imx6q-nitrogen6x.dtb
+kernel_file=kernel.img
+initrd_file=initrd.img
+fdt_addr_r=0x13000000
+kernel_addr_r=0x10800000
+ramdisk_addr_r=0x13800000
+initrd_addr_r=0x13a00000
+initrd_high=0xffffffff
+fdt_high=0xffffffff
+loadfdt=fatload mmc 0:1 ${fdt_addr_r} ${snap_kernel}/dtbs/${fdt_file}
+loadfiles=run loadkernel; run loadinitrd; run loadfdt
+loadinitrd=fatload mmc 0:1 ${initrd_addr_r} ${snap_kernel}/${initrd_file}; setenv initrd_size ${filesize}
+loadkernel=fatload mmc 0:1 ${kernel_addr_r} ${snap_kernel}/${kernel_file}
+snappy_boot=if test "${snap_mode}" = "try"; then setenv snap_mode "trying"; saveenv; if test "${snap_try_core}" != ""; then setenv snap_core "${snap_try_core}"; fi; if test "${snap_try_kernel}" != ""; then setenv snap_kernel "${snap_try_kernel}"; fi; elif test "${snap_mode}" = "trying"; then setenv snap_mode ""; saveenv; fi; run loadfiles; setenv mmcroot "/dev/disk/by-label/writable ${snappy_cmdline} snap_core=${snap_core} snap_kernel=${snap_kernel}"; run mmcargs; bootz ${kernel_addr_r} ${initrd_addr_r}:${initrd_size} ${fdt_addr_r}
+snappy_cmdline=rng_core.default_quality=700 net.ifnames=0 init=/lib/systemd/systemd ro panic=-1 fixrtc usbcore.autosuspend=-1
+mmcargs=setenv bootargs "console=ttymxc1,115200 consoleblank=0 clk_ignore_unused root=${mmcroot}"
+snappy_mode=
+uenvcmd=echo ENVCMD; run snappy_boot
+bootcmd=run uenvcmd