u-boot.git/arch, branch v2015.01-rc3

Merge git://git.denx.de/u-boot-mpc85xx

2014-12-08T21:35:07Z

Merge branch 'master' of git://git.denx.de/u-boot-ti

2014-12-08T21:35:06Z

Merge branch 'master' of git://git.denx.de/u-boot-uniphier

2014-12-08T21:35:05Z

ARM: UniPhier: detect the number of flash banks at run-time

2014-12-08T15:08:33Z

Some UniPhier boards are equipped with an expansion slot that some optional SRAM/NOR-flash cards can be attached to. So, run-time detection of the number of flash banks would be more user-friendly. Until this commit, UniPhier boards have achieved this by (ab)using board_flash_wp_on() because the boot failed if flash_size got zero. Fortunately, this problem was solved by commit 70879a92561a (flash: do not fail even if flash_size is zero). Now it is possible to throw away such a tricky workaround. This commit also enables CONFIG_SYS_MAX_FLASH_BANKS_DETECT for further refactoring. Signed-off-by: Masahiro Yamada

ARM: UniPhier: extend register area of init page table for PH1-sLD3

2014-12-08T15:08:33Z

0x20000000-0x2fffffff: assigned to ARM mpcore (sLD3 only) 0xf0000000-0xffffffff: assigned to Denali NAND controller (sLD3 only) Signed-off-by: Masahiro Yamada

ARM: UniPhier: add device tree sources for PH1-sLD3

2014-12-08T15:08:26Z

Signed-off-by: Masahiro Yamada

ARM: UniPhier: add more device nodes to device tree

2014-12-08T15:05:46Z

Add I2C controller and NAND controller devices. Fix indentation too. Signed-off-by: Masahiro Yamada

blackfin: include rather than define __iomem

2014-12-08T14:35:46Z

The macro __iomem is defined in include/linux/compiler.h. Let's include it rather than double __iomem defines. Signed-off-by: Masahiro Yamada Cc: Sonic Zhang

Replace with

2014-12-08T14:35:46Z

Including is enough for general use. Signed-off-by: Masahiro Yamada

Kbuild: introduce Makefile in arch/$ARCH/

2014-12-08T14:35:45Z

Introduce a Makefile under arch/$ARCH/ and include it in the top Makefile (similar to Linux kernel). This allows further refactoringi like moving architecture-specific code out of global makefiles, deprecating config variables (CPU, CPUDIR, SOC) or deprecating arch/$ARCH/config.mk. In contrary to Linux kernel, U-Boot defines the ARCH variable by Kconfig, thus the arch Makefile can only included conditionally after the top config.mk. Signed-off-by: Daniel Schwierzeck Acked-by: Masahiro Yamada