[PATCH 2/2] microblaze: Add nor device to distro boot

[Michal Simek]

čt 17. 12. 2020 v 15:09 odesílatel Michal Simek
<michal.simek at xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy at xilinx.com>
>
> Add parallel nor device to distroboot for microblaze.
>
> Signed-off-by: T Karthik Reddy <t.karthik.reddy at xilinx.com>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  include/configs/microblaze-generic.h | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index bc0bf0497378..59b20cf116a8 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -81,6 +81,20 @@
>  # define BOOT_TARGET_DEVICES_QSPI(func)
>  #endif
>
> +#if defined(CONFIG_MTD_NOR_FLASH)
> +# define BOOT_TARGET_DEVICES_NOR(func)  func(NOR, nor, na)
> +#else
> +# define BOOT_TARGET_DEVICES_NOR(func)
> +#endif
> +
> +#define BOOTENV_DEV_NOR(devtypeu, devtypel, instance) \
> +       "bootcmd_nor=cp.b ${script_offset_nor} ${scriptaddr} ${script_size_f} && " \
> +               "echo NOR: Trying to boot script at ${scriptaddr} && " \
> +               "source ${scriptaddr}; echo NOR: SCRIPT FAILED: continuing...;\0"
> +
> +#define BOOTENV_DEV_NAME_NOR(devtypeu, devtypel, instance) \
> +       "nor "
> +
>  #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \
>         "bootcmd_qspi=sf probe 0 0 0 && " \
>         "sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \
> @@ -101,7 +115,8 @@
>
>  #define BOOT_TARGET_DEVICES(func) \
>         BOOT_TARGET_DEVICES_JTAG(func) \
> -       BOOT_TARGET_DEVICES_QSPI(func)  \
> +       BOOT_TARGET_DEVICES_QSPI(func) \
> +       BOOT_TARGET_DEVICES_NOR(func) \
>         BOOT_TARGET_DEVICES_DHCP(func) \
>         BOOT_TARGET_DEVICES_PXE(func)
>
> --
> 2.29.2
>

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