[U-Boot] [PATCH 0/5] ARM: UniPhier: minor fixes
Masahiro Yamada (5): ARM: UniPhier: fix property names of aliases nodes of device trees ARM: UniPhier: remove unnecessary ifdef conditional ARM: UniPhier: use DRAM area for init stack of normal image ARM: UniPhier: select CONFIG_SPL ARM: UniPhier: enable CONFIG_CMD_DM
arch/arm/Kconfig | 1 + arch/arm/cpu/armv7/uniphier/init_page_table.c | 4 ---- arch/arm/dts/uniphier-ph1-ld4-ref.dts | 8 ++++---- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 8 ++++---- arch/arm/dts/uniphier-ph1-sld3-ref.dts | 6 +++--- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 8 ++++---- configs/ph1_ld4_defconfig | 1 - configs/ph1_pro4_defconfig | 1 - configs/ph1_sld8_defconfig | 1 - include/configs/uniphier.h | 6 ++++++ 10 files changed, 22 insertions(+), 22 deletions(-)
The property name of the "aliases" node should be "serial*" to assign a desired number for the device sequence number.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
arch/arm/dts/uniphier-ph1-ld4-ref.dts | 8 ++++---- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 8 ++++---- arch/arm/dts/uniphier-ph1-sld3-ref.dts | 6 +++--- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/dts/uniphier-ph1-ld4-ref.dts index 08bbd03..6855878 100644 --- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts @@ -25,10 +25,10 @@ };
aliases { - uart0 = &uart0; - uart1 = &uart1; - uart2 = &uart2; - uart3 = &uart3; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts index 23add7c..1227b62 100644 --- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts @@ -25,10 +25,10 @@ };
aliases { - uart0 = &uart0; - uart1 = &uart1; - uart2 = &uart2; - uart3 = &uart3; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts index 91b4dbe..fefc592 100644 --- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts +++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts @@ -25,9 +25,9 @@ };
aliases { - uart0 = &uart0; - uart1 = &uart1; - uart2 = &uart2; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/dts/uniphier-ph1-sld8-ref.dts index a8ce049..9b6d95c 100644 --- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts +++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts @@ -25,10 +25,10 @@ };
aliases { - uart0 = &uart0; - uart1 = &uart1; - uart2 = &uart2; - uart3 = &uart3; + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2;
init_page_table is only set on SPL.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
arch/arm/cpu/armv7/uniphier/init_page_table.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm/cpu/armv7/uniphier/init_page_table.c b/arch/arm/cpu/armv7/uniphier/init_page_table.c index a0d10a9..febb3c8 100644 --- a/arch/arm/cpu/armv7/uniphier/init_page_table.c +++ b/arch/arm/cpu/armv7/uniphier/init_page_table.c @@ -17,11 +17,7 @@ #define REG DEVICE /* IO Register: Device */ #define DDR DEVICE /* DDR SDRAM: Device */
-#ifdef CONFIG_SPL_BUILD #define IS_SPL_TEXT_AREA(x) ((x) == ((CONFIG_SPL_TEXT_BASE) >> 20)) -#else -#define IS_SPL_TEXT_AREA(x) ((x) == ((CONFIG_SYS_TEXT_BASE) >> 20)) -#endif
#define IS_INIT_STACK_AREA(x) ((x) == ((CONFIG_SYS_INIT_SP_ADDR) >> 20))
The normal image is working on DRAM. It is better to use DRAM also for init stack than L2 cache.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
include/configs/uniphier.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index dd022fb..ed22111 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -273,7 +273,11 @@ #define CONFIG_SYS_SPL_MALLOC_START (0x0ff00000) #define CONFIG_SYS_SPL_MALLOC_SIZE (0x00004000)
+#ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_INIT_SP_ADDR (0x0ff08000) +#else +#define CONFIG_SYS_INIT_SP_ADDR ((CONFIG_SYS_TEXT_BASE) - 0x00001000) +#endif
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_SUPPORT
Now UniPhier platform is only supported with SPL.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
arch/arm/Kconfig | 1 + configs/ph1_ld4_defconfig | 1 - configs/ph1_pro4_defconfig | 1 - configs/ph1_sld8_defconfig | 1 - 4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2b0d2c9..5eb1d03 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -800,6 +800,7 @@ config ARCH_UNIPHIER bool "Panasonic UniPhier platform" select CPU_V7 select SUPPORT_SPL + select SPL select OF_CONTROL if !SPL_BUILD
endchoice diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index 3155340..2e9dd00 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -1,4 +1,3 @@ -CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 7ea4e6e..5dca64b 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -1,4 +1,3 @@ -CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index ddf210c..2a6e334 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -1,4 +1,3 @@ -CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
include/configs/uniphier.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index ed22111..5a53c50 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -187,6 +187,8 @@ #define CONFIG_FAT_WRITE #define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_DM + /* memtest works on */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x01000000)
Hi Masahiro,
On 18 December 2014 at 03:11, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
include/configs/uniphier.h | 2 ++ 1 file changed, 2 insertions(+)
Note that this will become the default once we get the DM Kconfig series done.
Acked-by: Simon Glass sjg@chromium.org
(But I assume you will apply it)
Regards, Simon
2014-12-18 19:10 GMT+09:00 Masahiro Yamada yamada.m@jp.panasonic.com:
Masahiro Yamada (5): ARM: UniPhier: fix property names of aliases nodes of device trees ARM: UniPhier: remove unnecessary ifdef conditional ARM: UniPhier: use DRAM area for init stack of normal image ARM: UniPhier: select CONFIG_SPL ARM: UniPhier: enable CONFIG_CMD_DM
Series, applied to u-boot-uniphier
On Thu, Dec 18, 2014 at 11:41:35PM +0900, Masahiro YAMADA wrote:
2014-12-18 19:10 GMT+09:00 Masahiro Yamada yamada.m@jp.panasonic.com:
Masahiro Yamada (5): ARM: UniPhier: fix property names of aliases nodes of device trees ARM: UniPhier: remove unnecessary ifdef conditional ARM: UniPhier: use DRAM area for init stack of normal image ARM: UniPhier: select CONFIG_SPL ARM: UniPhier: enable CONFIG_CMD_DM
Series, applied to u-boot-uniphier
In public, as a reminder to everyone (not picking on Masahiro), as a rule of thumb please try and wait 24h between posting your patches and applying them to your own tree. The patches themselves are fine so I'll be taking the PR shortly.
participants (4)
-
Masahiro YAMADA -
Masahiro Yamada
-
Simon Glass -
Tom Rini