[U-Boot] [PATCH 1/4] powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

[U-Boot] [PATCH 1/4] powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

[Stefan Roese]

Otherwise this symbol will not be created in the .config.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 board/amcc/canyonlands/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index bfdf17a..97df3f8 100644
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@@ -36,6 +36,7 @@ config DM_SERIAL
 	default y
 
 config SYS_MALLOC_F_LEN
+	hex "Size of the malloc() pool for use before relocation."
 	default 0x400
 
 config DEBUG_UART_BASE
-- 
2.2.2

[U-Boot] [PATCH 2/4] powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED

[Stefan Roese]

This is necessary, as ppc4xx has the reset vector located at the end
of the U-Boot image. This needs to be flashed to the end of the NOR
flash. Adding the dtb to the main U-Boot image will break booting
on ppc4xx. This patch now embeds the dtb in the U-Boot image instead.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 configs/canyonlands_defconfig     | 2 +-
 configs/glacier_defconfig         | 2 +-
 configs/glacier_ramboot_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 6f6cf14..44d4fbd 100644
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_CANYONLANDS=y
 CONFIG_CANYONLANDS=y
 CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_SEPARATE=y
+CONFIG_OF_EMBED=y
diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index e67fa32..d318f82 100644
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -4,4 +4,4 @@ CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_SEPARATE=y
+CONFIG_OF_EMBED=y
diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index e5b402e..f8363b2 100644
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -5,4 +5,4 @@ CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
 CONFIG_DEFAULT_DEVICE_TREE="glacier"
 CONFIG_OF_CONTROL=y
-CONFIG_OF_SEPARATE=y
+CONFIG_OF_EMBED=y
-- 
2.2.2

[U-Boot] [PATCH 2/4] powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED

[Simon Glass]

On 26 January 2015 at 06:35, Stefan Roese <sr@denx.de> wrote:
> This is necessary, as ppc4xx has the reset vector located at the end
> of the U-Boot image. This needs to be flashed to the end of the NOR
> flash. Adding the dtb to the main U-Boot image will break booting
> on ppc4xx. This patch now embeds the dtb in the U-Boot image instead.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  configs/canyonlands_defconfig     | 2 +-
>  configs/glacier_defconfig         | 2 +-
>  configs/glacier_ramboot_defconfig | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 3/4] powerpc: ppc4xx: Add defaults for DT based booting to really work

[Stefan Roese]

These additional nodes need to be provided to get U-Boot to boot correctly
on the Canyonlands / Glacier board:

- chosen path to the console-uart
- reg-shift set to 0 in the uart device nodes

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 arch/powerpc/dts/canyonlands.dts | 6 ++++++
 arch/powerpc/dts/glacier.dts     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/arch/powerpc/dts/canyonlands.dts b/arch/powerpc/dts/canyonlands.dts
index 2ec9762..0a2f5d7 100644
--- a/arch/powerpc/dts/canyonlands.dts
+++ b/arch/powerpc/dts/canyonlands.dts
@@ -22,6 +22,10 @@
 		serial1 = &UART1;
 	};
 
