From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZF2tG-0007Jq-8E for barebox@lists.infradead.org; Tue, 14 Jul 2015 16:17:07 +0000 From: Steffen Trumtrar Date: Tue, 14 Jul 2015 18:16:37 +0200 Message-Id: <1436890599-31412-3-git-send-email-s.trumtrar@pengutronix.de> In-Reply-To: <1436890599-31412-1-git-send-email-s.trumtrar@pengutronix.de> References: <1436890599-31412-1-git-send-email-s.trumtrar@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 3/5] ARM: socfpga: add bbu handler for spi nor To: barebox@lists.infradead.org Cc: Steffen Trumtrar Signed-off-by: Steffen Trumtrar --- arch/arm/mach-socfpga/Kconfig | 8 +++ arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/include/mach/bbu.h | 15 +++++ arch/arm/mach-socfpga/socfpga_bbu_spi_nor.c | 86 +++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 arch/arm/mach-socfpga/include/mach/bbu.h create mode 100644 arch/arm/mach-socfpga/socfpga_bbu_spi_nor.c diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 90b3533b1ffb..a85749b7f829 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -20,4 +20,12 @@ config MACH_SOCFPGA_TERASIC_SOCKIT select HAVE_DEFAULT_ENVIRONMENT_NEW bool "Terasic SoCKit" +config BAREBOX_UPDATE_SOCFPGA_SPI_NOR + prompt "barebox update SPI NOR XLOAD handler" + bool + depends on BAREBOX_UPDATE + depends on SPI_CADENCE_QUADSPI + help + Say Y for barebox update SPI NOR XLOAD handler. + endif diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index b81d57da26fd..12c5252d1a6e 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -3,3 +3,4 @@ pbl-y += init.o freeze-controller.o scan-manager.o system-manager.o pbl-y += clock-manager.o obj-$(CONFIG_ARCH_SOCFPGA_XLOAD) += xload.o obj-$(CONFIG_ARCH_SOCFPGA_FPGA) += fpga.o +obj-$(CONFIG_BAREBOX_UPDATE_SOCFPGA_SPI_NOR) += socfpga_bbu_spi_nor.o diff --git a/arch/arm/mach-socfpga/include/mach/bbu.h b/arch/arm/mach-socfpga/include/mach/bbu.h new file mode 100644 index 000000000000..e4846d36bc5d --- /dev/null +++ b/arch/arm/mach-socfpga/include/mach/bbu.h @@ -0,0 +1,15 @@ +#ifndef __MACH_BBU_H +#define __MACH_BBU_H + +#include + +#ifdef CONFIG_BAREBOX_UPDATE_SOCFPGA_SPI_NOR +int socfpga_bbu_spi_nor_register_handler(const char *name, char *devicefile); +#else +static inline int socfpga_bbu_spi_nor_register_handler(const char *name, char *devicefile) +{ + return 0; +} +#endif + +#endif diff --git a/arch/arm/mach-socfpga/socfpga_bbu_spi_nor.c b/arch/arm/mach-socfpga/socfpga_bbu_spi_nor.c new file mode 100644 index 000000000000..cf44bc81c60b --- /dev/null +++ b/arch/arm/mach-socfpga/socfpga_bbu_spi_nor.c @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2015 Pengutronix, Steffen Trumtrar + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include +#include +#include +#include +#include + +static int spi_nor_handler(struct bbu_handler *handler, + struct bbu_data *data) +{ + int fd, ret; + int *header; + + if (file_detect_type(data->image, data->len) != filetype_arm_barebox) { + if (!bbu_force(data, "Not an ARM barebox image")) + return -EINVAL; + } + + header = data->image; + + if (!header[0x40] == 0x31305341) { + if (!bbu_force(data, "Not a valid SOCFPGA image")) + return -EINVAL; + } + + ret = bbu_confirm(data); + if (ret) + return ret; + + 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 update handler for SPI NOR + */ +int socfpga_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; +} -- 2.1.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox