diff options
author | Tom Rini <trini@konsulko.com> | 2017-12-18 12:23:27 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-12-18 12:23:27 -0500 |
commit | 90d75d2efc376094b50d84de80e9cb8b3bcae032 (patch) | |
tree | a5bcce535313c824bca832b9b9ccbc7f870d35fa /arch/arm/include | |
parent | a9e670d46f1916d6fb925244d5d4c9a48db8e26b (diff) | |
parent | 3e229a83bd4190f99731992d3a56983f29313899 (diff) |
Merge tag 'xilinx-for-v2018.01-rc2-v2' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2018.01-rc2-v2
fpga:
- Enable loading bitstream via fit image for !xilinx platforms
zynq:
- Fix SPL SD boot mode
zynqmp:
- Not not reset in panic
- Do not use simple allocator because of fat changes
- Various dt chagnes
- modeboot variable setup
- Fix fpga loading on automotive devices
- Fix coverity issues
test:
- Fix env test for !hush case - Stephen's patch
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/arch-zynqmp/sys_proto.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h index f256c7d4a9..ad28568633 100644 --- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h +++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h @@ -30,6 +30,7 @@ enum { TCM_SPLIT, }; +int zynq_board_read_rom_ethaddr(unsigned char *ethaddr); unsigned int zynqmp_get_silicon_version(void); void psu_init(void); |