powerpc: ppc4xx: Use CONFIG_OF_CONTROL for canyonlands boards

Enable CONFIG_OF_CONTROL so that U-Boot on these three boards uses a device
tree for its configuration.

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

diff --git a/board/amcc/canyonlands/u-boot-ram.lds b/board/amcc/canyonlands/u-boot-ram.lds
index 67652569f4bf94499648a07fe5be8ea87c57abba..1750c74a197a7cd34bae4bccd120b55114b28434 100644 (file)
--- a/board/amcc/canyonlands/u-boot-ram.lds
+++ b/board/amcc/canyonlands/u-boot-ram.lds
@@ -12,6 +12,7 @@ SECTIONS
   . = + SIZEOF_HEADERS;
   .text      :
   {
+    _image_copy_start = .;
     arch/powerpc/cpu/ppc4xx/start.o    (.text*)
     board/amcc/canyonlands/init.o      (.text*)
 
@@ -61,9 +62,14 @@ SECTIONS
   . = ALIGN(256);
   __init_begin = .;
   .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(256);
+  .data.init : {
+       *(.data.init)
+       . = ALIGN(256);
+       LONG(0) LONG(0)         /* Extend u-boot.bin to here */
+  }
   __init_end = .;
+  _end = .;
+  _image_binary_end = .;
 
   __bss_start = .;
   .bss (NOLOAD)       :

diff --git a/configs/arches_defconfig b/configs/arches_defconfig
index 60e6ef9098dba27e8c1b1cb3bb7adbea77843e81..30c6932358aa71ac9236d4e1d9469261927804fc 100644 (file)
--- a/configs/arches_defconfig
+++ b/configs/arches_defconfig
@@ -2,3 +2,6 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_ARCHES=y
+CONFIG_DEFAULT_DEVICE_TREE="arches"
+CONFIG_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y

diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig
index 37a2b4d79681b9fa68d0b13907e8b206e3e47094..6f6cf14811ccb4f2e9222d3a7a4dce6e4f2a8864 100644 (file)
--- a/configs/canyonlands_defconfig
+++ b/configs/canyonlands_defconfig
@@ -2,3 +2,6 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_CANYONLANDS=y
+CONFIG_DEFAULT_DEVICE_TREE="canyonlands"
+CONFIG_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y

diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig
index 436b9f8d0311fa4a1ef72b922287b17c6aa9df44..e67fa32f56082d04c843b2e895cc40fe00917544 100644 (file)
--- a/configs/glacier_defconfig
+++ b/configs/glacier_defconfig
@@ -2,3 +2,6 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
+CONFIG_DEFAULT_DEVICE_TREE="glacier"
+CONFIG_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y

diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig
index 4fc23038e84b0bc71d007860c92a225164e71b0d..e5b402e74728e1a48c7ebf246fcb3fde3ed92a9f 100644 (file)
--- a/configs/glacier_ramboot_defconfig
+++ b/configs/glacier_ramboot_defconfig
@@ -3,3 +3,6 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_CANYONLANDS=y
 CONFIG_GLACIER=y
+CONFIG_DEFAULT_DEVICE_TREE="glacier"
+CONFIG_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y