summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2013-09-03 11:49:09 -0400
committerKyle McMartin <kmcmarti@redhat.com>2013-09-03 11:49:25 -0400
commit49ba08f01f1bd05991fa29e617fedd778e03a1a5 (patch)
tree2ce03298bc95a2683417b5ffcf6611e18d1eb635
parent7ad7e4c4014b96bb176b000b8be71063cf5fc60f (diff)
downloadkernel-49ba08f01f1bd05991fa29e617fedd778e03a1a5.tar.gz
kernel-49ba08f01f1bd05991fa29e617fedd778e03a1a5.tar.xz
kernel-49ba08f01f1bd05991fa29e617fedd778e03a1a5.zip
[arm64] install dtbs
-rw-r--r--config-arm642
-rw-r--r--kernel.spec12
2 files changed, 10 insertions, 4 deletions
diff --git a/config-arm64 b/config-arm64
index 018246bca..78dd575d1 100644
--- a/config-arm64
+++ b/config-arm64
@@ -82,3 +82,5 @@ CONFIG_VM_EVENT_COUNTERS=y
# weird include chain resulting in missing u64 type
# CONFIG_USB_SPEEDTOUCH is not set
# dma issues in headers
+# CONFIG_PARPORT_PC is not set
+# CONFIG_VGA_CONSOLE is not set
diff --git a/kernel.spec b/kernel.spec
index ac3494964..9beaa3f3c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1595,11 +1595,11 @@ BuildKernel() {
%{make} -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags}
%{make} -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
-%ifarch %{arm}
+%ifarch %{arm} aarch64
%{make} -s ARCH=$Arch V=1 dtbs
mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
- install -m 644 arch/arm/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
- rm -f arch/arm/boot/dts/*.dtb
+ install -m 644 arch/$Arch/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+ rm -f arch/$Arch/boot/dts/*.dtb
%endif
# Start installing the results
@@ -2206,7 +2206,7 @@ fi
%defattr(-,root,root)\
/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:+%{2}}\
/%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:+%{2}}.hmac \
-%ifarch %{arm}\
+%ifarch %{arm} aarch64\
/%{image_install_path}/dtb-%{KVERREL}%{?2:+%{2}} \
%endif\
%attr(600,root,root) /boot/System.map-%{KVERREL}%{?2:+%{2}}\
@@ -2258,6 +2258,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Sep 03 2013 Kyle McMartin <kyle@redhat.com>
+- [arm64] disable VGA_CONSOLE and PARPORT_PC
+- [arm64] install dtb as on %{arm}
+
* Tue Sep 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-1
- Linux v3.11
- Disable debugging options.