Merge tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull m68knommu updates from Greg Ungerer:

 - cleanup of 68328 code

 - align BSS section to 32bit

* tag 'm68knommu-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: m68328: remove duplicate code
  m68k: m68328: move platform code to separate files
  m68knommu: align BSS section to 4-byte boundaries

diff --combined arch/m68k/Kconfig.cpu
index 7246aa50298eedaa0200c41fedf07676ed836417,a65ce761823262cf001d8d5814e66ca656ba6004..f4d23977d2a5a4e03bec8e6d69cf4e24182a4ed7
--- 1/arch/m68k/Kconfig.cpu
--- 2/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@@ -20,7 -20,6 +20,7 @@@ choic
  
  config M68KCLASSIC
        bool "Classic M68K CPU family support"
 +      select HAVE_ARCH_PFN_VALID
  
  config COLDFIRE
        bool "Coldfire CPU family support"
@@@ -36,7 -35,7 +36,7 @@@ endchoic
  if M68KCLASSIC
  
  config M68000
-       bool "MC68000"
+       bool
        depends on !MMU
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
@@@ -103,25 -102,22 +103,25 @@@ config M6806
          processor, say Y. Otherwise, say N.
  
  config M68328
-       bool "MC68328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68328 processor support.
  
  config M68EZ328
-       bool "MC68EZ328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68EX328 processor support.
  
  config M68VZ328
-       bool "MC68VZ328"
+       bool
        depends on !MMU
 +      select LEGACY_TIMER_TICK
        select M68000
        help
          Motorola 68VZ328 processor support.
@@@ -141,7 -137,6 +141,7 @@@ config M520
        bool "MCF5206"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
        help
@@@ -151,7 -146,6 +151,7 @@@ config M5206
        bool "MCF5206e"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
        help
@@@ -160,7 -154,7 +160,7 @@@
  config M520x
        bool "MCF520x"
        depends on !MMU
 -      select GENERIC_CLOCKEVENTS
 +      select COLDFIRE_PIT_TIMER
        select HAVE_CACHE_SPLIT
        help
           Freescale Coldfire 5207/5208 processor support.
@@@ -168,7 -162,7 +168,7 @@@
  config M523x
        bool "MCF523x"
        depends on !MMU
 -      select GENERIC_CLOCKEVENTS
 +      select COLDFIRE_PIT_TIMER
        select HAVE_CACHE_SPLIT
        select HAVE_IPSBAR
        help
@@@ -178,7 -172,6 +178,7 @@@ config M524
        bool "MCF5249"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
        help
@@@ -188,7 -181,6 +188,7 @@@ config M525
        bool "MCF525x"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
        help
@@@ -197,10 -189,10 +197,10 @@@
  config M5271
        bool "MCF5271"
        depends on !MMU
 +      select COLDFIRE_PIT_TIMER
        select M527x
        select HAVE_CACHE_SPLIT
        select HAVE_IPSBAR
 -      select GENERIC_CLOCKEVENTS
        help
          Freescale (Motorola) ColdFire 5270/5271 processor support.
  
@@@ -208,7 -200,6 +208,7 @@@ config M527
        bool "MCF5272"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
        help
@@@ -217,17 -208,17 +217,17 @@@
  config M5275
        bool "MCF5275"
        depends on !MMU
 +      select COLDFIRE_PIT_TIMER
        select M527x
        select HAVE_CACHE_SPLIT
        select HAVE_IPSBAR
 -      select GENERIC_CLOCKEVENTS
        help
          Freescale (Motorola) ColdFire 5274/5275 processor support.
  
  config M528x
        bool "MCF528x"
        depends on !MMU
 -      select GENERIC_CLOCKEVENTS
 +      select COLDFIRE_PIT_TIMER
        select HAVE_CACHE_SPLIT
        select HAVE_IPSBAR
        help
@@@ -236,7 -227,6 +236,7 @@@
  config M5307
        bool "MCF5307"
        depends on !MMU
 +      select COLDFIRE_TIMERS
        select COLDFIRE_SW_A7
        select HAVE_CACHE_CB
        select HAVE_MBAR
@@@ -247,7 -237,6 +247,7 @@@
  config M532x
        bool "MCF532x"
        depends on !MMU
 +      select COLDFIRE_TIMERS
        select M53xx
        select HAVE_CACHE_CB
        help
