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 1YQGsN-0004YI-Q3 for barebox@lists.infradead.org; Tue, 24 Feb 2015 14:54:21 +0000 From: Michael Olbrich Date: Tue, 24 Feb 2015 15:53:50 +0100 Message-Id: <1424789630-10461-3-git-send-email-m.olbrich@pengutronix.de> In-Reply-To: <1424789630-10461-1-git-send-email-m.olbrich@pengutronix.de> References: <1424789630-10461-1-git-send-email-m.olbrich@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/3] ARM Samsung: add simple NAND barebox update handler To: barebox@lists.infradead.org Cc: Michael Olbrich Signed-off-by: Michael Olbrich --- I'm not sure if writing to /dev/nand0.barebox.bb is correct. But from what I can tell, the nand boot code cannot handle bad blocks, so it probably doesn't matter anyways. Michael arch/arm/boards/friendlyarm-mini2440/mini2440.c | 3 + arch/arm/mach-samsung/Kconfig | 6 ++ arch/arm/mach-samsung/Makefile | 1 + arch/arm/mach-samsung/bbu-nand-s3c24x0.c | 84 +++++++++++++++++++++++++ arch/arm/mach-samsung/include/mach/bbu.h | 20 ++++++ 5 files changed, 114 insertions(+) create mode 100644 arch/arm/mach-samsung/bbu-nand-s3c24x0.c create mode 100644 arch/arm/mach-samsung/include/mach/bbu.h diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index af6da72d3a2f..b59c8367f306 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -317,6 +318,8 @@ static int mini2440_devices_init(void) devfs_del_partition("env_raw"); devfs_add_partition("nand0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env_raw"); dev_add_bb_dev("env_raw", "env0"); + + s3c24x0_bbu_nand_register_handler(); #endif s3c24xx_add_mci(&mci_data); s3c24xx_add_fb(&s3c24x0_fb_data); diff --git a/arch/arm/mach-samsung/Kconfig b/arch/arm/mach-samsung/Kconfig index 13dac29dcc88..8f421bb83970 100644 --- a/arch/arm/mach-samsung/Kconfig +++ b/arch/arm/mach-samsung/Kconfig @@ -166,6 +166,12 @@ config S3C_NAND_BOOT Add generic support to boot from NAND flash. Image loading will be skipped if the code is running from NOR or already from SDRAM. +config BAREBOX_UPDATE_NAND_S3C24XX + bool + depends on BAREBOX_UPDATE + depends on S3C_NAND_BOOT + default y + endmenu endif diff --git a/arch/arm/mach-samsung/Makefile b/arch/arm/mach-samsung/Makefile index 46393e17257c..284c80a2ad43 100644 --- a/arch/arm/mach-samsung/Makefile +++ b/arch/arm/mach-samsung/Makefile @@ -8,4 +8,5 @@ obj-$(CONFIG_ARCH_S3C24xx) += gpio-s3c24x0.o clocks-s3c24xx.o mem-s3c24x0.o obj-$(CONFIG_ARCH_S3C64xx) += gpio-s3c64xx.o clocks-s3c64xx.o mem-s3c64xx.o obj-$(CONFIG_ARCH_S5PCxx) += gpio-s5pcxx.o clocks-s5pcxx.o mem-s5pcxx.o pbl-$(CONFIG_ARCH_S5PCxx) += mem-s5pcxx.o +obj-$(CONFIG_BAREBOX_UPDATE_NAND_S3C24XX) += bbu-nand-s3c24x0.o obj-$(CONFIG_S3C_LOWLEVEL_INIT) += $(obj-lowlevel-y) diff --git a/arch/arm/mach-samsung/bbu-nand-s3c24x0.c b/arch/arm/mach-samsung/bbu-nand-s3c24x0.c new file mode 100644 index 000000000000..6009151c88be --- /dev/null +++ b/arch/arm/mach-samsung/bbu-nand-s3c24x0.c @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2014 Michael Olbrich, Pengutronix + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation. + * + */ + +#define DEBUG +#include +#include +#include +#include +#include + +static int nand_update(struct bbu_handler *handler, struct bbu_data *data) +{ + int fd, ret; + + if (file_detect_type(data->image, data->len) != filetype_arm_barebox && + !bbu_force(data, "Not an ARM barebox image")) + return -EINVAL; + + ret = bbu_confirm(data); + if (ret) + return ret; + + fd = open(data->devicefile, O_WRONLY); + 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 s3c24x0 update handler for NAND + */ +int s3c24x0_bbu_nand_register_handler(void) +{ + struct bbu_handler *handler; + int ret; + + handler = xzalloc(sizeof(*handler)); + handler->devicefile = "/dev/nand0.barebox.bb"; + handler->name = "nand"; + handler->handler = nand_update; + handler->flags = BBU_HANDLER_FLAG_DEFAULT; + + ret = bbu_register_handler(handler); + if (ret) + free(handler); + + return ret; +} + diff --git a/arch/arm/mach-samsung/include/mach/bbu.h b/arch/arm/mach-samsung/include/mach/bbu.h new file mode 100644 index 000000000000..2a3e25cb666e --- /dev/null +++ b/arch/arm/mach-samsung/include/mach/bbu.h @@ -0,0 +1,20 @@ + +#ifndef __MACH_BBU_H +#define __MACH_BBU_H + +#include +#include + +struct imx_dcd_entry; +struct imx_dcd_v2_entry; + +#ifdef CONFIG_BAREBOX_UPDATE_NAND_S3C24XX +int s3c24x0_bbu_nand_register_handler(void); +#else +static inline int s3c24x0_bbu_nand_register_handler(void) +{ + return -ENOSYS; +} +#endif + +#endif -- 2.1.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox