diff options
| author | John Crispin <blogic@openwrt.org> | 2015-02-11 10:17:55 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-02-11 10:17:55 +0000 |
| commit | c291f76d24a4190551a42b7b77a2cfeb3f4d36f9 (patch) | |
| tree | 8f9211217d7e2cbaa78d10b596d81e646b3b9aad /target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch | |
| parent | 0e26998162921c65cbfe2814e500c81ca7b50dad (diff) | |
| download | master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.tar.gz master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.tar.bz2 master-187ad058-c291f76d24a4190551a42b7b77a2cfeb3f4d36f9.zip | |
brcm2708: update to v3.18
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch')
| -rwxr-xr-x | target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch b/target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch new file mode 100755 index 0000000000..5633af2582 --- /dev/null +++ b/target/linux/brcm2708/patches-3.18/0099-BCM2709_DT-Fix-bad-merge.patch @@ -0,0 +1,48 @@ +From d274e98de547d48ddaaa0593217a156602b7367f Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Mon, 2 Feb 2015 12:45:07 +0000 +Subject: [PATCH 099/114] BCM2709_DT: Fix bad merge + +--- + arch/arm/boot/dts/Makefile | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 605ed38..8f76444 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -63,18 +63,19 @@ ifeq ($(CONFIG_BCM2709_DT),y) + endif + dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb + dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb +-dtb-$(CONFIG_BCM2708_DT) += hifiberry-dac-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += hifiberry-dacplus-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += ds1307-rtc-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += w1-gpio-overlay.dtb +-dtb-$(CONFIG_BCM2708_DT) += w1-gpio-pullup-overlay.dtb ++dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb ++dtb-$(RPI_DT_OVERLAYS) += ds1307-rtc-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += hifiberry-dac-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += hifiberry-dacplus-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += hifiberry-digi-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += hifiberry-amp-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += iqaudio-dac-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += iqaudio-dacplus-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += lirc-rpi-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += pcf8523-rtc-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += w1-gpio-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += w1-gpio-pullup-overlay.dtb + dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb + + dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb +-- +1.8.3.2 + |