Add arm64 packaging

Signed-off-by: John Rigby <john.rigby@linaro.org>

10 files changed, 29 insertions, 4 deletions

diff --git a/debian.linaro/config/arm64/config.common.arm64 b/debian.linaro/config/arm64/config.common.arm64
new file mode 100644
index 00000000000..ad33444716a
--- /dev/null
+++ b/debian.linaro/config/arm64/config.common.arm64
@@ -0,0 +1 @@
+# nothing here yet
diff --git a/debian.linaro/config/arm64/config.flavour.linaro-SOCFLAVOUR b/debian.linaro/config/arm64/config.flavour.linaro-SOCFLAVOUR
new file mode 100644
index 00000000000..ad33444716a
--- /dev/null
+++ b/debian.linaro/config/arm64/config.flavour.linaro-SOCFLAVOUR
@@ -0,0 +1 @@
+# nothing here yet
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index 32db22d4921..1057a0595d6 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -80,7 +80,7 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS
 
 # Ensure CONFIG_VFAT_FS is y for arm, needed to ensure we able to replace
 # a kernel with the same version.  Also needed for EFI based systems.
-(arch armel armhf i386 amd64 &/ value CONFIG_VFAT_FS y) | \
+(arch armel armhf i386 amd64 arm64 &/ value CONFIG_VFAT_FS y) | \
  value CONFIG_VFAT_FS m
 
 # Ensure CONFIG_GPIO_TWL4030 is y for arm, LP:921934
diff --git a/debian.linaro/control.d/vars.linaro-SOCFLAVOUR b/debian.linaro/control.d/vars.linaro-SOCFLAVOUR
index 92158f0f17e..81055110134 100644
--- a/debian.linaro/control.d/vars.linaro-SOCFLAVOUR
+++ b/debian.linaro/control.d/vars.linaro-SOCFLAVOUR
@@ -1,4 +1,4 @@
-arch="armel armhf"
+arch="armel armhf arm64"
 supported="SOCVENDOR SOCFAMILY"
 desc="SOCVENDOR SOCFAMILY-based systems"
 target="Targeted towards boards such as SAMPLEBOARDS, etc."
diff --git a/debian.linaro/control.stub.in b/debian.linaro/control.stub.in
index 6f0140e9b40..bd4b6ce9dd1 100644
--- a/debian.linaro/control.stub.in
+++ b/debian.linaro/control.stub.in
@@ -9,7 +9,7 @@ Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-precise.git
 
 Package: linux-linaro-tools-PKGVER-ABINUM-linaro-SOCFLAVOUR
-Architecture: armel armhf
+Architecture: armel armhf arm64
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
diff --git a/debian.linaro/d-i/kernel-versions.in b/debian.linaro/d-i/kernel-versions.in
index b4134d4d0f3..69f9174c482 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,3 +1,4 @@
 # arch	version		flavour		installedname			suffix	bdep
 armel	PKGVER-ABINUM	linaro-SOCFLAVOUR		PKGVER-ABINUM-linaro-SOCFLAVOUR		-
 armhf	PKGVER-ABINUM	linaro-SOCFLAVOUR		PKGVER-ABINUM-linaro-SOCFLAVOUR		-
+arm64	PKGVER-ABINUM	linaro-SOCFLAVOUR		PKGVER-ABINUM-linaro-SOCFLAVOUR		-
diff --git a/debian.linaro/etc/getabis b/debian.linaro/etc/getabis
index b4db1dd1d0c..c60501ca52b 100644
--- a/debian.linaro/etc/getabis
+++ b/debian.linaro/etc/getabis
@@ -10,6 +10,7 @@ package_prefixes linux-image linux-image-extra
 
 getall armel omap
 getall armhf omap highbank
+getall arm64 vexpress
 getall amd64 generic
 getall i386 generic
 
diff --git a/debian.linaro/etc/kernelconfig b/debian.linaro/etc/kernelconfig
index 2bed5010f50..f6478235984 100644
--- a/debian.linaro/etc/kernelconfig
+++ b/debian.linaro/etc/kernelconfig
@@ -2,6 +2,6 @@ if [ "$variant" = "ports" ]; then
 	archs=""
 	family='ports'
 else
-	archs="armel armhf"
+	archs="armel armhf arm64"
 	family='ubuntu'
 fi
diff --git a/debian.linaro/rules.d/arm64.mk b/debian.linaro/rules.d/arm64.mk
new file mode 100644
index 00000000000..b0f00f5f59b
--- /dev/null
+++ b/debian.linaro/rules.d/arm64.mk
@@ -0,0 +1,20 @@
+human_arch	= ARM64
+build_arch	= arm64
+header_arch	= arm64
+defconfig	= defconfig
+flavours = linaro-SOCFLAVOUR
+build_image	= zImage
+kernel_file	= arch/$(build_arch)/boot/zImage
+install_file	= vmlinuz
+no_dumpfile	= true
+
+loader		= grub
+
+# Flavour specific configuration.
+dtb_file_vexpress	= arch/$(build_arch)/boot/vexpress.dtb
+skipmodule	= true
+skipabi	= true
+disable_d_i	= true
+do_complete_flavour_headers	= true
+do_timestamp_version	= true
+skipconfig	= true
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 48f84a5c96c..b3e2f0eec81 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -51,6 +51,7 @@ for arch in $archs; do
 		lpia)		kernarch="x86" 		;;
 		sparc)		kernarch="sparc64"	;;
 		armel|armhf)	kernarch="arm"		;;
+		arm64)		kernarch="arm64"	;;
 		*)		kernarch="$arch"	;;
 	esac