[kernel/f18] Fix DTB generation on ARM

[Peter Robinson]

commit 6e30b2ba8cd48fddf5e3ea144c23f26cf307be7b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Mar 4 11:46:44 2013 +0000

    Fix DTB generation on ARM

 config-armv7 |    2 +-
 kernel.spec  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-armv7 b/config-armv7
index d59ab36..cc93074 100644
--- a/config-armv7
+++ b/config-armv7
@@ -348,7 +348,7 @@ CONFIG_PINCTRL_SINGLE=m
 
 # GPIO
 CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_EM=m
+# CONFIG_GPIO_EM is not set
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_MCP23S08=m
 CONFIG_POWER_RESET_GPIO=y
diff --git a/kernel.spec b/kernel.spec
index 31360c7..5c5d30b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1604,7 +1604,7 @@ BuildKernel() {
 
     make -s ARCH=$Arch V=1 dtbs
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
-    install -m 644 arch/arm/boot/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+    install -m 644 arch/arm/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
 %else
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
 %endif
@@ -2330,6 +2330,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Mar  4 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Fix DTB generation on ARM
+
 * Fri Mar 01 2013 Dave Jones <davej at redhat.com>
 - Silence "tty is NULL" trace.