summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2022-06-29 09:00:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-06-29 09:00:55 +0200
commit6b8e6fa889c4ce24f444fb22f66f6a1dd60351cb (patch)
tree135599c9db79339afd7b5ab0f556d27d8edaf682 /include
parent512d036587a38c57a30cc63ce48c19c895b9d729 (diff)
parentddedd0ff5f6e5cae57229884ba2e3b5649afb172 (diff)
downloadbarebox-6b8e6fa889c4ce24f444fb22f66f6a1dd60351cb.tar.gz
barebox-6b8e6fa889c4ce24f444fb22f66f6a1dd60351cb.tar.xz
Merge branch 'for-next/arm'
Diffstat (limited to 'include')
-rw-r--r--include/bbu.h7
-rw-r--r--include/filetype.h3
2 files changed, 9 insertions, 1 deletions
diff --git a/include/bbu.h b/include/bbu.h
index 3128339068..2dad26a127 100644
--- a/include/bbu.h
+++ b/include/bbu.h
@@ -10,6 +10,7 @@
struct bbu_data {
#define BBU_FLAG_FORCE (1 << 0)
#define BBU_FLAG_YES (1 << 1)
+#define BBU_FLAG_MMC_BOOT_ACK (1 << 2)
unsigned long flags;
int force;
const void *image;
@@ -50,6 +51,12 @@ void bbu_handlers_list(void);
struct file_list;
+int bbu_mmcboot_handler(struct bbu_handler *, struct bbu_data *,
+ int (*chained_handler)(struct bbu_handler *, struct bbu_data *));
+
+int bbu_std_file_handler(struct bbu_handler *handler,
+ struct bbu_data *data);
+
#ifdef CONFIG_BAREBOX_UPDATE
int bbu_register_handler(struct bbu_handler *);
diff --git a/include/filetype.h b/include/filetype.h
index 9b7499fdf3..00d54e48d5 100644
--- a/include/filetype.h
+++ b/include/filetype.h
@@ -52,7 +52,8 @@ enum filetype {
filetype_layerscape_image,
filetype_layerscape_qspi_image,
filetype_ubootvar,
- filetype_stm32_image_v1,
+ filetype_stm32_image_fsbl_v1,
+ filetype_stm32_image_ssbl_v1,
filetype_zynq_image,
filetype_mxs_sd_image,
filetype_rockchip_rkns_image,