@@@ -256,7 -245,6 +256,7 @@@
  config M537x
        bool "MCF537x"
        depends on !MMU
 +      select COLDFIRE_TIMERS
        select M53xx
        select HAVE_CACHE_CB
        help
@@@ -266,7 -254,6 +266,7 @@@ config M540
        bool "MCF5407"
        depends on !MMU
        select COLDFIRE_SW_A7
 +      select COLDFIRE_TIMERS
        select HAVE_CACHE_CB
        select HAVE_MBAR
        select CPU_NO_EFFICIENT_FFS
@@@ -276,7 -263,6 +276,7 @@@
  config M547x
        bool "MCF547x"
        select M54xx
 +      select COLDFIRE_SLTIMERS
        select MMU_COLDFIRE if MMU
        select FPU if MMU
        select HAVE_CACHE_CB
@@@ -287,7 -273,6 +287,7 @@@
  
  config M548x
        bool "MCF548x"
 +      select COLDFIRE_SLTIMERS
        select MMU_COLDFIRE if MMU
        select FPU if MMU
        select M54xx
@@@ -299,8 -284,8 +299,8 @@@
  
  config M5441x
        bool "MCF5441x"
 +      select COLDFIRE_PIT_TIMER
        select MMU_COLDFIRE if MMU
 -      select GENERIC_CLOCKEVENTS
        select HAVE_CACHE_CB
        help
          Freescale Coldfire 54410/54415/54416/54417/54418 processor support.
@@@ -317,17 -302,6 +317,17 @@@ config M54x
        select HAVE_PCI
        bool
  
 +config COLDFIRE_PIT_TIMER
 +      bool
 +
 +config COLDFIRE_TIMERS
 +      bool
 +      select LEGACY_TIMER_TICK
 +
 +config COLDFIRE_SLTIMERS
 +      bool
 +      select LEGACY_TIMER_TICK
 +
  endif # COLDFIRE
  
  
@@@ -399,38 -373,16 +399,38 @@@ config RMW_INSN
  config SINGLE_MEMORY_CHUNK
        bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
        depends on MMU
 -      default y if SUN3
 -      select NEED_MULTIPLE_NODES
 +      default y if SUN3 || MMU_COLDFIRE
        help
          Ignore all but the first contiguous chunk of physical memory for VM
          purposes.  This will save a few bytes kernel size and may speed up
 -        some operations.  Say N if not sure.
 +        some operations.
 +        When this option os set to N, you may want to lower "Maximum zone
 +        order" to save memory that could be wasted for unused memory map.
 +        Say N if not sure.
  
  config ARCH_DISCONTIGMEM_ENABLE
 +      depends on BROKEN
        def_bool MMU && !SINGLE_MEMORY_CHUNK
  
 +config FORCE_MAX_ZONEORDER
 +      int "Maximum zone order" if ADVANCED
 +      depends on !SINGLE_MEMORY_CHUNK
 +      default "11"
 +      help
 +        The kernel memory allocator divides physically contiguous memory
 +        blocks into "zones", where each zone is a power of two number of
 +        pages.  This option selects the largest power of two that the kernel
 +        keeps in the memory allocator.  If you need to allocate very large
 +        blocks of physically contiguous memory, then you may need to
 +        increase this value.
 +
 +        For systems that have holes in their physical address space this
 +        value also defines the minimal size of the hole that allows
 +        freeing unused memory map.
 +
 +        This config option is actually maximum order plus one. For example,
 +        a value of 11 means that the largest free memory block is 2^10 pages.
 +
  config 060_WRITETHROUGH
        bool "Use write-through caching for 68060 supervisor accesses"
        depends on ADVANCED && M68060
@@@ -454,7 -406,7 +454,7 @@@ config M68K_L2_CACH
  config NODES_SHIFT
        int
        default "3"
 -      depends on !SINGLE_MEMORY_CHUNK
 +      depends on DISCONTIGMEM
  
  config CPU_HAS_NO_BITFIELDS
        bool

