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

diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 6f6cf14811ccb4f2e9222d3a7a4dce6e4f2a8864..44d4fbdb9dbfa37f0dfb48e011fe6221dfefd2b3 100644 (file)
--- 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 e67fa32f56082d04c843b2e895cc40fe00917544..d318f82c4ca1b9480a4dc88a9f19fd804ddb53b4 100644 (file)
--- 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 e5b402e74728e1a48c7ebf246fcb3fde3ed92a9f..f8363b2e23eefd5ff0ed40fb3518689ff1e3df5a 100644 (file)
--- 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