From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WktAe-0008L0-9w for barebox@lists.infradead.org; Thu, 15 May 2014 10:45:53 +0000 From: Sascha Hauer Date: Thu, 15 May 2014 12:45:28 +0200 Message-Id: <1400150728-28314-2-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1400150728-28314-1-git-send-email-s.hauer@pengutronix.de> References: <1400150728-28314-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 2/2] ARM: AM33xx: Add SPI bbu handler To: barebox@lists.infradead.org We already have an update handler for the MLO on SPI, add a update handler for the regular barebox aswell. Signed-off-by: Sascha Hauer --- arch/arm/mach-omap/am33xx_bbu_spi_mlo.c | 56 +++++++++++++++++++++++++++++++++ arch/arm/mach-omap/include/mach/bbu.h | 6 ++++ 2 files changed, 62 insertions(+) diff --git a/arch/arm/mach-omap/am33xx_bbu_spi_mlo.c b/arch/arm/mach-omap/am33xx_bbu_spi_mlo.c index 1aa3d7b..8ac0a18 100644 --- a/arch/arm/mach-omap/am33xx_bbu_spi_mlo.c +++ b/arch/arm/mach-omap/am33xx_bbu_spi_mlo.c @@ -79,6 +79,41 @@ out: return ret; } +static int spi_nor_handler(struct bbu_handler *handler, + struct bbu_data *data) +{ + int fd, ret; + + if (file_detect_type(data->image, data->len) != filetype_arm_barebox) { + if (!bbu_force(data, "Not an ARM barebox image")) + return -EINVAL; + } + + fd = open(data->devicefile, O_RDWR | O_CREAT); + if (fd < 0) + return fd; + + debug("%s: eraseing %s from 0 to 0x%08x\n", __func__, + data->devicefile, data->len); + ret = erase(fd, data->len, 0); + if (ret) { + printf("erasing %s failed with %s\n", data->devicefile, + strerror(-ret)); + goto err_close; + } + + ret = write(fd, data->image, data->len); + if (ret < 0) + goto err_close; + + ret = 0; + +err_close: + close(fd); + + return ret; +} + /* * Register a am33xx MLO update handler for SPI NOR */ @@ -99,3 +134,24 @@ int am33xx_bbu_spi_nor_mlo_register_handler(const char *name, char *devicefile) return ret; } + +/* + * Register a am33xx update handler for SPI NOR + */ +int am33xx_bbu_spi_nor_register_handler(const char *name, char *devicefile) +{ + struct bbu_handler *handler; + int ret; + + handler = xzalloc(sizeof(*handler)); + handler->devicefile = devicefile; + handler->name = name; + handler->handler = spi_nor_handler; + + ret = bbu_register_handler(handler); + + if (ret) + free(handler); + + return ret; +} diff --git a/arch/arm/mach-omap/include/mach/bbu.h b/arch/arm/mach-omap/include/mach/bbu.h index 9556ad6..9b0e4bf 100644 --- a/arch/arm/mach-omap/include/mach/bbu.h +++ b/arch/arm/mach-omap/include/mach/bbu.h @@ -5,11 +5,17 @@ #ifdef CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO int am33xx_bbu_spi_nor_mlo_register_handler(const char *name, char *devicefile); +int am33xx_bbu_spi_nor_register_handler(const char *name, char *devicefile); #else static inline int am33xx_bbu_spi_nor_mlo_register_handler(const char *name, char *devicefile) { return 0; } + +static inline int am33xx_bbu_spi_nor_register_handler(const char *name, char *devicefile) +{ + return 0; +} #endif #endif -- 2.0.0.rc0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox