diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-19 11:25:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-19 11:25:36 -0500 |
| commit | aa7077fcee6cf00cde59bb9709ebd6205720f8bf (patch) | |
| tree | 067a13ac5342287fbbc1429425b2e87f9f28106b /common | |
| parent | 4c60850792e003bcafd16c324237a19307763829 (diff) | |
| parent | bdaeb8f23c6d5d11829072baaf0c0fe37c09f26a (diff) | |
| download | u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.zip u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.gz u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.bz2 | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_mii.c | 5 | ||||
| -rw-r--r-- | common/image.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/common/cmd_mii.c b/common/cmd_mii.c index 5e9079d..7ef7532 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -314,6 +314,11 @@ static int do_mii(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) mask = simple_strtoul(argv[5], NULL, 16); } + if (addrhi > 31) { + printf("Incorrect PHY address. Range should be 0-31\n"); + return CMD_RET_USAGE; + } + /* use current device */ devname = miiphy_get_current_dev(); diff --git a/common/image.c b/common/image.c index 85c4f39..c36927f 100644 --- a/common/image.c +++ b/common/image.c @@ -158,6 +158,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_RKIMAGE, "rkimage", "Rockchip Boot Image" }, { IH_TYPE_RKSD, "rksd", "Rockchip SD Boot Image" }, { IH_TYPE_RKSPI, "rkspi", "Rockchip SPI Boot Image" }, + { IH_TYPE_ZYNQIMAGE, "zynqimage", "Xilinx Zynq Boot Image" }, { -1, "", "", }, }; |