fastboot: Add a ARM Barebox filetype handler
This will automatically call barebox_update for the transfered file if it is an ARM Barebox image and the destination file is defined by some update handler. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
24ff0ab0fa
commit
0240fd3f84
|
@ -369,3 +369,16 @@ err_out:
|
||||||
cdev_close(cdev);
|
cdev_close(cdev);
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool filetype_is_barebox_image(enum filetype ft)
|
||||||
|
{
|
||||||
|
switch (ft) {
|
||||||
|
case filetype_arm_barebox:
|
||||||
|
case filetype_mips_barebox:
|
||||||
|
case filetype_ch_image:
|
||||||
|
case filetype_ch_image_be:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <clock.h>
|
#include <clock.h>
|
||||||
#include <ioctl.h>
|
#include <ioctl.h>
|
||||||
#include <libbb.h>
|
#include <libbb.h>
|
||||||
|
#include <bbu.h>
|
||||||
#include <boot.h>
|
#include <boot.h>
|
||||||
#include <dma.h>
|
#include <dma.h>
|
||||||
#include <fs.h>
|
#include <fs.h>
|
||||||
|
@ -716,6 +717,36 @@ static void cb_flash(struct usb_ep *ep, struct usb_request *req, const char *cmd
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IS_ENABLED(CONFIG_BAREBOX_UPDATE) && filetype_is_barebox_image(filetype)) {
|
||||||
|
struct bbu_data data = {
|
||||||
|
.devicefile = filename,
|
||||||
|
.imagefile = FASTBOOT_TMPFILE,
|
||||||
|
.flags = BBU_FLAG_YES,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!barebox_update_handler_exists(&data))
|
||||||
|
goto copy;
|
||||||
|
|
||||||
|
fastboot_tx_print(f_fb, "INFOThis is a barebox image...");
|
||||||
|
|
||||||
|
data.image = read_file(data.imagefile, &data.len);
|
||||||
|
if (!data.image) {
|
||||||
|
fastboot_tx_print(f_fb, "FAILreading barebox");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = barebox_update(&data);
|
||||||
|
|
||||||
|
free(data.image);
|
||||||
|
|
||||||
|
if (ret) {
|
||||||
|
fastboot_tx_print(f_fb, "FAILupdate barebox: %s", strerror(-ret));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
copy:
|
copy:
|
||||||
ret = copy_file(FASTBOOT_TMPFILE, filename, 1);
|
ret = copy_file(FASTBOOT_TMPFILE, filename, 1);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define __FILE_TYPE_H
|
#define __FILE_TYPE_H
|
||||||
|
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* List of file types we know
|
* List of file types we know
|
||||||
|
@ -48,6 +49,7 @@ enum filetype file_name_detect_type(const char *filename);
|
||||||
enum filetype cdev_detect_type(const char *name);
|
enum filetype cdev_detect_type(const char *name);
|
||||||
enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec);
|
enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec);
|
||||||
int is_fat_boot_sector(const void *_buf);
|
int is_fat_boot_sector(const void *_buf);
|
||||||
|
bool filetype_is_barebox_image(enum filetype ft);
|
||||||
|
|
||||||
#define ARM_HEAD_SIZE 0x30
|
#define ARM_HEAD_SIZE 0x30
|
||||||
#define ARM_HEAD_MAGICWORD_OFFSET 0x20
|
#define ARM_HEAD_MAGICWORD_OFFSET 0x20
|
||||||
|
|
Loading…
Reference in New Issue