diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-02 07:24:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-02 07:24:27 -0500 |
| commit | 57c6941b433722ab83a50dab35b8ab5a0954942a (patch) | |
| tree | c1e785f490e844420407c6de8331bdc76df0817c /include | |
| parent | a1b341989b241be6e308ec9328d2fbb08049c8f9 (diff) | |
| parent | c01c418717d718603e746fbc7885f76a5f8f73a5 (diff) | |
| download | talos-obmc-uboot-57c6941b433722ab83a50dab35b8ab5a0954942a.tar.gz talos-obmc-uboot-57c6941b433722ab83a50dab35b8ab5a0954942a.zip | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/dfu.h | 3 | ||||
| -rw-r--r-- | include/fb_mmc.h | 1 | ||||
| -rw-r--r-- | include/samsung/misc.h | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/dfu.h b/include/dfu.h index c27856cb72..7d31abdf33 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -140,6 +140,9 @@ struct dfu_entity { unsigned int inited:1; }; +#ifdef CONFIG_SET_DFU_ALT_INFO +void set_dfu_alt_info(char *interface, char *devstr); +#endif int dfu_config_entities(char *s, char *interface, char *devstr); void dfu_free_entities(void); void dfu_show_entities(void); diff --git a/include/fb_mmc.h b/include/fb_mmc.h index 1ad1d1327d..402ba9b1b4 100644 --- a/include/fb_mmc.h +++ b/include/fb_mmc.h @@ -6,3 +6,4 @@ void fb_mmc_flash_write(const char *cmd, void *download_buffer, unsigned int download_bytes, char *response); +void fb_mmc_erase(const char *cmd, char *response); diff --git a/include/samsung/misc.h b/include/samsung/misc.h index 607e8d4922..0f957dc367 100644 --- a/include/samsung/misc.h +++ b/include/samsung/misc.h @@ -29,9 +29,8 @@ void draw_logo(void); #endif #ifdef CONFIG_SET_DFU_ALT_INFO -char *get_dfu_alt_system(void); -char *get_dfu_alt_boot(void); -void set_dfu_alt_info(void); +char *get_dfu_alt_system(char *interface, char *devstr); +char *get_dfu_alt_boot(char *interface, char *devstr); #endif #ifdef CONFIG_BOARD_TYPES void set_board_type(void); |
