diff mbox

[U-Boot,v2,17/19] powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED

Message ID 1423335112-24585-18-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Feb. 7, 2015, 6:51 p.m. UTC
From: Stefan Roese <sr@denx.de>

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 configs/canyonlands_defconfig     | 2 +-
 configs/glacier_defconfig         | 2 +-
 configs/glacier_ramboot_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Simon Glass Feb. 11, 2015, 7:41 p.m. UTC | #1
On 7 February 2015 at 11:51, Simon Glass <sjg@chromium.org> wrote:
> From: Stefan Roese <sr@denx.de>
>
> 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>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  configs/canyonlands_defconfig     | 2 +-
>  configs/glacier_defconfig         | 2 +-
>  configs/glacier_ramboot_defconfig | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Applied to u-boot-dm, thanks!
Masahiro Yamada Feb. 19, 2015, 10:45 a.m. UTC | #2
Hi,



On Sat,  7 Feb 2015 11:51:50 -0700
Simon Glass <sjg@chromium.org> wrote:

> From: Stefan Roese <sr@denx.de>
> 
> 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>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---


It this a common requirement for PowerPC architecture?
If so, does it make sense to change default value only for PowerPC?


choice
        prompt "Provider of DTB for DT control"
        depends on OF_CONTROL
        default OF_EMBED if PPC


Or, introduce OF_SEPARATE_TOP ??
I do not know...


Best Regards
Masahiro Yamada
Stefan Roese Feb. 19, 2015, 10:57 a.m. UTC | #3
On 19.02.2015 11:45, Masahiro Yamada wrote:
> On Sat,  7 Feb 2015 11:51:50 -0700
> Simon Glass <sjg@chromium.org> wrote:
>
>> From: Stefan Roese <sr@denx.de>
>>
>> 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>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>
>
> It this a common requirement for PowerPC architecture?

No. Its specific to PPC4xx, and perhaps some other PPC variants. But not 
generally for PowerPC.

> If so, does it make sense to change default value only for PowerPC?

Might make sense. Or perhaps even for PPC4xx?

>
> choice
>          prompt "Provider of DTB for DT control"
>          depends on OF_CONTROL
>          default OF_EMBED if PPC

           default OF_EMBED if 4xx

Does this work?

Thanks,
Stefan
diff mbox

Patch

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