Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt_chaos_c...
/
target
/
linux
/
brcm2708
/
patches-3.18
/
0099-BCM2709_DT-Fix-bad-merge.patch

0099-BCM2709_DT-Fix-bad-merge.patch 1.9 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243 
  1. From d274e98de547d48ddaaa0593217a156602b7367f Mon Sep 17 00:00:00 2001
    2. 

  2. From: Phil Elwell <phil@raspberrypi.org>
    3. 

  3. Date: Mon, 2 Feb 2015 12:45:07 +0000
    4. 

  4. Subject: [PATCH 099/114] BCM2709_DT: Fix bad merge
    5. 

  5. 

  6. ---
    7. 

  7.  arch/arm/boot/dts/Makefile | 25 +++++++++++++------------
    8. 

  8.  1 file changed, 13 insertions(+), 12 deletions(-)
    9. 

  9. 

  10. --- a/arch/arm/boot/dts/Makefile
    11. 

  11. +++ b/arch/arm/boot/dts/Makefile
    12. 

  12. @@ -63,18 +63,19 @@ ifeq ($(CONFIG_BCM2709_DT),y)
    13. 

  13.  endif
    14. 

  14.  dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb
    15. 

  15.  dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb
    16. 

  16. -dtb-$(CONFIG_BCM2708_DT) += hifiberry-dac-overlay.dtb
    17. 

  17. -dtb-$(CONFIG_BCM2708_DT) += hifiberry-dacplus-overlay.dtb
    18. 

  18. -dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb
    19. 

  19. -dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb
    20. 

  20. -dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb
    21. 

  21. -dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb
    22. 

  22. -dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb
    23. 

  23. -dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb
    24. 

  24. -dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb
    25. 

  25. -dtb-$(CONFIG_BCM2708_DT) += ds1307-rtc-overlay.dtb
    26. 

  26. -dtb-$(CONFIG_BCM2708_DT) += w1-gpio-overlay.dtb
    27. 

  27. -dtb-$(CONFIG_BCM2708_DT) += w1-gpio-pullup-overlay.dtb
    28. 

  28. +dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb
    29. 

  29. +dtb-$(RPI_DT_OVERLAYS) += ds1307-rtc-overlay.dtb
    30. 

  30. +dtb-$(RPI_DT_OVERLAYS) += hifiberry-dac-overlay.dtb
    31. 

  31. +dtb-$(RPI_DT_OVERLAYS) += hifiberry-dacplus-overlay.dtb
    32. 

  32. +dtb-$(RPI_DT_OVERLAYS) += hifiberry-digi-overlay.dtb
    33. 

  33. +dtb-$(RPI_DT_OVERLAYS) += hifiberry-amp-overlay.dtb
    34. 

  34. +dtb-$(RPI_DT_OVERLAYS) += iqaudio-dac-overlay.dtb
    35. 

  35. +dtb-$(RPI_DT_OVERLAYS) += iqaudio-dacplus-overlay.dtb
    36. 

  36. +dtb-$(RPI_DT_OVERLAYS) += lirc-rpi-overlay.dtb
    37. 

  37. +dtb-$(RPI_DT_OVERLAYS) += pcf8523-rtc-overlay.dtb
    38. 

  38. +dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
    39. 

  39. +dtb-$(RPI_DT_OVERLAYS) += w1-gpio-overlay.dtb
    40. 

  40. +dtb-$(RPI_DT_OVERLAYS) += w1-gpio-pullup-overlay.dtb
    41. 

  41.  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
    42. 

  42.  
    43. 

  43.  dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
    44.