1. 27 9月, 2012 1 次提交
    • G
      m68knommu: make ColdFire Chip Select register definitions absolute addresses · 1419ea3b
      Greg Ungerer 提交于
      Make all definitions of the ColdFire Chip Select registers absolute addresses.
      Currently some are relative to the MBAR peripheral region.
      
      The various ColdFire parts use different methods to address the internal
      registers, some are absolute, some are relative to peripheral regions
      which can be mapped at different address ranges (such as the MBAR and IPSBAR
      registers). We don't want to deal with this in the code when we are
      accessing these registers, so make all register definitions the absolute
      address - factoring out whether it is an offset into a peripheral region.
      
      This makes them all consistently defined, and reduces the occasional bugs
      caused by inconsistent definition of the register addresses.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      1419ea3b
  2. 20 5月, 2012 1 次提交
  3. 25 3月, 2011 1 次提交
    • G
      m68k: merge m68k and m68knommu arch directories · 66d857b0
      Greg Ungerer 提交于
      There is a lot of common code that could be shared between the m68k
      and m68knommu arch branches. It makes sense to merge the two branches
      into a single directory structure so that we can more easily share
      that common code.
      
      This is a brute force merge, based on a script from Stephen King
      <sfking@fdwdc.com>, which was originally written by Arnd Bergmann
      <arnd@arndb.de>.
      
      > The script was inspired by the script Sam Ravnborg used to merge the
      > includes from m68knommu. For those files common to both arches but
      > differing in content, the m68k version of the file is renamed to
      > <file>_mm.<ext> and the m68knommu version of the file is moved into the
      > corresponding m68k directory and renamed <file>_no.<ext> and a small
      > wrapper file <file>.<ext> is used to select between the two version. Files
      > that are common to both but don't differ are removed from the m68knommu
      > tree and files and directories that are unique to the m68knommu tree are
      > moved to the m68k tree. Finally, the arch/m68knommu tree is removed.
      >
      > To select between the the versions of the files, the wrapper uses
      >
      > #ifdef CONFIG_MMU
      > #include <file>_mm.<ext>
      > #else
      > #include <file>_no.<ext>
      > #endif
      
      On top of this file merge I have done a simplistic merge of m68k and
      m68knommu Kconfig, which primarily attempts to keep existing options and
      menus in place. Other than a handful of options being moved it produces
      identical .config outputs on m68k and m68knommu targets I tested it on.
      
      With this in place there is now quite a bit of scope for merge cleanups
      in future patches.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      66d857b0
  4. 24 5月, 2010 1 次提交