Hi Tom,
If it is not too late, please let me replace the PR I sent yesterday
with this one.
This includes one fixes.
The following changes since commit 97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9:
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86 (2014-12-04
09:24:05 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-uniphier.git master
for you to fetch changes up to 7a3620b24649663857d99e8ab73ec0b3bd60e50e:
ARM: UniPhier: detect the number of flash banks at run-time
(2014-12-09 00:08:33 +0900)
----------------------------------------------------------------
Masahiro Yamada (11):
ARM: UniPhier: remove Denali NAND controller fixup code
flash: do not fail even if flash_size is zero
ARM: UniPhier: disable autostart by default
ARM: UniPhier: use boot_is_swapped() macro for readability
ARM: UniPhier: move CONFIG_UNIPHIER_SMP to Kconfig
ARM: UniPhier: move support card select to Kconfig
ARM: UniPhier: merge UniPhier config headers into a single file
ARM: UniPhier: add more device nodes to device tree
ARM: UniPhier: add device tree sources for PH1-sLD3
ARM: UniPhier: extend register area of init page table for PH1-sLD3
ARM: UniPhier: detect the number of flash banks at run-time
arch/arm/cpu/armv7/uniphier/Kconfig | 31 ++++++++-
arch/arm/cpu/armv7/uniphier/Makefile | 1 +
arch/arm/cpu/armv7/uniphier/board_early_init_r.c | 15 +++++
arch/arm/cpu/armv7/uniphier/board_late_init.c | 38 -----------
arch/arm/cpu/armv7/uniphier/init_page_table.c | 7 ++-
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 20 +++---
arch/arm/cpu/armv7/uniphier/support_card.c | 125
+++++++++++++++++++++++++------------
arch/arm/dts/Makefile | 1 +
arch/arm/dts/uniphier-ph1-ld4-ref.dts | 27 ++++++--
arch/arm/dts/uniphier-ph1-ld4.dtsi | 44 ++++++++++++-
arch/arm/dts/uniphier-ph1-pro4-ref.dts | 29 +++++++--
arch/arm/dts/uniphier-ph1-pro4.dtsi | 64 ++++++++++++++++++-
arch/arm/dts/uniphier-ph1-sld3-ref.dts | 60 ++++++++++++++++++
arch/arm/dts/uniphier-ph1-sld3.dtsi | 125
+++++++++++++++++++++++++++++++++++++
arch/arm/dts/uniphier-ph1-sld8-ref.dts | 27 ++++++--
arch/arm/dts/uniphier-ph1-sld8.dtsi | 44 ++++++++++++-
arch/arm/include/asm/arch-uniphier/board.h | 7 +++
common/board_r.c | 18 +-----
configs/ph1_ld4_defconfig | 1 +
configs/ph1_pro4_defconfig | 1 +
configs/ph1_sld8_defconfig | 1 +
include/configs/ph1_ld4.h | 53 ----------------
include/configs/ph1_pro4.h | 55 ----------------
include/configs/ph1_sld8.h | 55 ----------------
include/configs/{uniphier-common.h => uniphier.h} | 63 ++++++++++++++-----
25 files changed, 611 insertions(+), 301 deletions(-)
create mode 100644 arch/arm/cpu/armv7/uniphier/board_early_init_r.c
create mode 100644 arch/arm/dts/uniphier-ph1-sld3-ref.dts
create mode 100644 arch/arm/dts/uniphier-ph1-sld3.dtsi
delete mode 100644 include/configs/ph1_ld4.h
delete mode 100644 include/configs/ph1_pro4.h
delete mode 100644 include/configs/ph1_sld8.h
rename include/configs/{uniphier-common.h => uniphier.h} (84%)
--
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
