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

   1 diff -Nur linux-5.4.155.orig/arch/arm/include/asm/mach/map.h linux-5.4.155/arch/arm/include/asm/mach/map.h
   2 --- linux-5.4.155.orig/arch/arm/include/asm/mach/map.h  2021-10-20 11:40:18.000000000 +0200
   3 +++ linux-5.4.155/arch/arm/include/asm/mach/map.h       2021-10-26 11:20:50.164712192 +0200
   4 @@ -59,6 +59,7 @@
   5  #else
   6  #define iotable_init(map,num)  do { } while (0)
   7  #define vm_reserve_area_early(a,s,c)   do { } while (0)
   8 +#define debug_ll_io_init()     do { } while (0)
   9  #endif
  10
  11  #endif
  12 diff -Nur linux-5.4.155.orig/arch/arm/Kconfig linux-5.4.155/arch/arm/Kconfig
  13 --- linux-5.4.155.orig/arch/arm/Kconfig 2021-10-20 11:40:18.000000000 +0200
  14 +++ linux-5.4.155/arch/arm/Kconfig      2021-10-26 11:20:50.164712192 +0200
  15 @@ -340,6 +340,17 @@
  16         select SPARSE_IRQ
  17         select USE_OF
  18
  19 +config ARM_SINGLE_ARCH_VERSATILE
  20 +       bool "ARM Ltd. Versatile family"
  21 +       depends on !MMU
  22 +       select AUTO_ZRELADDR
  23 +       select CLKSRC_OF
  24 +       select COMMON_CLK
  25 +       select GENERIC_CLOCKEVENTS
  26 +       select GPIOLIB
  27 +       select SPARSE_IRQ
  28 +       select USE_OF
  29 +
  30  config ARCH_EBSA110
  31         bool "EBSA-110"
  32         select ARCH_USES_GETTIMEOFFSET
  33 diff -Nur linux-5.4.155.orig/arch/arm/Kconfig.debug linux-5.4.155/arch/arm/Kconfig.debug
  34 --- linux-5.4.155.orig/arch/arm/Kconfig.debug   2021-10-20 11:40:18.000000000 +0200
  35 +++ linux-5.4.155/arch/arm/Kconfig.debug        2021-10-26 11:20:50.168712192 +0200
  36 @@ -1878,7 +1878,8 @@
  37  config UNCOMPRESS_INCLUDE
  38         string
  39         default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
  40 -                                       PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
  41 +                                       PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
  42 +                                       ARM_SINGLE_ARCH_VERSATILE
  43         default "mach/uncompress.h"
  44
  45  config EARLY_PRINTK
  46 diff -Nur linux-5.4.155.orig/arch/arm/mach-versatile/Kconfig linux-5.4.155/arch/arm/mach-versatile/Kconfig
  47 --- linux-5.4.155.orig/arch/arm/mach-versatile/Kconfig  2021-10-20 11:40:18.000000000 +0200
  48 +++ linux-5.4.155/arch/arm/mach-versatile/Kconfig       2021-10-26 11:20:50.168712192 +0200
  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-5.4.155.orig/arch/arm/mach-versatile/Makefile.boot linux-5.4.155/arch/arm/mach-versatile/Makefile.boot
  61 --- linux-5.4.155.orig/arch/arm/mach-versatile/Makefile.boot    1970-01-01 01:00:00.000000000 +0100
  62 +++ linux-5.4.155/arch/arm/mach-versatile/Makefile.boot 2021-10-26 11:20:50.168712192 +0200
  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-5.4.155.orig/arch/arm/mach-versatile/versatile_dt.c linux-5.4.155/arch/arm/mach-versatile/versatile_dt.c
  68 --- linux-5.4.155.orig/arch/arm/mach-versatile/versatile_dt.c   2021-10-20 11:40:18.000000000 +0200
  69 +++ linux-5.4.155/arch/arm/mach-versatile/versatile_dt.c        2021-10-26 11:20:50.168712192 +0200
  70 @@ -22,7 +22,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  /*