summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-07-27 15:25:28 +0930
committerJoel Stanley <joel@jms.id.au>2016-07-27 15:44:01 +0930
commitff0c513c85b89c4a1ff602f3bc54e4570d176e40 (patch)
treea64844afb7fab6d84bfb8dfec49b47b957c4b4eb /common
parenta83e1bc06bef1dc155b7f4d9f96f2bfc315d4dd7 (diff)
downloadtalos-obmc-uboot-ff0c513c85b89c4a1ff602f3bc54e4570d176e40.tar.gz
talos-obmc-uboot-ff0c513c85b89c4a1ff602f3bc54e4570d176e40.zip
aspeed: hacks made to common code
These are additions made by the Aspeed SDK outside of the arch directory. They need to be cleaned up and/or removed. Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'common')
-rw-r--r--common/exports.c6
-rw-r--r--common/image.c11
2 files changed, 17 insertions, 0 deletions
diff --git a/common/exports.c b/common/exports.c
index b4f1f7af15..568be21fc9 100644
--- a/common/exports.c
+++ b/common/exports.c
@@ -21,6 +21,12 @@ unsigned long get_version(void)
# define phy_find_by_mask dummy
# define mdio_phydev_for_ethname dummy
# define miiphy_set_current_dev dummy
+#ifdef CONFIG_FMC_SPI
+# define spi_dma dummy
+#endif
+#endif
+#ifndef CONFIG_AST_SPI_NOR
+# define memmove_dma dummy
#endif
void jumptable_init(void)
diff --git a/common/image.c b/common/image.c
index 0be09e5c63..20c4807bde 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1069,6 +1069,17 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
return 1;
}
}
+/// TODO ... Check Why ..................
+#if defined(CONFIG_ARCH_ASPEED)
+ /*
+ * We need to copy the ramdisk to SRAM to let Linux boot
+ */
+ if (rd_data) {
+ memmove ((void *)rd_load, (uchar *)rd_data, rd_len);
+ rd_data = rd_load;
+ }
+#endif /* CONFIG_ASPEED */
+
} else if (images->legacy_hdr_valid &&
image_check_type(&images->legacy_hdr_os_copy,
IH_TYPE_MULTI)) {
OpenPOWER on IntegriCloud