1. 21 Feb, 2015 16 commits
    • Masahiro Yamada's avatar
      ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach · ea385723
      Masahiro Yamada authored
      
      
      Move arch/arm/include/asm/arch-kirkwood/*
        -> arch/arm/mach-kirkwood/include/mach/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarStefan Roese <sr@denx.de>
      Cc: Prafulla Wadaskar <prafulla@marvell.com>
      Cc: Luka Perkov <luka.perkov@sartura.hr>
      ea385723
    • Masahiro Yamada's avatar
      ARM: davinci: move SoC headers to mach-davinci/include/mach · 3d357619
      Masahiro Yamada authored
      
      
      Move arch/arm/include/asm/arch-davinci/*
        -> arch/arm/mach-davinci/include/mach/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Tom Rini <trini@ti.com>
      3d357619
    • Masahiro Yamada's avatar
      ARM: at91: move SoC headers to mach-at91/include/mach · af930827
      Masahiro Yamada authored
      
      
      Move arch/arm/include/asm/arch-at91/*
        -> arch/arm/mach-at91/include/mach/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarAndreas Bießmann <andreas.devel@googlemail.com>
      af930827
    • Masahiro Yamada's avatar
      kbuild: prepare for moving headers into mach-*/include/mach · 0e7368c6
      Masahiro Yamada authored
      
      
      In U-Boot, SoC-specific headers are placed in
      arch/$(ARCH)/include/asm/arch-$(SOC) and a symbolic link to that
      directory is created at the early stage of the build process.
      
      Creating and removing a symbolic link during the build is not
      preferred.  In fact, Linux Kernel did away with include/asm-$(ARCH)
      directories a long time time ago.
      
      As for ARM, now it is possible to collect SoC sources into
      arch/arm/mach-$(SOC).  It is also reasonable to move SoC headers
      into arch/arm/mach-$(SOC)/include/mach.
      
      This commit prepares for that.
      If the directory arch/$(ARCH)/mach-$(SOC)/include/mach exists,
      a symbolic to that directory is created.  Otherwise, a symbolic link
      to arch/$(ARCH)/include/asm/arch-$(SOC) or arch-$(CPU) is created.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      0e7368c6
    • Masahiro Yamada's avatar
      ARM: keystone: move SoC sources to mach-keystone · 39a72345
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/armv7/keystone/* -> arch/arm/mach-keystone/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Tom Rini <trini@ti.com>
      39a72345
    • Masahiro Yamada's avatar
      ARM: versatile: move SoC sources to mach-versatile · 63637a48
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/arm926ejs/versatile/* -> arch/arm/mach-versatile/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      63637a48
    • Masahiro Yamada's avatar
      ARM: orion5x: move SoC sources to mach-orion5x · 3e93b4e6
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/arm926ejs/orion5x/* -> arch/arm/mach-orion5x/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
      3e93b4e6
    • Masahiro Yamada's avatar
      ARM: highbank: move SoC sources to mach-highbank · 72a8ff4b
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/armv7/highbank/* -> arch/arm/mach-highbank/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Rob Herring <robh@kernel.org>
      72a8ff4b
    • Masahiro Yamada's avatar
      ARM: nomadik: move SoC sources to mach-nomadik · ef917ddb
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/arm926ejs/nomadik/* -> arch/arm/mach-nomadik/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>
      Cc: Alessandro Rubini <rubini@unipv.it>
      ef917ddb
    • Masahiro Yamada's avatar
      ARM: kirkwood: move SOC sources to mach-kirkwood · 56f86e39
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/arm926ejs/kirkwood/* -> arch/arm/mach-kirkwood/*
      
      Note:
       Perhaps, can we merge arch/arm/mach-kirkwood and
       arch/arm/mvebu-common into arch/arm/mach-mvebu, like Linux?
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarStefan Roese <sr@denx.de>
      Cc: Prafulla Wadaskar <prafulla@marvell.com>
      Cc: Luka Perkov <luka.perkov@sartura.hr>
      56f86e39
    • Masahiro Yamada's avatar
      ARM: davinci: move SoC sources to mach-davinci · 601fbec7
      Masahiro Yamada authored
      
      
      Move
      arch/arm/cpu/arm926ejs/davinci/* -> arch/arm/mach-davinci/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Cc: Tom Rini <trini@ti.com>
      601fbec7
    • Masahiro Yamada's avatar
      ARM: tegra: collect SoC sources into mach-tegra · 09f455dc
      Masahiro Yamada authored
      
      
      This commit moves files as follows:
      
       arch/arm/cpu/arm720t/tegra20/*      -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/arm720t/tegra30/*      -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/arm720t/tegra114/*     -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/arm720t/tegra124*      -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/arm720t/tegra-common/* -> arch/arm/mach-tegra/*
       arch/arm/cpu/armv7/tegra20/*        -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/armv7/tegra30/*        -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/armv7/tegra114/*       -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/armv7/tegra124/*       -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/armv7/tegra-common/*   -> arch/arm/mach-tegra/*
       arch/arm/cpu/tegra20-common/*       -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/tegra30-common/*       -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/tegra114-common/*      -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/tegra124-common/*      -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/tegra-common/*         -> arch/arm/mach-tegra/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Tested-by: Simon Glass <sjg@chromium.org> [ on nyan-big ]
      Cc: Stephen Warren <swarren@nvidia.com>
      Cc: Tom Warren <twarren@nvidia.com>
      09f455dc
    • Masahiro Yamada's avatar
      ARM: at91: collect SoC sources into mach-at91 · 62011840
      Masahiro Yamada authored
      
      
      This commit moves source files as follows:
      
        arch/arm/cpu/arm920t/at91/*   -> arch/arm/mach-at91/arm920t/*
        arch/arm/cpu/arm926ejs/at91/* -> arch/arm/mach-at91/arm926ejs/*
        arch/arm/cpu/armv7/at91/*     -> arch/arm/mach-at91/armv7/*
        arch/arm/cpu/at91-common/*    -> arch/arm/mach-at91/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarAndreas Bießmann <andreas.devel@googlemail.co>
      62011840
    • Masahiro Yamada's avatar
      ARM: prepare for moving SoC sources into mach-* · 01f14456
      Masahiro Yamada authored
      In U-boot, the directory structure, arch/$(ARCH)/cpu/$(CPU)/$(SOC)/
      has been adopted except that $(CPU) is missing from some
      architectures and $(SOC) is missing from some CPUs.
      
      This structure did not fit very well in some cases.
      
      [1] AT91
      
      AT91 SoC family have been developed across some ARM processor
      generations.  Generally speaking, some IPs are often re-used in the
      same SoC family (same SoC vendor) even when the main processor is
      updated.  As a result, a SoC-common directory is needed in the upper
      level.  Currently, AT91 source files are placed as follows:
      
        arch/arm/cpu/arm920t/at91/*
        arch/arm/cpu/arm926ejs/at91/*
        arch/arm/cpu/armv7/at91/*
        arch/arm/cpu/at91-common/*
      
      Once directories are split, the motivation for refactorings across
      CPU directories is lost.  Some files in arm920t/at91/ and
      arm926ejs/at91/ are so similar that they could be merged.
      
      [2] Tegra
      
      Tegra is a little bit special case where different CPUs are used for
      SPL and the main U-boot.  To obey the arch/$(ARCH)/cpu/$(CPU)/$(SOC)
      structure, the source files must be placed across the CPUs,
      again SoC-common directory is necessary in the upper level.
      
      Moreover, there are several families in Tegra: Tegra20, Tegra30,
      Tegra114, Tegra124.  Here again, the tegra-common directory is needed
      to contain commonly-used files.
      
      Tegra directories have been sprinkled in the directory structure.
      
        arch/arm/cpu/arm720t/tegra20
        arch/arm/cpu/arm720t/tegra30
        arch/arm/cpu/arm720t/tegra114
        arch/arm/cpu/arm720t/tegra124
        arch/arm/cpu/arm720t/tegra-common
        arch/arm/cpu/armv7/tegra20
        arch/arm/cpu/armv7/tegra30
        arch/arm/cpu/armv7/tegra114
        arch/arm/cpu/armv7/tegra124
        arch/arm/cpu/armv7/tegra-common
        arch/arm/cpu/tegra20-common
        arch/arm/cpu/tegra30-common
        arch/arm/cpu/tegra114-common
        arch/arm/cpu/tegra124-common
        arch/arm/cpu/tegra-common
      
      As you see, splitting SoC code by the CPU is not going well,
      especially for ARM.
      Why don't we collect SoC-specific files into a single place?
      
      A good example we can follow is Linux's arch/arm/mach-* structure.
      
      This item was discussed in the following thread:
      http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/188548/
      
      
      
      Looks like I got some positive responses and we are almost ready to
      start this movement.
      
      This commit prepares arch/arm/Makefile for describing machdirs in it.
      
      After this commit, we can move SoC directory to arch/arm/mach-$(SOC)
      in simple steps although some cases such as AT91 and Tegra need more
      fixes.
      
      What we generally have to do is:
      
      [1] Move files arch/arm/cpu/$(CPU)/$(SOC)/* to arch/arm/mach-$(SOC)/*
      [2] Add machine entry into arch/arm/Makefile
      [3] Remove "obj-y += $(SOC)" from arch/arm/cpu/$(CPU)/Makefile
      [4] Fix the Kconfig file path in arch/arm/Kconfig
      [5] Modify MAINTAINERS if necessary
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      01f14456
    • Masahiro Yamada's avatar
      ARM: at91: move board select menu and common settings · 4614b891
      Masahiro Yamada authored
      
      
      The board select menu in arch/arm/Kconfig is still big.
      To slim down it, this commit moves AT91 boards to
      arch/arm/mach-at91/Kconfig.
      Also, consolidate "config SYS_SOC" in each board Kconfig.
      
      The Kconfig files under board/ directory were modified with the
      following command:
      
          find board -name Kconfig | xargs sed -i -e '
          /config SYS_SOC/ {
              N
              /default "at91"/ {
                  N
                  d
              }
          }
          '
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarAndreas Bießmann <andreas.devel@googlemail.co>
      4614b891
    • Tom Rini's avatar
      Merge git://git.denx.de/u-boot-dm · b4087b35
      Tom Rini authored
      b4087b35
  2. 19 Feb, 2015 10 commits
  3. 18 Feb, 2015 4 commits
  4. 17 Feb, 2015 10 commits