[PATCH] xilinx: common: Move ZYNQ_GEM_I2C_MAC_OFFSET to board Kconfig

[Michal Simek]

út 20. 10. 2020 v 9:19 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> There is no reason to have ZYNQ specific Kconfig macro in generic location
> to be visible for all other SoCs. That's why move it to Xilinx common
> location to be visible only for us.
> Also introduce new bool entry ZYNQ_MAC_IN_EEPROM to have also an option to
> disable it or enable. This has connection to code which is reading the
> whole content of i2c and also work with the rest of date not just with MAC
> address.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  board/xilinx/Kconfig                            | 17 +++++++++++++++++
>  ...azedev_cc_v1_0_ultrazedev_som_v1_0_defconfig |  3 ++-
>  configs/syzygy_hub_defconfig                    |  3 ++-
>  configs/xilinx_zynqmp_virt_defconfig            |  3 ++-
>  drivers/misc/Kconfig                            |  7 -------
>  5 files changed, 23 insertions(+), 10 deletions(-)
>
> diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
> index c80d0a881284..01d7f8eac1c9 100644
> --- a/board/xilinx/Kconfig
> +++ b/board/xilinx/Kconfig
> @@ -56,3 +56,20 @@ config BOOT_SCRIPT_OFFSET
>         default 0x7F80000 if ARCH_VERSAL
>         help
>            Specifies distro boot script offset in NAND/NOR flash.
> +
> +config ZYNQ_MAC_IN_EEPROM
> +       bool "Reading MAC address from EEPROM"
> +       help
> +         Enable this option if your MAC address is saved in eeprom and
> +         xlnx,eeprom DT property in chosen node points to it.
> +
> +if ZYNQ_MAC_IN_EEPROM
> +
> +config ZYNQ_GEM_I2C_MAC_OFFSET
> +       hex "Set the I2C MAC offset"
> +       default 0x0
> +       depends on DM_I2C
> +       help
> +         Set the MAC offset for i2C.
> +
> +endif
> diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> index 25282ba428af..2426179d442e 100644
> --- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> +++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
> @@ -8,6 +8,8 @@ CONFIG_DEBUG_UART_BASE=0xff000000
>  CONFIG_DEBUG_UART_CLOCK=100000000
>  CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI_SUPPORT=y
> +CONFIG_ZYNQ_MAC_IN_EEPROM=y
> +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xfa
>  CONFIG_DEFAULT_DEVICE_TREE="avnet-ultrazedev-cc-v1.0-ultrazedev-som-v1.0"
>  CONFIG_DEBUG_UART=y
>  CONFIG_DISTRO_DEFAULTS=y
> @@ -42,7 +44,6 @@ CONFIG_I2C_MUX=y
>  CONFIG_I2C_MUX_PCA954x=y
>  CONFIG_MISC=y
>  CONFIG_I2C_EEPROM=y
> -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xfa
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_SPI_FLASH_BAR=y
> diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
> index 8f6900661ac6..276c476baebc 100644
> --- a/configs/syzygy_hub_defconfig
> +++ b/configs/syzygy_hub_defconfig
> @@ -9,6 +9,8 @@ CONFIG_SPL_STACK_R_ADDR=0x200000
>  CONFIG_SPL=y
>  CONFIG_DEBUG_UART_BASE=0xe0000000
>  CONFIG_DEBUG_UART_CLOCK=50000000
> +CONFIG_ZYNQ_MAC_IN_EEPROM=y
> +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
>  CONFIG_DEFAULT_DEVICE_TREE="zynq-syzygy-hub"
>  CONFIG_DEBUG_UART=y
>  CONFIG_DISTRO_DEFAULTS=y
> @@ -40,7 +42,6 @@ CONFIG_FPGA_XILINX=y
>  CONFIG_FPGA_ZYNQPL=y
>  CONFIG_DM_I2C=y
>  CONFIG_SYS_I2C_CADENCE=y
> -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_PHY_MARVELL=y
> diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
> index 2370032c150a..21072249da45 100644
> --- a/configs/xilinx_zynqmp_virt_defconfig
> +++ b/configs/xilinx_zynqmp_virt_defconfig
> @@ -7,6 +7,8 @@ CONFIG_DM_GPIO=y
>  CONFIG_SPL=y
>  CONFIG_SPL_SPI_FLASH_SUPPORT=y
>  CONFIG_SPL_SPI_SUPPORT=y
> +CONFIG_ZYNQ_MAC_IN_EEPROM=y
> +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
>  CONFIG_PMUFW_INIT_FILE="/mnt/disk/u-boot-bins/zynqmp/pmu.bin"
>  CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE="/mnt/disk/u-boot/pmu_obj.bin"
>  CONFIG_ZYNQMP_USB=y
> @@ -93,7 +95,6 @@ CONFIG_LED=y
>  CONFIG_LED_GPIO=y
>  CONFIG_MISC=y
>  CONFIG_I2C_EEPROM=y
> -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
>  CONFIG_SYS_I2C_EEPROM_ADDR=0x0
>  CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
>  CONFIG_SUPPORT_EMMC_BOOT=y
> diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
> index b67e906a76b0..29432ae7eb43 100644
> --- a/drivers/misc/Kconfig
> +++ b/drivers/misc/Kconfig
> @@ -376,13 +376,6 @@ config SPL_I2C_EEPROM
>           This option is an SPL-variant of the I2C_EEPROM option.
>           See the help of I2C_EEPROM for details.
>
> -config ZYNQ_GEM_I2C_MAC_OFFSET
> -       hex "Set the I2C MAC offset"
> -       default 0x0
> -       depends on DM_I2C
> -       help
> -         Set the MAC offset for i2C.
> -
>  if I2C_EEPROM
>
>  config SYS_I2C_EEPROM_ADDR
> --
> 2.28.0
>

Applied.
M


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs