summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2017-04-07 14:29:36 -0500
committerTom Rini <trini@konsulko.com>2017-04-08 21:35:08 -0400
commit6dca5e8ab5c1c896b9abf1f55e42428cb3709102 (patch)
tree2ad207d65ab018d3e22ef492bdb2e84aadec857a
parent046732df5048624bd2a6fe758677020c71d64494 (diff)
spl: net: Add FIT image support over network boot
FIT support in the net boot case is much like the RAM boot case in that we load our image to "load_addr" and pass a dummy read function into "spl_load_simple_fit()". As the load address is no longer hard-coded to the final execution address, legacy image loading will require load_addr to be set correctly in the image header. Signed-off-by: Andrew F. Davis <afd@ti.com>
-rw-r--r--common/spl/spl_net.c34
1 files changed, 31 insertions, 3 deletions
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 0fba0172ea..85fe508b17 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -11,19 +11,29 @@
#include <errno.h>
#include <spl.h>
#include <net.h>
+#include <libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
+static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
+ ulong count, void *buf)
+{
+ debug("%s: sector %lx, count %lx, buf %lx\n",
+ __func__, sector, count, (ulong)buf);
+ memcpy(buf, (void *)(load_addr + sector), count);
+ return count;
+}
+
static int spl_net_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
+ struct image_header *header = (struct image_header *)load_addr;
int rv;
env_init();
env_relocate();
setenv("autoload", "yes");
- load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
rv = eth_initialize();
if (rv == 0) {
printf("No Ethernet devices found\n");
@@ -36,8 +46,26 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
printf("Problem booting with BOOTP\n");
return rv;
}
- return spl_parse_image_header(spl_image,
- (struct image_header *)load_addr);
+
+ if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+ image_get_magic(header) == FDT_MAGIC) {
+ struct spl_load_info load;
+
+ debug("Found FIT\n");
+ load.bl_len = 1;
+ load.read = spl_net_load_read;
+ rv = spl_load_simple_fit(spl_image, &load, 0, header);
+ } else {
+ debug("Legacy image\n");
+
+ rv = spl_parse_image_header(spl_image, header);
+ if (rv)
+ return rv;
+
+ memcpy((void *)spl_image->load_addr, header, spl_image->size);
+ }
+
+ return rv;
}
#endif