1
0

arm-nommu.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. diff -Nur linux-4.15.13.orig/arch/arm/Kconfig linux-4.15.13/arch/arm/Kconfig
  2. --- linux-4.15.13.orig/arch/arm/Kconfig 2018-03-24 11:02:53.000000000 +0100
  3. +++ linux-4.15.13/arch/arm/Kconfig 2018-04-01 03:47:33.415078244 +0100
  4. @@ -355,6 +355,17 @@
  5. select SPARSE_IRQ
  6. select USE_OF
  7. +config ARM_SINGLE_ARCH_VERSATILE
  8. + bool "ARM Ltd. Versatile family"
  9. + depends on !MMU
  10. + select AUTO_ZRELADDR
  11. + select CLKSRC_OF
  12. + select COMMON_CLK
  13. + select GENERIC_CLOCKEVENTS
  14. + select GPIOLIB
  15. + select SPARSE_IRQ
  16. + select USE_OF
  17. +
  18. config ARCH_EBSA110
  19. bool "EBSA-110"
  20. select ARCH_USES_GETTIMEOFFSET
  21. diff -Nur linux-4.15.13.orig/arch/arm/Kconfig.debug linux-4.15.13/arch/arm/Kconfig.debug
  22. --- linux-4.15.13.orig/arch/arm/Kconfig.debug 2018-03-24 11:02:53.000000000 +0100
  23. +++ linux-4.15.13/arch/arm/Kconfig.debug 2018-04-01 03:47:33.416078232 +0100
  24. @@ -1795,7 +1795,8 @@
  25. config UNCOMPRESS_INCLUDE
  26. string
  27. default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
  28. - PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
  29. + PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
  30. + ARM_SINGLE_ARCH_VERSATILE
  31. default "mach/uncompress.h"
  32. config EARLY_PRINTK
  33. diff -Nur linux-4.15.13.orig/arch/arm/include/asm/mach/map.h linux-4.15.13/arch/arm/include/asm/mach/map.h
  34. --- linux-4.15.13.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:02:53.000000000 +0100
  35. +++ linux-4.15.13/arch/arm/include/asm/mach/map.h 2018-04-01 03:47:17.587276119 +0100
  36. @@ -62,6 +62,7 @@
  37. #else
  38. #define iotable_init(map,num) do { } while (0)
  39. #define vm_reserve_area_early(a,s,c) do { } while (0)
  40. +#define debug_ll_io_init() do { } while (0)
  41. #endif
  42. #endif
  43. diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig linux-4.15.13/arch/arm/mach-versatile/Kconfig
  44. --- linux-4.15.13.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:02:53.000000000 +0100
  45. +++ linux-4.15.13/arch/arm/mach-versatile/Kconfig 2018-04-01 03:47:33.417078219 +0100
  46. @@ -1,7 +1,8 @@
  47. # SPDX-License-Identifier: GPL-2.0
  48. config ARCH_VERSATILE
  49. - bool "ARM Ltd. Versatile family"
  50. - depends on ARCH_MULTI_V5
  51. + bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5
  52. + depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE
  53. + default y if ARM_SINGLE_ARCH_VERSATILE
  54. select ARM_AMBA
  55. select ARM_TIMER_SP804
  56. select ARM_VIC
  57. diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot linux-4.15.13/arch/arm/mach-versatile/Makefile.boot
  58. --- linux-4.15.13.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
  59. +++ linux-4.15.13/arch/arm/mach-versatile/Makefile.boot 2018-04-01 03:47:25.644175394 +0100
  60. @@ -0,0 +1,3 @@
  61. +# Empty file waiting for deletion once Makefile.boot isn't needed any more.
  62. +# Patch waits for application at
  63. +# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
  64. diff -Nur linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c
  65. --- linux-4.15.13.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:02:53.000000000 +0100
  66. +++ linux-4.15.13/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 03:47:10.913359555 +0100
  67. @@ -37,7 +37,11 @@
  68. #include <asm/mach/map.h>
  69. /* macro to get at MMIO space when running virtually */
  70. +#ifdef CONFIG_MMU
  71. #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
  72. +#else
  73. +#define IO_ADDRESS(x) (x)
  74. +#endif
  75. #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n))
  76. /*