diff --combined arch/m68k/Kconfig.machine
index cf6961d4e65710add0af9bad3555b701db8ce025,1851c66e86671cfdac45a27babcf7696b33ea94d..4d59ec2f5b8d63dbc0e67dfbdfce7f6da207488f
--- 1/arch/m68k/Kconfig.machine
--- 2/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@@ -7,7 -7,6 +7,7 @@@ config AMIG
        bool "Amiga support"
        depends on MMU
        select MMU_MOTOROLA if MMU
 +      select LEGACY_TIMER_TICK
        help
          This option enables support for the Amiga series of computers. If
          you plan to use this kernel on an Amiga, say Y here and browse the
@@@ -18,7 -17,6 +18,7 @@@ config ATAR
        depends on MMU
        select MMU_MOTOROLA if MMU
        select HAVE_ARCH_NVRAM_OPS
 +      select LEGACY_TIMER_TICK
        help
          This option enables support for the 68000-based Atari series of
          computers (including the TT, Falcon and Medusa). If you plan to use
@@@ -30,18 -28,18 +30,18 @@@ config MA
        depends on MMU
        select MMU_MOTOROLA if MMU
        select HAVE_ARCH_NVRAM_OPS
 +      select LEGACY_TIMER_TICK
        help
          This option enables support for the Apple Macintosh series of
 -        computers (yes, there is experimental support now, at least for part
 -        of the series).
 -
 -        Say N unless you're willing to code the remaining necessary support.
 -        ;)
 +        computers. If you plan to use this kernel on a Mac, say Y here and
 +        browse the documentation available at <http://www.mac.linux-m68k.org/>;
 +        otherwise say N.
  
  config APOLLO
        bool "Apollo support"
        depends on MMU
        select MMU_MOTOROLA if MMU
 +      select LEGACY_TIMER_TICK
        help
          Say Y here if you want to run Linux on an MC680x0-based Apollo
          Domain workstation such as the DN3500.
@@@ -60,7 -58,6 +60,7 @@@ config MVME14
        bool "MVME147 support"
        depends on MMU
        depends on VME
 +      select LEGACY_TIMER_TICK
        help
          Say Y to include support for early Motorola VME boards.  This will
          build a kernel which can run on MVME147 single-board computers.  If
@@@ -71,7 -68,6 +71,7 @@@ config MVME16
        bool "MVME162, 166 and 167 support"
        depends on MMU
        depends on VME
 +      select LEGACY_TIMER_TICK
        help
          Say Y to include support for Motorola VME boards.  This will build a
          kernel which can run on MVME162, MVME166, MVME167, MVME172, and
@@@ -83,7 -79,6 +83,7 @@@ config BVME600
        bool "BVME4000 and BVME6000 support"
        depends on MMU
        depends on VME
 +      select LEGACY_TIMER_TICK
        help
          Say Y to include support for VME boards from BVM Ltd.  This will
          build a kernel which can run on BVME4000 and BVME6000 boards.  If
@@@ -94,7 -89,6 +94,7 @@@ config HP30
        bool "HP9000/300 and HP9000/400 support"
        depends on MMU
        select MMU_MOTOROLA if MMU
 +      select LEGACY_TIMER_TICK
        help
          This option enables support for the HP9000/300 and HP9000/400 series
          of workstations. Support for these machines is still somewhat
@@@ -105,7 -99,6 +105,7 @@@
  config SUN3X
        bool "Sun3x support"
        depends on MMU
 +      select LEGACY_TIMER_TICK
        select MMU_MOTOROLA if MMU
        select M68030
        help
@@@ -121,7 -114,6 +121,7 @@@ config Q4
        bool "Q40/Q60 support"
        depends on MMU
        select MMU_MOTOROLA if MMU
 +      select LEGACY_TIMER_TICK
        help
          The Q40 is a Motorola 68040-based successor to the Sinclair QL
          manufactured in Germany.  There is an official Q40 home page at
@@@ -134,7 -126,6 +134,7 @@@ config SUN
        depends on MMU
        depends on !MMU_MOTOROLA
        select MMU_SUN3 if MMU
 +      select LEGACY_TIMER_TICK
        select NO_DMA
        select M68020
        help
@@@ -145,14 -136,13 +145,13 @@@
  
          If you don't want to compile a kernel exclusively for a Sun 3, say N.
  
- endif # M68KCLASSIC
- 
  config PILOT
        bool
  
  config PILOT3
        bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support"
-       depends on M68328
+       depends on !MMU
+       select M68328
        select PILOT
        help
          Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
