-#define BOOTENV_DEV_NAME(devtypeu, devtypel, instance) \
- BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance)
+#if defined(CONFIG_CMD_EXTENSION)
+#define BOOTENV_RUN_EXTENSION_INIT "run extension_init; "
+#define BOOTENV_RUN_EXTENSION_APPLY "run extension_apply; "
+#define BOOTENV_SET_EXTENSION_NEED_INIT \
+ "extension_need_init=; " \
+ "setenv extension_overlay_addr ${fdtoverlay_addr_r}; "
+#define BOOTENV_SHARED_EXTENSION \
+ "extension_init=" \
+ "echo Extension init...; " \
+ "if ${extension_need_init}; then " \
+ "extension_need_init=false; " \
+ "extension scan; " \
+ "fi\0" \
+ \
+ "extension_overlay_cmd=" \
+ "load ${devtype} ${devnum}:${distro_bootpart} " \
+ "${extension_overlay_addr} ${prefix}${extension_overlay_name}\0" \
+ "extension_apply=" \
+ "if fdt addr -q ${fdt_addr_r}; then " \
+ "extension apply all; " \
+ "fi\0"
+#else
+#define BOOTENV_RUN_EXTENSION_INIT
+#define BOOTENV_RUN_EXTENSION_APPLY
+#define BOOTENV_SET_EXTENSION_NEED_INIT
+#define BOOTENV_SHARED_EXTENSION
+#endif
+
+#define BOOTENV_DEV_NAME(devtypeu, devtypel, instance, ...) \
+ BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance, ## __VA_ARGS__)