diff options
| author | Michael Jones <michael.jones@matrix-vision.de> | 2013-02-07 23:53:37 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-18 13:51:20 -0500 |
| commit | bb4d46455c017e40e2c5d78ad78465a270565f9e (patch) | |
| tree | 7d5b8b5cd50cbd34a478fdb1b9c0920636f245ea | |
| parent | 71c4ae3f6db39b888497923573bff215b64a36bd (diff) | |
| download | u-boot-imx-bb4d46455c017e40e2c5d78ad78465a270565f9e.zip u-boot-imx-bb4d46455c017e40e2c5d78ad78465a270565f9e.tar.gz u-boot-imx-bb4d46455c017e40e2c5d78ad78465a270565f9e.tar.bz2 | |
omap3: mvblx: pass FPGA version to the kernel
Extract FPGA version from the .rbf and pass this info to the kernel.
Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
| -rw-r--r-- | board/matrix_vision/mvblx/fpga.c | 14 | ||||
| -rw-r--r-- | include/configs/omap3_mvblx.h | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/board/matrix_vision/mvblx/fpga.c b/board/matrix_vision/mvblx/fpga.c index dacc138..3fcf968 100644 --- a/board/matrix_vision/mvblx/fpga.c +++ b/board/matrix_vision/mvblx/fpga.c @@ -31,6 +31,7 @@ #include <ACEX1K.h> #include <command.h> #include <asm/gpio.h> +#include <linux/byteorder/generic.h> #include "fpga.h" #ifdef FPGA_DEBUG @@ -209,9 +210,20 @@ int fpga_wr_fn(const void *buf, size_t len, int flush, int cookie) { unsigned char *data = (unsigned char *) buf; int i; + int headerlen = len - cyclone2.size; + + if (headerlen < 0) + return FPGA_FAIL; + else if (headerlen == sizeof(uint32_t)) { + const unsigned int fpgavers_len = 11; /* '0x' + 8 hex digits + \0 */ + char fpgavers_str[fpgavers_len]; + snprintf(fpgavers_str, fpgavers_len, "0x%08x", + be32_to_cpup((uint32_t*)data)); + setenv("fpgavers", fpgavers_str); + } fpga_debug("fpga_wr: buf %p / size %d\n", buf, len); - for (i = 0; i < len; i++) + for (i = headerlen; i < len; i++) _write_fpga(data[i]); fpga_debug("-%s\n", __func__); diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 7bb05ca..376a3d0 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -185,6 +185,7 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype} " \ + "mvfw.fpgavers=${fpgavers} " \ "${cmdline_suffix}\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc ...; " \ |