| Message ID | 1400234355-24819-3-git-send-email-andreas.devel@googlemail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | Andreas Bießmann |
| Headers | show |
Hi Andreas, On 05/16/2014 05:59 PM, Andreas Bießmann wrote: > For sama5d3xek we need to modify the SPL image for correct detection by ROM > code. > > Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> > --- > > Changes in v2: > * add -n switch to mkimage for PMECC type NAND and CONFIG_SYS_NANDFLASH > > arch/arm/cpu/armv7/at91/config.mk | 10 ++++++++++ > doc/README.atmel_pmecc | 30 ++++++++++++++++++++++++++++++ > spl/Makefile | 18 ++++++++++++++++++ > 3 files changed, 58 insertions(+) > create mode 100644 arch/arm/cpu/armv7/at91/config.mk > > diff --git a/arch/arm/cpu/armv7/at91/config.mk b/arch/arm/cpu/armv7/at91/config.mk > new file mode 100644 > index 0000000..09eab70 > --- /dev/null > +++ b/arch/arm/cpu/armv7/at91/config.mk > @@ -0,0 +1,10 @@ > +# > +# Copyright (C) 2014, Andreas Bießmann <andreas.devel@googlemail.com> > +# > +# SPDX-License-Identifier: GPL-2.0+ > +# > +ifdef CONFIG_SPL_BUILD > +ALL-y += boot.bin > +else > +ALL-y += u-boot.img > +endif > diff --git a/doc/README.atmel_pmecc b/doc/README.atmel_pmecc > index cf8373b..5a93123 100644 > --- a/doc/README.atmel_pmecc > +++ b/doc/README.atmel_pmecc > @@ -27,3 +27,33 @@ Take AT91SAM9X5EK as an example, the board definition file likes: > #define CONFIG_ATMEL_NAND_HW_PMECC 1 > #define CONFIG_PMECC_CAP 2 > #define CONFIG_PMECC_SECTOR_SIZE 512 > + > +How to enable PMECC header for direct programmable boot.bin > +----------------------------------------------------------- > +2014-05-15 Andreas Bießmann <andreas.devel@googlemail.com> > + > +The usual way to program SPL into NAND flash is to use the SAM-BA Atmel tool. > +This however is often not usable when doing field updates. To be able to > +program a SPL binary into NAND flash we need to add the PMECC header to the > +binary before. Chapter '12.4.4.1 NAND Flash Boot: NAND Flash Detection' in > +sama5d3 SoC spec (as of 03. April 2014). We have a new image type added to > +mkimage to generate this PMECC header and integrated into the build process of > +SPL. > +The required parameters in board configuration header are as follows: > + > +This example is working for sama5d3xek: > + > +#define CONFIG_SPL_AT91_HEADER_USE_PMECC 1 > +#define CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE 4 > +#define CONFIG_SPL_AT91_HEADER_SECTOR_SIZE CONFIG_PMECC_SECTOR_SIZE > +#define CONFIG_SPL_AT91_HEADER_SPARE_SIZE 64 > +#define CONFIG_SPL_AT91_HEADER_ECC_BITS CONFIG_PMECC_CAP > +#define CONFIG_SPL_AT91_HEADER_ECC_OFFSET 36 Just a nitpick here: Can we take this parameter from the existing definition while not use new definition? Or else, if the header using different parameter with what u-boot nand driver use, then if flash through u-boot, it won't boot. > +It enables the PMECC hardware and set the relevant parameters as known from > +the SAM-BA tool. We are able to use other defined values here cause we check > +these values in the buildsystem. Therefore the CONFIG_PMECC_SECTOR_SIZE is > +expanded to the correct value set some lines above. > + > +The mkimage image type atmelimage also set the 6'th interrupt vector to the > +correct value. This feature can also be used to setup a boot.bin for MMC boot. > diff --git a/spl/Makefile b/spl/Makefile > index 55500fd..8c6397e 100644 > --- a/spl/Makefile > +++ b/spl/Makefile > @@ -183,6 +183,24 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE) > MLO MLO.byteswap: $(obj)/u-boot-spl.bin > $(call if_changed,mkimage) > > +ATMEL_NAND_HEADER = usePmecc=$(CONFIG_SPL_AT91_HEADER_USE_PMECC), \ > + sectorPerPage=$(CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE), \ > + sectorSize=$(CONFIG_SPL_AT91_HEADER_SECTOR_SIZE), \ > + spareSize=$(CONFIG_SPL_AT91_HEADER_SPARE_SIZE), \ > + eccBits=$(CONFIG_SPL_AT91_HEADER_ECC_BITS), \ > + eccOffset=$(CONFIG_SPL_AT91_HEADER_ECC_OFFSET) > + > +MKIMAGEFLAGS_boot.bin = -T atmelimage > + > +ifdef CONFIG_ATMEL_NAND_HW_PMECC > +ifeq ($(CONFIG_SYS_USE_NANDFLASH),y) > +MKIMAGEFLAGS_boot.bin += -n $(subst $(space),,$(ATMEL_NAND_HEADER)) > +endif > +endif > + > +boot.bin: $(obj)/u-boot-spl.bin > + $(call if_changed,mkimage) > + > ALL-y += $(obj)/$(SPL_BIN).bin > > ifdef CONFIG_SAMSUNG > Best Regards, Bo Shen
Hi Bo, On 05/19/2014 05:13 AM, Bo Shen wrote: > On 05/16/2014 05:59 PM, Andreas Bießmann wrote: >> For sama5d3xek we need to modify the SPL image for correct detection >> by ROM >> code. >> >> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> >> --- >> >> Changes in v2: >> * add -n switch to mkimage for PMECC type NAND and CONFIG_SYS_NANDFLASH >> >> arch/arm/cpu/armv7/at91/config.mk | 10 ++++++++++ >> doc/README.atmel_pmecc | 30 ++++++++++++++++++++++++++++++ >> spl/Makefile | 18 ++++++++++++++++++ >> 3 files changed, 58 insertions(+) >> create mode 100644 arch/arm/cpu/armv7/at91/config.mk >> >> diff --git a/doc/README.atmel_pmecc b/doc/README.atmel_pmecc >> index cf8373b..5a93123 100644 >> --- a/doc/README.atmel_pmecc >> +++ b/doc/README.atmel_pmecc >> @@ -27,3 +27,33 @@ Take AT91SAM9X5EK as an example, the board >> definition file likes: >> #define CONFIG_ATMEL_NAND_HW_PMECC 1 >> #define CONFIG_PMECC_CAP 2 >> #define CONFIG_PMECC_SECTOR_SIZE 512 >> + >> +How to enable PMECC header for direct programmable boot.bin >> +----------------------------------------------------------- >> +2014-05-15 Andreas Bießmann <andreas.devel@googlemail.com> >> + >> +The usual way to program SPL into NAND flash is to use the SAM-BA >> Atmel tool. >> +This however is often not usable when doing field updates. To be able to >> +program a SPL binary into NAND flash we need to add the PMECC header >> to the >> +binary before. Chapter '12.4.4.1 NAND Flash Boot: NAND Flash >> Detection' in >> +sama5d3 SoC spec (as of 03. April 2014). We have a new image type >> added to >> +mkimage to generate this PMECC header and integrated into the build >> process of >> +SPL. >> +The required parameters in board configuration header are as follows: >> + >> +This example is working for sama5d3xek: >> + >> +#define CONFIG_SPL_AT91_HEADER_USE_PMECC 1 >> +#define CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE 4 >> +#define CONFIG_SPL_AT91_HEADER_SECTOR_SIZE CONFIG_PMECC_SECTOR_SIZE >> +#define CONFIG_SPL_AT91_HEADER_SPARE_SIZE 64 >> +#define CONFIG_SPL_AT91_HEADER_ECC_BITS CONFIG_PMECC_CAP >> +#define CONFIG_SPL_AT91_HEADER_ECC_OFFSET 36 > > Just a nitpick here: > > Can we take this parameter from the existing definition while not use > new definition? Or else, if the header using different parameter with > what u-boot nand driver use, then if flash through u-boot, it won't boot. I used the two parameters I found, sorry the rest isn't defiend anywhere (or I can't find). Can you give me pointers to the other parameters? Best regards Andreas Bießmann
Hi Andreas, On 05/19/2014 03:48 PM, Andreas Bießmann wrote: > Hi Bo, > > On 05/19/2014 05:13 AM, Bo Shen wrote: >> On 05/16/2014 05:59 PM, Andreas Bießmann wrote: >>> For sama5d3xek we need to modify the SPL image for correct detection >>> by ROM >>> code. >>> >>> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> >>> --- >>> >>> Changes in v2: >>> * add -n switch to mkimage for PMECC type NAND and CONFIG_SYS_NANDFLASH >>> >>> arch/arm/cpu/armv7/at91/config.mk | 10 ++++++++++ >>> doc/README.atmel_pmecc | 30 ++++++++++++++++++++++++++++++ >>> spl/Makefile | 18 ++++++++++++++++++ >>> 3 files changed, 58 insertions(+) >>> create mode 100644 arch/arm/cpu/armv7/at91/config.mk >>> > >>> diff --git a/doc/README.atmel_pmecc b/doc/README.atmel_pmecc >>> index cf8373b..5a93123 100644 >>> --- a/doc/README.atmel_pmecc >>> +++ b/doc/README.atmel_pmecc >>> @@ -27,3 +27,33 @@ Take AT91SAM9X5EK as an example, the board >>> definition file likes: >>> #define CONFIG_ATMEL_NAND_HW_PMECC 1 >>> #define CONFIG_PMECC_CAP 2 >>> #define CONFIG_PMECC_SECTOR_SIZE 512 >>> + >>> +How to enable PMECC header for direct programmable boot.bin >>> +----------------------------------------------------------- >>> +2014-05-15 Andreas Bießmann <andreas.devel@googlemail.com> >>> + >>> +The usual way to program SPL into NAND flash is to use the SAM-BA >>> Atmel tool. >>> +This however is often not usable when doing field updates. To be able to >>> +program a SPL binary into NAND flash we need to add the PMECC header >>> to the >>> +binary before. Chapter '12.4.4.1 NAND Flash Boot: NAND Flash >>> Detection' in >>> +sama5d3 SoC spec (as of 03. April 2014). We have a new image type >>> added to >>> +mkimage to generate this PMECC header and integrated into the build >>> process of >>> +SPL. >>> +The required parameters in board configuration header are as follows: >>> + >>> +This example is working for sama5d3xek: >>> + >>> +#define CONFIG_SPL_AT91_HEADER_USE_PMECC 1 >>> +#define CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE 4 >>> +#define CONFIG_SPL_AT91_HEADER_SECTOR_SIZE CONFIG_PMECC_SECTOR_SIZE >>> +#define CONFIG_SPL_AT91_HEADER_SPARE_SIZE 64 >>> +#define CONFIG_SPL_AT91_HEADER_ECC_BITS CONFIG_PMECC_CAP >>> +#define CONFIG_SPL_AT91_HEADER_ECC_OFFSET 36 >> >> Just a nitpick here: >> >> Can we take this parameter from the existing definition while not use >> new definition? Or else, if the header using different parameter with >> what u-boot nand driver use, then if flash through u-boot, it won't boot. > > I used the two parameters I found, sorry the rest isn't defiend anywhere > (or I can't find). Can you give me pointers to the other parameters? Can we use the following information? CONFIG_SPL_AT91_HEADER_USE_PMECC: CONFIG_ATMEL_NAND_HW_PMECC CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE: CONFIG_SYS_NAND_PAGE_SIZE / CONFIG_PMECC_SECTOR_SIZE CONFIG_SPL_AT91_HEADER_SPARE_SIZE: CONFIG_SYS_NAND_OOBSIZE CONFIG_SPL_AT91_HEADER_ECC_OFFSET: this need a little bit more calculation. take 4 bits (caps = 4) as an example: ecc_offset = oob_size - ((12 + sector_size / 512) * caps + 7) /8 = 64 - ((12 + 512 / 512) * 4 + 7) / 8 = 36. I am not sure this is worthwhile. Best Regards, Bo Shen
On 05/19/2014 10:09 AM, Bo Shen wrote: > On 05/19/2014 03:48 PM, Andreas Bießmann wrote: >> On 05/19/2014 05:13 AM, Bo Shen wrote: >>> On 05/16/2014 05:59 PM, Andreas Bießmann wrote: <snip> >>>> +#define CONFIG_SPL_AT91_HEADER_USE_PMECC 1 >>>> +#define CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE 4 >>>> +#define CONFIG_SPL_AT91_HEADER_SECTOR_SIZE CONFIG_PMECC_SECTOR_SIZE >>>> +#define CONFIG_SPL_AT91_HEADER_SPARE_SIZE 64 >>>> +#define CONFIG_SPL_AT91_HEADER_ECC_BITS CONFIG_PMECC_CAP >>>> +#define CONFIG_SPL_AT91_HEADER_ECC_OFFSET 36 >>> >>> Just a nitpick here: >>> >>> Can we take this parameter from the existing definition while not use >>> new definition? Or else, if the header using different parameter with >>> what u-boot nand driver use, then if flash through u-boot, it won't >>> boot. >> >> I used the two parameters I found, sorry the rest isn't defiend anywhere >> (or I can't find). Can you give me pointers to the other parameters? > > Can we use the following information? > > CONFIG_SPL_AT91_HEADER_USE_PMECC: CONFIG_ATMEL_NAND_HW_PMECC > > CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE: CONFIG_SYS_NAND_PAGE_SIZE / > CONFIG_PMECC_SECTOR_SIZE Unfortunately we cant do calculations within the Makefile. These parameters will be given to command line and end up in '-n usePmecc=y,sectorPerPage="0x800/512",..' This will make the atmelimage cmdline parsing way more difficult. Does anybody know some way to solve this in Makefile? Best regards Andreas Bießmann
diff --git a/arch/arm/cpu/armv7/at91/config.mk b/arch/arm/cpu/armv7/at91/config.mk new file mode 100644 index 0000000..09eab70 --- /dev/null +++ b/arch/arm/cpu/armv7/at91/config.mk @@ -0,0 +1,10 @@ +# +# Copyright (C) 2014, Andreas Bießmann <andreas.devel@googlemail.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# +ifdef CONFIG_SPL_BUILD +ALL-y += boot.bin +else +ALL-y += u-boot.img +endif diff --git a/doc/README.atmel_pmecc b/doc/README.atmel_pmecc index cf8373b..5a93123 100644 --- a/doc/README.atmel_pmecc +++ b/doc/README.atmel_pmecc @@ -27,3 +27,33 @@ Take AT91SAM9X5EK as an example, the board definition file likes: #define CONFIG_ATMEL_NAND_HW_PMECC 1 #define CONFIG_PMECC_CAP 2 #define CONFIG_PMECC_SECTOR_SIZE 512 + +How to enable PMECC header for direct programmable boot.bin +----------------------------------------------------------- +2014-05-15 Andreas Bießmann <andreas.devel@googlemail.com> + +The usual way to program SPL into NAND flash is to use the SAM-BA Atmel tool. +This however is often not usable when doing field updates. To be able to +program a SPL binary into NAND flash we need to add the PMECC header to the +binary before. Chapter '12.4.4.1 NAND Flash Boot: NAND Flash Detection' in +sama5d3 SoC spec (as of 03. April 2014). We have a new image type added to +mkimage to generate this PMECC header and integrated into the build process of +SPL. +The required parameters in board configuration header are as follows: + +This example is working for sama5d3xek: + +#define CONFIG_SPL_AT91_HEADER_USE_PMECC 1 +#define CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE 4 +#define CONFIG_SPL_AT91_HEADER_SECTOR_SIZE CONFIG_PMECC_SECTOR_SIZE +#define CONFIG_SPL_AT91_HEADER_SPARE_SIZE 64 +#define CONFIG_SPL_AT91_HEADER_ECC_BITS CONFIG_PMECC_CAP +#define CONFIG_SPL_AT91_HEADER_ECC_OFFSET 36 + +It enables the PMECC hardware and set the relevant parameters as known from +the SAM-BA tool. We are able to use other defined values here cause we check +these values in the buildsystem. Therefore the CONFIG_PMECC_SECTOR_SIZE is +expanded to the correct value set some lines above. + +The mkimage image type atmelimage also set the 6'th interrupt vector to the +correct value. This feature can also be used to setup a boot.bin for MMC boot. diff --git a/spl/Makefile b/spl/Makefile index 55500fd..8c6397e 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -183,6 +183,24 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE) MLO MLO.byteswap: $(obj)/u-boot-spl.bin $(call if_changed,mkimage) +ATMEL_NAND_HEADER = usePmecc=$(CONFIG_SPL_AT91_HEADER_USE_PMECC), \ + sectorPerPage=$(CONFIG_SPL_AT91_HEADER_SECTOR_PER_PAGE), \ + sectorSize=$(CONFIG_SPL_AT91_HEADER_SECTOR_SIZE), \ + spareSize=$(CONFIG_SPL_AT91_HEADER_SPARE_SIZE), \ + eccBits=$(CONFIG_SPL_AT91_HEADER_ECC_BITS), \ + eccOffset=$(CONFIG_SPL_AT91_HEADER_ECC_OFFSET) + +MKIMAGEFLAGS_boot.bin = -T atmelimage + +ifdef CONFIG_ATMEL_NAND_HW_PMECC +ifeq ($(CONFIG_SYS_USE_NANDFLASH),y) +MKIMAGEFLAGS_boot.bin += -n $(subst $(space),,$(ATMEL_NAND_HEADER)) +endif +endif + +boot.bin: $(obj)/u-boot-spl.bin + $(call if_changed,mkimage) + ALL-y += $(obj)/$(SPL_BIN).bin ifdef CONFIG_SAMSUNG
For sama5d3xek we need to modify the SPL image for correct detection by ROM code. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> --- Changes in v2: * add -n switch to mkimage for PMECC type NAND and CONFIG_SYS_NANDFLASH arch/arm/cpu/armv7/at91/config.mk | 10 ++++++++++ doc/README.atmel_pmecc | 30 ++++++++++++++++++++++++++++++ spl/Makefile | 18 ++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 arch/arm/cpu/armv7/at91/config.mk