1. 07 4月, 2016 1 次提交
  2. 01 2月, 2016 1 次提交
  3. 14 12月, 2015 1 次提交
  4. 28 9月, 2015 1 次提交
  5. 10 8月, 2015 2 次提交
  6. 13 7月, 2015 8 次提交
  7. 01 6月, 2015 1 次提交
  8. 15 3月, 2015 2 次提交
  9. 31 1月, 2015 6 次提交
  10. 18 7月, 2014 1 次提交
  11. 28 5月, 2014 1 次提交
  12. 31 3月, 2014 1 次提交
  13. 11 3月, 2014 1 次提交
  14. 31 12月, 2013 3 次提交
  15. 08 12月, 2013 1 次提交
  16. 26 11月, 2013 1 次提交
  17. 25 6月, 2013 1 次提交
  18. 28 5月, 2013 1 次提交
  19. 03 9月, 2012 1 次提交
  20. 20 5月, 2012 1 次提交
  21. 17 4月, 2012 1 次提交
  22. 29 12月, 2011 1 次提交
  23. 11 12月, 2011 1 次提交
  24. 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