ARM: am33xx: Add barebox_update eMMC option
Subsystems (2)
PATCH v2 1/2 ARM: am33xx: Add barebox_update eMMC option
With this patch the barebox_update command will be extended by the possibility to flash the MLO to eMMC devices.
The MLO will be flashed to the following addresses:0x000000x200000x400000x60000
Because the first 512 Bytes of the MLO are reserved for the CHSETTINGS header and this only use ~80 Bytes, there is space for the partition table in the header.
The command will overwrite the bootstrap code area and will hold the partition table and the Boot signature.
---
Changes:
v2: The MLO will also written to 0x0
arch/arm/configs/am335x_defconfig | 1 + arch/arm/mach-omap/Kconfig | 7 +++ arch/arm/mach-omap/Makefile | 1 + arch/arm/mach-omap/am33xx_bbu_emmc.c | 96 +++++++++++++++++++++++++++++++++++ arch/arm/mach-omap/include/mach/bbu.h | 18 +++++++ 5 files changed, 123 insertions(+) create mode 100644 arch/arm/mach-omap/am33xx_bbu_emmc.c
arch/arm/configs/am335x_defconfig +1 -0
@@ -1,6 +1,7 @@ CONFIG_ARCH_OMAP=y CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO=y CONFIG_BAREBOX_UPDATE_AM33XX_NAND=y +CONFIG_BAREBOX_UPDATE_AM33XX_EMMC=y CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_AFI_GF=y CONFIG_MACH_BEAGLEBONE=y
arch/arm/mach-omap/Kconfig +7 -0
@@ -97,6 +97,13 @@ config BAREBOX_UPDATE_AM33XX_NAND This also includes a handler for updating the regular barebox binary in NAND. +config BAREBOX_UPDATE_AM33XX_EMMC + prompt "barebox update eMMC handler" + bool + depends on BAREBOX_UPDATE + help + Say Y for barebox update eMMC handler. + config ARCH_TEXT_BASE hex default 0x80e80000 if MACH_OMAP343xSDP
arch/arm/mach-omap/Makefile +1 -0
@@ -36,3 +36,4 @@ pbl-$(CONFIG_OMAP3_USBBOOT) += omap3_xload_usb.o obj-$(CONFIG_CMD_BOOT_ORDER) += boot_order.o obj-$(CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO) += am33xx_bbu_spi_mlo.o obj-$(CONFIG_BAREBOX_UPDATE_AM33XX_NAND) += am33xx_bbu_nand.o +obj-$(CONFIG_BAREBOX_UPDATE_AM33XX_EMMC) += am33xx_bbu_emmc.o
arch/arm/mach-omap/am33xx_bbu_emmc.c new file +96 -0
96 lines not on this page · raw message
arch/arm/mach-omap/include/mach/bbu.h +18 -0
@@ -36,4 +36,22 @@ static inline int am33xx_bbu_nand_register_handler(const char *name, char *devic }#endif +#ifdef CONFIG_BAREBOX_UPDATE_AM33XX_EMMC +int am33xx_bbu_emmc_mlo_register_handler (const char *name,char *devicefile); +int am33xx_bbu_emmc_register_handler (const char *name,char *devicefile); +#else +static inline int am33xx_bbu_emmc_mlo_register_handler (const char *name, +char *devicefile) +{ +return 0 ; +} + +static inline int am33xx_bbu_emmc_register_handler (const char *name, +char *devicefile) +{ +return 0 ; +} +#endif + +#endif
Signature · 7 lines
1.9.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 2/2 ARM: am335x: Register eMMC MLO handler
Register the eMMC MLO handler to the barebox_update command.
---
Changes:
v2: No changes
arch/arm/boards/beaglebone/board.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boards/beaglebone/board.c +4 -0
@@ -38,6 +38,7 @@#include <mach/syslib.h> #include <mach/gpmc.h> #include <linux/err.h> +#include <mach/bbu.h> #include "beaglebone.h"
@@ -92,6 +93,9 @@ static int beaglebone_devices_init(void)armlinux_set_architecture (MACH_TYPE_BEAGLEBONE ); +/* Register update handler */ +am33xx_bbu_emmc_mlo_register_handler ("MLO.emmc" ,"/dev/mmc1" ); +if (IS_ENABLED (CONFIG_SHELL_NONE ))return am33xx_of_register_bootdevice ();
Signature · 7 lines
1.9.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 16 lines · Daniel Schultz
arch/arm/mach-omap/am33xx_bbu_emmc.c new file +16
-0+static int emmc_mlo_handler (struct bbu_handler *handler,struct bbu_data *data) +{ +int ret =0 ; +int i =0 ; +int fd; +const void *image = data->image; +size_t size = data->len; +u8 *part_table =0 ; + +if (file_detect_type (image, size) != filetype_ch_image) { +pr_err ("%s is not a valid ch-image\n" , data->imagefile); +return -EINVAL ; + } + ret =bbu_confirm (data); +if (ret !=0 ) +return ret;
arch/arm/mach-omap/am33xx_bbu_emmc.c line 50
Quoted 10 lines
arch/arm/mach-omap/am33xx_bbu_emmc.c new file +10
-0+ + fd =open (handler->devicefile,O_WRONLY ); +if (fd <0 ) { +pr_err ("could not open %s: %s\n" , handler->devicefile, +errno_str ()); +return fd; + } + +/* save the partition table */ + part_table =xmalloc (PART_TABLE_SIZE );
You forgot to free part_table later. I replaced part_table with a static array while applying.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox