[U-Boot] [PATCH 0/3] ARM: uniphier: some more fixes for v2016.09
Masahiro Yamada (3): ARM: uniphier: display revision of Micro Support Card 3.6.x kindly ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN for sLD3 ARM: dts: uniphier: add u-boot,dm-pre-reloc to use eMMC boot on sLD3
arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-sld3.dtsi | 1 + arch/arm/mach-uniphier/micro-support-card.c | 7 ++++++- configs/uniphier_sld3_defconfig | 1 + 4 files changed, 16 insertions(+), 1 deletion(-)
The revision of the original support card (rev 3.5, rev 3.6) fits in the 8 bit width revision register. When it was extended in a weird way, it was versioned in the format of "3.6.x" (where it should have been "3.7", of course). What is worse, only the sub-level version "6.x" was recorded in the 8 bit width register, completely ignoring the compatibility of the revision register format.
This patch saves madly-versioned support cards by assuming the major version "3" when the MSB 4 bit of the register is read as "6". With this, the support card revision that were displayed as "6.10" is now corrected to "3.6.10".
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/mach-uniphier/micro-support-card.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index eeb515a..c1c51ef 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -38,7 +38,12 @@ static int support_card_show_revision(void) u32 revision;
revision = readl(MICRO_SUPPORT_CARD_REVISION); - printf("(CPLD version %d.%d)\n", revision >> 4, revision & 0xf); + revision &= 0xff; + + /* revision 3.6.x card changed the revision format */ + printf("(CPLD version %s%d.%d)\n", revision >> 4 == 6 ? "3." : "", + revision >> 4, revision & 0xf); + return 0; }
Commit 76c52ce29fd7 ("ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN to bind all nodes") missed to increase this config for sLD3.
This change is needed to add "u-boot,dm-pre-reloc" to some nodes; more devices are bound, more malloc memory is needed.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
configs/uniphier_sld3_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 598cde2..ca6c644 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER_SLD3=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld3-ref"
The eMMC on sLD3 is assigned with dedicated pins (only multiplexed with GPIO), so it shouldn't hurt to enable eMMC on SPL all the time.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-sld3.dtsi | 1 + 2 files changed, 9 insertions(+)
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts index 099df83..0863588 100644 --- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts +++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts @@ -85,3 +85,11 @@ &serial0 { u-boot,dm-pre-reloc; }; + +&mio { + u-boot,dm-pre-reloc; +}; + +&emmc { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi b/arch/arm/dts/uniphier-ph1-sld3.dtsi index c3adaf1..6a95541 100644 --- a/arch/arm/dts/uniphier-ph1-sld3.dtsi +++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi @@ -61,6 +61,7 @@ #size-cells = <1>; ranges; interrupt-parent = <&intc>; + u-boot,dm-pre-reloc;
timer@20000200 { compatible = "arm,cortex-a9-global-timer";
2016-08-25 17:02 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
Masahiro Yamada (3): ARM: uniphier: display revision of Micro Support Card 3.6.x kindly ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN for sLD3 ARM: dts: uniphier: add u-boot,dm-pre-reloc to use eMMC boot on sLD3
Series, applied to u-boot-uniphier/master.
participants (1)
-
Masahiro Yamada