@@@ -165,19 -155,22 +164,22 @@@ config XCOPILOT_BUG
  
  config UCSIMM
        bool "uCsimm module support"
-       depends on M68EZ328
+       depends on !MMU
+       select M68EZ328
        help
          Support for the Arcturus Networks uCsimm module.
  
  config UCDIMM
        bool "uDsimm module support"
-       depends on M68VZ328
+       depends on !MMU
+       select M68VZ328
        help
          Support for the Arcturus Networks uDsimm module.
  
  config DRAGEN2
        bool "DragenEngine II board support"
-       depends on M68VZ328
+       depends on !MMU
+       select M68VZ328
        help
          Support for the DragenEngine II board.
  
@@@ -200,6 -193,8 +202,8 @@@ config MEMORY_RESERV
        help
          Reserve certain memory regions on 68x328 based boards.
  
+ endif # M68KCLASSIC
+ 
  config ARN5206
        bool "Arnewsh 5206 board support"
        depends on M5206

diff --combined arch/m68k/kernel/setup_no.c
index e377b421952839a23aedfa02c12558356b147992,58dbe10ccf56bbb770622e99f949e66ace1e7433..d1b7988efc91b1a00a84a49219fbc62b6158da42
--- 1/arch/m68k/kernel/setup_no.c
--- 2/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@@ -49,7 -49,7 +49,7 @@@ EXPORT_SYMBOL(memory_end)
  char __initdata command_line[COMMAND_LINE_SIZE];
  
  /* machine dependent timer functions */
 -void (*mach_sched_init)(irq_handler_t handler) __initdata = NULL;
 +void (*mach_sched_init)(void) __initdata = NULL;
  int (*mach_hwclk) (int, struct rtc_time*);
  
  /* machine dependent reboot functions */
@@@ -106,8 -106,16 +106,16 @@@ void __init setup_arch(char **cmdline_p
  #ifdef CONFIG_UCDIMM
        pr_info("uCdimm by Lineo, Inc. <www.lineo.com>\n");
  #endif
+ #ifdef CONFIG_M68328
+       pr_info("68328 support D. Jeff Dionne <[email protected]>\n");
+       pr_info("68328 support Kenneth Albanowski <[email protected]>\n");
+ #endif
+ #ifdef CONFIG_M68EZ328
+       pr_info("68EZ328 DragonBallEZ support (C) 1999 Rt-Control, Inc\n");
+ #endif
  #ifdef CONFIG_M68VZ328
        pr_info("M68VZ328 support by Evan Stawnyczy <[email protected]>\n");
+       pr_info("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
  #endif
  #ifdef CONFIG_COLDFIRE
        pr_info("COLDFIRE port done by Greg Ungerer, [email protected]\n");
@@@ -121,6 -129,7 +129,7 @@@
        pr_info("Flat model support (C) 1998,1999 Kenneth Albanowski, D. Jeff Dionne\n");
  
  #if defined( CONFIG_PILOT ) && defined( CONFIG_M68328 )
+       pr_info("68328/Pilot support Bernhard Kuhn <[email protected]>\n");
        pr_info("TRG SuperPilot FLASH card support <[email protected]>\n");
  #endif
  #if defined( CONFIG_PILOT ) && defined( CONFIG_M68EZ328 )

diff --combined arch/m68k/kernel/vmlinux-nommu.lds
index 396e126a4258a03a862682413463ae568de86c86,730bb653f9c1502329381694d37014602c43cd9f..387f334e87d3ecc1daa1df0fd6bbe3f11679bbf5
--- 1/arch/m68k/kernel/vmlinux-nommu.lds
--- 2/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@@ -65,6 -65,7 +65,6 @@@ SECTIONS 
        _edata = .;
  
        EXCEPTION_TABLE(16)
 -      NOTES
  
        . = ALIGN(PAGE_SIZE);
        __init_begin = .;
@@@ -81,12 -82,12 +81,12 @@@
                __init_end = .;
        }
  
-       BSS_SECTION(0, 0, 0)
+       BSS_SECTION(4, 0, 4)
  
        _end = .;
  
        STABS_DEBUG
 -      .comment 0 : { *(.comment) }
 +      ELF_DETAILS
  
        /* Sections to be discarded */
        DISCARDS