SPL: ONENAND: Fix onenand_spl_load_image implementation.
Subsystems (2)
PATCH 1/2 SPL: ONENAND: Fix onenand_spl_load_image implementation.
From: Enric Balletbo i Serra <[email protected]>
Tested with an IGEPv2 board seems that current onenand_spl_load_image implementation doesn't work. This patch fixes this function changing the read loop and reading the onenand blocks from page to page.
Tested with various IGEP based boards with a OneNAND from Numonyx.
--- drivers/mtd/onenand/onenand_spl.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/mtd/onenand/onenand_spl.c +6 -8
@@ -112,7 +112,7 @@ static int onenand_spl_read_page(uint32_t block, uint32_t page, uint32_t *buf,void onenand_spl_load_image (uint32_t offs,uint32_t size,void *dst) {uint32_t *addr = (uint32_t *)dst; -uint32_t total_pages; +uint32_t to_page;uint32_t block;uint32_t page, rpage;enum onenand_spl_pagesize pagesize;
@@ -125,22 +125,20 @@ void onenand_spl_load_image(uint32_t offs, uint32_t size, void *dst)* pulling further unwanted functions into the SPL. */ if (pagesize ==2048 ) { - total_pages =DIV_ROUND_UP (size,2048 ); page = offs /2048 ; + to_page = page +DIV_ROUND_UP (size,2048 ); }else { - total_pages =DIV_ROUND_UP (size,4096 ); page = offs /4096 ; + to_page = page +DIV_ROUND_UP (size,4096 ); } -for (; page <= total_pages; page++) { +for (; page <= to_page; page++) { block = page /ONENAND_PAGES_PER_BLOCK ; rpage = page & (ONENAND_PAGES_PER_BLOCK -1 ); ret =onenand_spl_read_page (block, rpage, addr, pagesize); -if (ret) { - total_pages +=ONENAND_PAGES_PER_BLOCK ; +if (ret) page +=ONENAND_PAGES_PER_BLOCK -1 ; - }else { +else addr += pagesize /4 ; - } } }
Signature · 1 line
1.7.10.4
PATCH 2/2 SPL: ONENAND: Support SPL to boot u-boot from OneNAND.
From: Enric Balletbo i Serra <[email protected]>
This patch will allow use SPL to boot an u-boot from the OneNAND.
Tested with IGEPv2 board with a OneNAND from Numonyx.
--- arch/arm/cpu/armv7/omap3/board.c | 2 +- common/spl/Makefile | 1 + common/spl/spl.c | 5 +++++ common/spl/spl_onenand.c | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 common/spl/spl_onenand.c
arch/arm/cpu/armv7/omap3/board.c +1 -1
@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)void spl_board_init (void ) { -#ifdef CONFIG_SPL_NAND_SUPPORT +#if defined(CONFIG_SPL_NAND_SUPPORT ) || defined(CONFIG_SPL_ONENAND_SUPPORT )gpmc_init ();#endif #ifdef CONFIG_SPL_I2C_SUPPORT
common/spl/Makefile +1 -0
@@ -18,6 +18,7 @@ COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o endif
common/spl/spl.c +5 -0
@@ -197,6 +197,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)spl_nand_load_image ();break ;#endif +#ifdef CONFIG_SPL_ONENAND_SUPPORT +case BOOT_DEVICE_ONE_NAND : +spl_onenand_load_image (); +break ; +#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR :spl_nor_load_image ();
common/spl/spl_onenand.c new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/2 SPL: ONENAND: Support SPL to boot u-boot from OneNAND.
Hi,
Quoted 9 lines · Enric Balletbo i Serra
From: Enric Balletbo i Serra <[email protected]>
This patch will allow use SPL to boot an u-boot from the OneNAND.
Tested with IGEPv2 board with a OneNAND from Numonyx.
Signed-off-by Enric Balletbo i Serra <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 2 +-
It's not related with OneNAND SPL patch, can you split it two patches?
Quoted 36 lines
common/spl/Makefile | 1 + common/spl/spl.c | 5 +++++ common/spl/spl_onenand.c | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 common/spl/spl_onenand.carch/arm/cpu/armv7/omap3/board.c +1
-1@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)void spl_board_init (void ) { -#ifdef CONFIG_SPL_NAND_SUPPORT +#if defined(CONFIG_SPL_NAND_SUPPORT ) || defined(CONFIG_SPL_ONENAND_SUPPORT )gpmc_init ();#endif #ifdef CONFIG_SPL_I2C_SUPPORT common/spl/Makefile +1
-0@@ -18,6 +18,7 @@ COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o endifcommon/spl/spl.c +0
-0
common/spl/spl.c void board_init_r(gd_t *dummy1, ulong dummy2) · line 201
Quoted 5 lines
common/spl/spl.c +2
-0@@ -197,6 +197,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)spl_nand_load_image ();break ;#endif +#ifdef CONFIG_SPL_ONENAND_SUPPORT +case BOOT_DEVICE_ONE_NAND :
ONE_NAND? It should be ONENAND.
Quoted 35 lines
common/spl/spl.c +3
-0+spl_onenand_load_image (); +break ; +#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR :spl_nor_load_image ();common/spl/spl_onenand.c new file +23
-0@@ -0,0 +1,45 @@ +/* +* Copyright (C) 2011 +* Corscience GmbH & Co. KG - Simon Schwarz <[email protected]> +* +* See file CREDITS for list of people who contributed to this +* project. +* +* 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, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ +#include <common.h>
common/spl/spl_onenand.c line 33
Quoted 10 lines
common/spl/spl_onenand.c new file +10
-0+#include <config.h> +#include <spl.h> +#include <asm/io.h> +#include <onenand_uboot.h> + +void spl_onenand_load_image (void ) +{ +struct image_header *header; + int *src __attribute__((unused)); + int *dst __attribute__((unused));
why these are needed? just remove these.
Thank you,
Kyungmin Park
Quoted 19 lines
common/spl/spl_onenand.c new file +12
-1+ +debug ("spl: onenand\n" ); + +/*use CONFIG_SYS_TEXT_BASE as temporary storage area */ + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE ); +/* Load u-boot */ +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , +CONFIG_SYS_ONENAND_PAGE_SIZE , (void *)header); +spl_parse_image_header (header); +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , + spl_image.size, (void *)spl_image.load_addr); +} --1.7.10.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH 2/2 SPL: ONENAND: Support SPL to boot u-boot from OneNAND.
Hi Kyungmin,
Thanks for revisit the patch.
2013/2/5 Kyungmin Park <[email protected]>:
Quoted 6 lines
Hi,
Quoted 2 lines · Enric Balletbo i Serra
From: Enric Balletbo i Serra <[email protected]>
Quoted 8 lines
Quoted 7 lines
This patch will allow use SPL to boot an u-boot from the OneNAND.
Tested with IGEPv2 board with a OneNAND from Numonyx.
Signed-off-by Enric Balletbo i Serra <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 2 +-It's not related with OneNAND SPL patch, can you split it two patches?
Ok, I'll do in v2.
Quoted 31 lines
Quoted 31 lines
common/spl/Makefile | 1 + common/spl/spl.c | 5 +++++ common/spl/spl_onenand.c | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 common/spl/spl_onenand.carch/arm/cpu/armv7/omap3/board.c +1
-1@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)void spl_board_init (void ) { -#ifdef CONFIG_SPL_NAND_SUPPORT +#if defined(CONFIG_SPL_NAND_SUPPORT ) || defined(CONFIG_SPL_ONENAND_SUPPORT )gpmc_init ();#endif #ifdef CONFIG_SPL_I2C_SUPPORT common/spl/Makefile +1
-0@@ -18,6 +18,7 @@ COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o endif
Quoted 11 lines
common/spl/spl.c void board_init_r(gd_t *dummy1, ulong dummy2) · line 201
Quoted 10 lines
common/spl/spl.c +2
-0@@ -197,6 +197,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)spl_nand_load_image ();break ;#endif +#ifdef CONFIG_SPL_ONENAND_SUPPORT +case BOOT_DEVICE_ONE_NAND :
ONE_NAND? It should be ONENAND.
Well, I used ONE_NAND because this define was already defined in
arch/arm/include/asm/arch-omap3/spl.h:29:#define BOOT_DEVICE_ONE_NAND 3
arch/arm/include/asm/arch-omap5/spl.h:30:#define BOOT_DEVICE_ONE_NAND 4
arch/arm/include/asm/arch-omap4/spl.h:30:#define BOOT_DEVICE_ONE_NAND 4
arch/arm/include/asm/arch-mx35/spl.h:30:#define BOOT_DEVICE_ONE_NAND 4
For me, also looks better use ONENAND, but then, I need to change all these defines. What do you prefer ? Maintain the use of ONE_NAND or change these defines ?
Quoted 38 lines
Quoted 38 lines
common/spl/spl.c +3
-0+spl_onenand_load_image (); +break ; +#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR :spl_nor_load_image ();common/spl/spl_onenand.c new file +26
-0@@ -0,0 +1,45 @@ +/* +* Copyright (C) 2011 +* Corscience GmbH & Co. KG - Simon Schwarz <[email protected]> +* +* See file CREDITS for list of people who contributed to this +* project. +* +* 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, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ +#include <common.h> +#include <config.h> +#include <spl.h> +#include <asm/io.h>
Quoted 9 lines
common/spl/spl_onenand.c line 33
Quoted 7 lines
common/spl/spl_onenand.c new file +7
-0+#include <onenand_uboot.h> + +void spl_onenand_load_image (void ) +{ +struct image_header *header; + int *src __attribute__((unused)); + int *dst __attribute__((unused));why these are needed? just remove these.
Right, I'll remove.
Quoted 17 lines
Thank you,
Kyungmin ParkQuoted 15 lines
common/spl/spl_onenand.c new file +12
-1+ +debug ("spl: onenand\n" ); + +/*use CONFIG_SYS_TEXT_BASE as temporary storage area */ + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE ); +/* Load u-boot */ +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , +CONFIG_SYS_ONENAND_PAGE_SIZE , (void *)header); +spl_parse_image_header (header); +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , + spl_image.size, (void *)spl_image.load_addr); +} --1.7.10.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Thanks,
Enric
PATCH 2/2 SPL: ONENAND: Support SPL to boot u-boot from OneNAND.
Hi,
2013/2/5 Enric Balletbo Serra <[email protected]>:
Quoted 67 lines
Hi Kyungmin,
Thanks for revisit the patch.
2013/2/5 Kyungmin Park <[email protected]>:
Quoted 6 lines
Hi,
Quoted 2 lines · Enric Balletbo i Serra
From: Enric Balletbo i Serra <[email protected]>
Quoted 8 lines
Quoted 7 lines
This patch will allow use SPL to boot an u-boot from the OneNAND.
Tested with IGEPv2 board with a OneNAND from Numonyx.
Signed-off-by Enric Balletbo i Serra <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 2 +-It's not related with OneNAND SPL patch, can you split it two patches?
Ok, I'll do in v2.
Quoted 31 lines
Quoted 31 lines
common/spl/Makefile | 1 + common/spl/spl.c | 5 +++++ common/spl/spl_onenand.c | 45 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 common/spl/spl_onenand.carch/arm/cpu/armv7/omap3/board.c +1
-1@@ -110,7 +110,7 @@ int board_mmc_init(bd_t *bis)void spl_board_init (void ) { -#ifdef CONFIG_SPL_NAND_SUPPORT +#if defined(CONFIG_SPL_NAND_SUPPORT ) || defined(CONFIG_SPL_ONENAND_SUPPORT )gpmc_init ();#endif #ifdef CONFIG_SPL_I2C_SUPPORT common/spl/Makefile +1
-0@@ -18,6 +18,7 @@ COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o COBJS-$(CONFIG_SPL_NOR_SUPPORT) += spl_nor.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o +COBJS-$(CONFIG_SPL_ONENAND_SUPPORT) += spl_onenand.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o endifQuoted 11 lines
common/spl/spl.c void board_init_r(gd_t *dummy1, ulong dummy2) · line 201
Quoted 10 lines
common/spl/spl.c +2
-0@@ -197,6 +197,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)spl_nand_load_image ();break ;#endif +#ifdef CONFIG_SPL_ONENAND_SUPPORT +case BOOT_DEVICE_ONE_NAND :
ONE_NAND? It should be ONENAND.Well, I used
ONE_NANDbecause this define was already defined in
Quoted 9 lines
arch/arm/include/asm/arch-omap3/spl.h:29:#define
BOOT_DEVICE_ONE_NAND3
arch/arm/include/asm/arch-omap5/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4
arch/arm/include/asm/arch-omap4/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4
arch/arm/include/asm/arch-mx35/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4For me, also looks better use ONENAND, but then, I need to change all these defines. What do you prefer ? Maintain the use of
ONE_NANDor change these defines ?
Before sending version 2. Any comment on this ? I can use BOOT_DEVICE_ONE_NAND or I should change for BOOT_DEVICE_ONENAND ?
Quoted 74 lines
Quoted 38 lines
Quoted 38 lines
common/spl/spl.c +3
-0+spl_onenand_load_image (); +break ; +#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR :spl_nor_load_image ();common/spl/spl_onenand.c new file +26
-0@@ -0,0 +1,45 @@ +/* +* Copyright (C) 2011 +* Corscience GmbH & Co. KG - Simon Schwarz <[email protected]> +* +* See file CREDITS for list of people who contributed to this +* project. +* +* 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, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ +#include <common.h> +#include <config.h> +#include <spl.h> +#include <asm/io.h> Quoted 9 lines
common/spl/spl_onenand.c line 33
Quoted 7 lines
common/spl/spl_onenand.c new file +7
-0+#include <onenand_uboot.h> + +void spl_onenand_load_image (void ) +{ +struct image_header *header; + int *src __attribute__((unused)); + int *dst __attribute__((unused));why these are needed? just remove these.
Right, I'll remove.
Quoted 17 lines
Thank you,
Kyungmin ParkQuoted 15 lines
common/spl/spl_onenand.c new file +12
-1+ +debug ("spl: onenand\n" ); + +/*use CONFIG_SYS_TEXT_BASE as temporary storage area */ + header = (struct image_header *)(CONFIG_SYS_TEXT_BASE ); +/* Load u-boot */ +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , +CONFIG_SYS_ONENAND_PAGE_SIZE , (void *)header); +spl_parse_image_header (header); +onenand_spl_load_image (CONFIG_SYS_ONENAND_U_BOOT_OFFS , + spl_image.size, (void *)spl_image.load_addr); +} --1.7.10.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-bootThanks,
Enric
PATCH 2/2 SPL: ONENAND: Support SPL to boot u-boot from OneNAND.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 02/07/2013 05:43 AM, Enric Balletbo Serra wrote:
[snip]
Quoted 9 lines
Quoted 9 lines
arch/arm/include/asm/arch-omap3/spl.h:29:#define
BOOT_DEVICE_ONE_NAND3
arch/arm/include/asm/arch-omap5/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4
arch/arm/include/asm/arch-omap4/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4
arch/arm/include/asm/arch-mx35/spl.h:30:#defineBOOT_DEVICE_ONE_NAND4
Quoted 7 lines
Quoted 4 lines
For me, also looks better use ONENAND, but then, I need to change all these defines. What do you prefer ? Maintain the use of
ONE_NANDor change these defines ?Before sending version 2. Any comment on this ? I can use
BOOT_DEVICE_ONE_NANDor I should change forBOOT_DEVICE_ONENAND?
The technology is ONENAND right? Lets just fix the other defines.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRE6nEAAoJENk4IS6UOR1WskMP/32YG6VBMqSYrWe0paqJcBp2 qqgZenowzgekLuKWk0U+yk/uBOm2WbiEPlcelQZ5dMCpX7PdrApogKrAU5zoCpsc ktnWNXiM4bqvhKIsIDQlf8MnEakjhOJiQ6EgJjxX/JxLR/WDs1N6ChwNKYBEubxp VRmgYxooDtK9zNNDueLoufzwfMHp7bCfQbbaLwli+45FTgmjSqCA3k1eBJ3fPQyp WX5iPFHY6MDWLi+KSzrZd94EVkr3TXt4fAqR345RI9zsZCHTeriPbsmsVVp8E3fg My/xUpOrTLLWT50qcphU1xZbtw4V0ZPBZ5DypSt/KMejHbukNaosJXWr+6qLHxkd DEoxFY7wRKcyOXOtdemgKosvgFvLbMFZAQ4y/9bTDBRGCXDZmf++kJxTXsnDmUz6 /dzJ6GRrnbzPaa001YPGPhfad+Nh84jr2NFH/gdfGeIP/E5SmuE5CXsGEhlNdgi2 ZV68UNB9CmC9mwlpmhSVScL6CewkMgrDkGWpZ/xfoiQ7Y6et0JOdn1BvqgxgZ2LO HSPD99gKBQaCLghatBW7J0n3MbzWb2x70Bwf/+sHKTtfKsHVscWjmKgU8xC7IpBk FDrkFtlCe6qcN9u2xpaqzRXQZWKV18MXF90bqRNBEqY33gFSSVwkXqMAt2tdrCrF d+zKFZdXvJLchjWNoySY
=s8l3
-----END PGP SIGNATURE-----