summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-02-07 11:51:50 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:32 -0700
commitf693e7f5140382ba6cb76e532852efb5ccfb7c9a (patch)
tree6eab114fcf8ba01a07c9a578f14c6077d7b644ee
parent0df09047fadc7f3d097a132120da8f10278e4a0d (diff)
downloadu-boot-imx-f693e7f5140382ba6cb76e532852efb5ccfb7c9a.zip
u-boot-imx-f693e7f5140382ba6cb76e532852efb5ccfb7c9a.tar.gz
u-boot-imx-f693e7f5140382ba6cb76e532852efb5ccfb7c9a.tar.bz2
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>
-rw-r--r--configs/canyonlands_defconfig2
-rw-r--r--configs/glacier_defconfig2
-rw-r--r--configs/glacier_ramboot_defconfig2
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