+	chosen {
+		stdout-path = &UART0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -280,6 +284,7 @@
 
 			UART0: serial at ef600300 {
 				device_type = "serial";
+				reg-shift = <0>;
 				compatible = "ns16550";
 				reg = <0xef600300 0x00000008>;
 				virtual-reg = <0xef600300>;
@@ -291,6 +296,7 @@
 
 			UART1: serial at ef600400 {
 				device_type = "serial";
+				reg-shift = <0>;
 				compatible = "ns16550";
 				reg = <0xef600400 0x00000008>;
 				virtual-reg = <0xef600400>;
diff --git a/arch/powerpc/dts/glacier.dts b/arch/powerpc/dts/glacier.dts
index 3e7ce2c..bb4e819 100644
--- a/arch/powerpc/dts/glacier.dts
+++ b/arch/powerpc/dts/glacier.dts
@@ -251,6 +251,7 @@
 
 			UART1: serial at ef600400 {
 				device_type = "serial";
+				reg-shift = <0>;
 				compatible = "ns16550";
 				reg = <0xef600400 0x00000008>;
 				virtual-reg = <0xef600400>;
@@ -262,6 +263,7 @@
 
 			UART2: serial at ef600500 {
 				device_type = "serial";
+				reg-shift = <0>;
 				compatible = "ns16550";
 				reg = <0xef600500 0x00000008>;
 				virtual-reg = <0xef600500>;
@@ -273,6 +275,7 @@
 
 			UART3: serial at ef600600 {
 				device_type = "serial";
+				reg-shift = <0>;
 				compatible = "ns16550";
 				reg = <0xef600600 0x00000008>;
 				virtual-reg = <0xef600600>;
-- 
2.2.2

[U-Boot] [PATCH 3/4] powerpc: ppc4xx: Add defaults for DT based booting to really work

[Simon Glass]

On 26 January 2015 at 06:35, Stefan Roese <sr@denx.de> wrote:
> These additional nodes need to be provided to get U-Boot to boot correctly
> on the Canyonlands / Glacier board:
>
> - chosen path to the console-uart
> - reg-shift set to 0 in the uart device nodes
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  arch/powerpc/dts/canyonlands.dts | 6 ++++++
>  arch/powerpc/dts/glacier.dts     | 3 +++
>  2 files changed, 9 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH 4/4] powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

[Stefan Roese]

This also displays the "Board:" line in the bootup text with the
generic board support code.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
---
 board/amcc/canyonlands/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index 97df3f8..3dc76ae 100644
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@@ -29,6 +29,10 @@ config ARCHES
 
 endchoice
 
+config DISPLAY_BOARDINFO
+	bool
+	default y
+
 config DM
 	default y
 
-- 
2.2.2

[U-Boot] [PATCH 4/4] powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

[Simon Glass]

On 26 January 2015 at 06:35, Stefan Roese <sr@denx.de> wrote:
> This also displays the "Board:" line in the bootup text with the
> generic board support code.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  board/amcc/canyonlands/Kconfig | 4 ++++
>  1 file changed, 4 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

Is there another patch which adds this in the top level Kconfig?

- Simon

[U-Boot] [PATCH 4/4] powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

[Stefan Roese]

On 26.01.2015 17:09, Simon Glass wrote:
> On 26 January 2015 at 06:35, Stefan Roese <sr@denx.de> wrote:
>> This also displays the "Board:" line in the bootup text with the
>> generic board support code.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Simon Glass <sjg@chromium.org>
>> ---
>>   board/amcc/canyonlands/Kconfig | 4 ++++
>>   1 file changed, 4 insertions(+)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> Is there another patch which adds this in the top level Kconfig?

No, not yet. At least not to my knowledge. Sorry, I missed adding it 
there. I'm still not used to adding the options correctly to Kconfig.

Thanks,
Stefan

[U-Boot] [PATCH 1/4] powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

[Simon Glass]

Hi Stefan,

On 26 January 2015 at 06:35, Stefan Roese <sr@denx.de> wrote:
> Otherwise this symbol will not be created in the .config.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  board/amcc/canyonlands/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
> index bfdf17a..97df3f8 100644
> --- a/board/amcc/canyonlands/Kconfig
> +++ b/board/amcc/canyonlands/Kconfig
> @@ -36,6 +36,7 @@ config DM_SERIAL
>         default y
>
>  config SYS_MALLOC_F_LEN
> +       hex "Size of the malloc() pool for use before relocation."
>         default 0x400
>
>  config DEBUG_UART_BASE

Reviewed-by: Simon Glass <sjg@chromium.org>

I need to respin the series that added this option, so that this patch
isn't needed.

Regards,
Simon