summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-10-10 15:35:10 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-10-10 15:35:10 -0700
commitda8efd59dbeb7d3912641d1543af457d14cdf5e3 (patch)
tree5d882e76be606fc44e991ead2c32bb1c59664eac
parent9ed1be95a86f61628e229adf7c7733730a25f11d (diff)
downloadkernel-da8efd59dbeb7d3912641d1543af457d14cdf5e3.tar.gz
kernel-da8efd59dbeb7d3912641d1543af457d14cdf5e3.tar.xz
kernel-da8efd59dbeb7d3912641d1543af457d14cdf5e3.zip
Fix typo in dts Makefile
-rw-r--r--bcm2837-initial-support.patch14
-rw-r--r--kernel.spec5
2 files changed, 12 insertions, 7 deletions
diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch
index 16d5d2e42..1bd89f4c8 100644
--- a/bcm2837-initial-support.patch
+++ b/bcm2837-initial-support.patch
@@ -1,4 +1,4 @@
-From f06dd7d37ae66a4441b1c17f55e26f8bf8349531 Mon Sep 17 00:00:00 2001
+From cdb86691df26e0962f081981f4bfa97ee43bd391 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 29 Aug 2016 09:14:15 +0100
Subject: [PATCH] ARM: bcm283x: Add devicetree for the Raspberry Pi 3.
@@ -10,21 +10,23 @@ Rebased to the patch that went upstream for ARM64
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
- arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 30 ++++++++++++++
arch/arm/boot/dts/bcm2837.dtsi | 76 +++++++++++++++++++++++++++++++++++
- 3 files changed, 107 insertions(+)
+ 3 files changed, 108 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
create mode 100644 arch/arm/boot/dts/bcm2837.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index befcd26..68993e2 100644
+index befcd26..c96fb38 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -71,6 +71,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+@@ -70,7 +70,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+ bcm2835-rpi-b-plus.dtb \
bcm2835-rpi-a-plus.dtb \
bcm2836-rpi-2-b.dtb \
- bcm2835-rpi-zero.dtb
+- bcm2835-rpi-zero.dtb
++ bcm2835-rpi-zero.dtb \
+ bcm2837-rpi-3-b.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm4708-asus-rt-ac56u.dtb \
diff --git a/kernel.spec b/kernel.spec
index a07148cce..d5506d5c1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2151,6 +2151,9 @@ fi
#
#
%changelog
+* Mon Oct 10 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git5.2
+- Fix typo in dts Makefile
+
* Mon Oct 10 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git5.1
- Linux v4.8-11417-g24532f7