summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2012-09-28 21:17:39 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-09-28 21:34:40 -0600
commit0dd0b691b8c2517792b9937523ab2dda06e23ca7 (patch)
tree4622cd5416faff56a40fe447d32f03a7d988e305
parent0d2efc0998ebe2dc65b38793be275a1c21499c6b (diff)
LINARO: hack dtb fix for 64bit kernel which lacks dtbs target
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/rules.d/arm64.mk2
-rw-r--r--debian/rules.d/2-binary-arch.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/debian.linaro/rules.d/arm64.mk b/debian.linaro/rules.d/arm64.mk
index d42218a894e..c30b57f86cd 100644
--- a/debian.linaro/rules.d/arm64.mk
+++ b/debian.linaro/rules.d/arm64.mk
@@ -11,7 +11,7 @@ no_dumpfile = true
loader = grub
# Flavour specific configuration.
-dtb_file = vexpress-v2p-aarch64.dtb
+dtb_file = arch/arm64/boot/vexpress-v2p-aarch64.dtb
skipmodule = true
skipabi = true
disable_d_i = true
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index a1913359c99..dd9dc26bc50 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -37,7 +37,7 @@ build-%: $(stampdir)/stamp-build-%
# Do the actual build, including image and modules
$(stampdir)/stamp-build-%: target_flavour = $*
-$(stampdir)/stamp-build-%: dtb_target = $(notdir $(dtb_file_$*))
+$(stampdir)/stamp-build-%: dtb_target = $(notdir $(dtb_file))
$(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
@echo Debug: $@
$(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) $(modules_target) $(dtb_target)
@@ -51,8 +51,8 @@ install-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
install-%: basepkg = $(hdrs_pkg_name)
install-%: hdrdir = $(CURDIR)/debian/$(basepkg)-$*/usr/src/$(basepkg)-$*
install-%: target_flavour = $*
-install-%: dtb_file=$(dtb_file_$*)
-install-%: dtb_target=$(notdir $(dtb_file_$*))
+#install-%: dtb_file=$(dtb_file_$*)
+install-%: dtb_target=$(notdir $(dtb_file))
install-%: checks-%
@echo Debug: $@
dh_testdir