diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-25 10:39:58 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-25 10:39:58 +0200 |
| commit | ed1d98d801dfb6384d0f2fff45ce1ebf884944ca (patch) | |
| tree | 5a9487c67b75606d3a723b7acb9eda8da200c871 /include/configs/iocon.h | |
| parent | 754466ac95e92ebf40e25c6af6f13ab9b4d7c87b (diff) | |
| parent | ba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab (diff) | |
| download | u-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.zip u-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.gz u-boot-imx-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/iocon.h')
| -rw-r--r-- | include/configs/iocon.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 79c4736..f36c2a3 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -62,8 +62,7 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_CACHE -#define CONFIG_CMD_FPGA -#define CONFIG_CMD_FPGA_LOADMK +#define CONFIG_CMD_FPGAD #undef CONFIG_CMD_EEPROM /* |