target/linux/patches/4.16.17/arm-nommu.patch

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