summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-07 11:51:39 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:30 -0700
commit1d60f2b9860d3ba3563718d479a455495197f00d (patch)
treec42a8cff1ad96343bbbe9fcd19e23d12db682ae8
parent00cca639d56e791e5bea16b0e77d9540651132fe (diff)
downloadu-boot-imx-1d60f2b9860d3ba3563718d479a455495197f00d.zip
u-boot-imx-1d60f2b9860d3ba3563718d479a455495197f00d.tar.gz
u-boot-imx-1d60f2b9860d3ba3563718d479a455495197f00d.tar.bz2
powerpc: ppc4xx: canyonlands: Move to generic board
Switch to generic board so that this board will not be broken/removed. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/powerpc/cpu/ppc4xx/cpu_init.c2
-rw-r--r--include/configs/canyonlands.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index e5a0e21..5f5c720 100644
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
@@ -450,10 +450,12 @@ cpu_init_f (void)
PLB4Ax_ACR_RDP_4DEEP);
#endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
+#ifndef CONFIG_SYS_GENERIC_BOARD
gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
/* Clear initial global data */
memset((void *)gd, 0, sizeof(gd_t));
+#endif
}
/*
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index ed790cc..7a1499d 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -13,6 +13,8 @@
#include <linux/kconfig.h>
+#define CONFIG_SYS_GENERIC_BOARD
+
/*-----------------------------------------------------------------------
* High Level Configuration Options
*----------------------------------------------------------------------*/