diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-04 14:34:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-04 14:34:09 -0400 |
| commit | 4ed6ed3c27a069a00c8a557d606a05276cc4653e (patch) | |
| tree | edb142ac2c9c220f4f422672ae115d85ee831d3e /arch/arm | |
| parent | 7e10a7c3bc382ff79bb6746944a0a4a0073a0faf (diff) | |
| parent | 07654ba1e37e0de2ee3a5983ad510a8c2dd21035 (diff) | |
| download | u-boot-imx-4ed6ed3c27a069a00c8a557d606a05276cc4653e.zip u-boot-imx-4ed6ed3c27a069a00c8a557d606a05276cc4653e.tar.gz u-boot-imx-4ed6ed3c27a069a00c8a557d606a05276cc4653e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/Kconfig | 15 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/sys_proto.h | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index 9a19dfa..6c71d78 100644 --- a/arch/arm/cpu/armv8/zynqmp/Kconfig +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig @@ -1,13 +1,5 @@ if ARCH_ZYNQMP -choice - prompt "Xilinx ZynqMP board select" - -config TARGET_ZYNQMP_EP - bool "ZynqMP EP Board" - -endchoice - config SYS_BOARD default "zynqmp" @@ -18,7 +10,12 @@ config SYS_SOC default "zynqmp" config SYS_CONFIG_NAME - default "xilinx_zynqmp_ep" if TARGET_ZYNQMP_EP + string "Board configuration name" + default "xilinx_zynqmp" + help + This option contains information about board configuration name. + Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header + will be used for board configuration. config ZYNQMP_USB bool "Configure ZynqMP USB" diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h index 882beab..44c9b50 100644 --- a/arch/arm/mach-zynq/include/mach/sys_proto.h +++ b/arch/arm/mach-zynq/include/mach/sys_proto.h @@ -19,6 +19,8 @@ extern int zynq_slcr_get_mio_pin_status(const char *periph); extern void zynq_ddrc_init(void); extern unsigned int zynq_get_silicon_version(void); +int zynq_board_read_rom_ethaddr(unsigned char *ethaddr); + /* Driver extern functions */ extern void ps7_init(void); |