Skip to contentSkip to conversation

powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

PATCH New Stefan Roese 2 participants 9 messages Jan 26, 2015 PowerPC

lore
Share & tools
lore

Stefan Roese

author
#0 lore raw

PATCH 1/4 powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

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

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 board/amcc/canyonlands/Kconfig | 1 +
 1 file changed, 1 insertion(+)
board/amcc/canyonlands/Kconfig +1 -0
index bfdf17a..97df3f8 100644
@@ -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
Signature · 1 line
2.2.2
author
#1 lore raw

PATCH 2/4 powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED

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 <[email protected]>
Cc Simon Glass <[email protected]>
---
 configs/canyonlands_defconfig     | 2 +-
 configs/glacier_defconfig         | 2 +-
 configs/glacier_ramboot_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configs/canyonlands_defconfig +1 -1
index 6f6cf14..44d4fbd 100644
@@ -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
configs/glacier_defconfig +1 -1
index e67fa32..d318f82 100644
@@ -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
configs/glacier_ramboot_defconfig +1 -1
index e5b402e..f8363b2 100644
@@ -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
Signature · 1 line
2.2.2
#2 lore raw

PATCH 2/4 powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED

Quoted 5 lines · 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.

Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 configs/canyonlands_defconfig     | 2 +-
 configs/glacier_defconfig         | 2 +-
 configs/glacier_ramboot_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by Simon Glass <[email protected]>
author
#3 lore raw

PATCH 3/4 powerpc: ppc4xx: Add defaults for DT based booting to really work

In reply to 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 <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/powerpc/dts/canyonlands.dts | 6 ++++++
 arch/powerpc/dts/glacier.dts     | 3 +++
 2 files changed, 9 insertions(+)
arch/powerpc/dts/canyonlands.dts +6 -0
index 2ec9762..0a2f5d7 100644
@@ -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>;
arch/powerpc/dts/glacier.dts +3 -0
index 3e7ce2c..bb4e819 100644
@@ -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>;
Signature · 1 line
2.2.2
#4 lore raw

PATCH 3/4 powerpc: ppc4xx: Add defaults for DT based booting to really work

Quoted 6 lines · 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

Quoted 6 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/powerpc/dts/canyonlands.dts | 6 ++++++
 arch/powerpc/dts/glacier.dts     | 3 +++
 2 files changed, 9 insertions(+)
Reviewed-by Simon Glass <[email protected]>
author
#5 lore raw

PATCH 4/4 powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

In reply to Stefan Roese

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

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 board/amcc/canyonlands/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
board/amcc/canyonlands/Kconfig +4 -0
index 97df3f8..3dc76ae 100644
@@ -29,6 +29,10 @@ config ARCHES
 
 endchoice
 
+config DISPLAY_BOARDINFO
+	bool
+	default y
+
 config DM
 	default y
Signature · 1 line
2.2.2
#6 lore raw

PATCH 4/4 powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

Quoted 8 lines · Stefan Roese

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

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 board/amcc/canyonlands/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
Reviewed-by Simon Glass <[email protected]>

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

- Simon

author
#7 lore raw

PATCH 4/4 powerpc: ppc4xx: Enable CONFIG_DISPLAY_BOARDINFO

Quoted 10 lines · Simon Glass
Quoted 8 lines · Stefan Roese

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

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
  board/amcc/canyonlands/Kconfig | 4 ++++
  1 file changed, 4 insertions(+)
Quoted 3 lines
Reviewed-by Simon Glass <[email protected]>

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

#8 lore raw

PATCH 1/4 powerpc: ppc4xx: Add missing type for SYS_MALLOC_F_LEN in Kconfig

In reply to Stefan Roese

Hi Stefan,

Quoted 13 lines · Stefan Roese

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

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
---
 board/amcc/canyonlands/Kconfig | 1 +
 1 file changed, 1 insertion(+)
board/amcc/canyonlands/Kconfig +0 -0
index bfdf17a..97df3f8 100644

board/amcc/canyonlands/Kconfig config DM_SERIAL · line 42

Quoted 7 lines
board/amcc/canyonlands/Kconfig +1 -0
@@ -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 <[email protected]>

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

Regards,
Simon