| Message ID | 1311617138-17041-6-git-send-email-simonschwarzcor@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Dear Simon, Am 25.07.2011 um 20:05 schrieb Simon Schwarz: > Add NAND SPL support to the devkit8000 config > > --- > V1 changes: > ADD devkit8000_nand to board.cfg > ADD nand_spl Makefile, llinker script, spl-devkit8000.c > ADD config ecc, SRAM, SPL to board config > ADD CONFIG_SYS_SRAM_START and _SIZE to board config > ADD CONFIG_SYS_SPL_TEXT_BASE, _MAX_SIZE and SPL_STACK to board config > > V2 changes: > ADD CONFIG_SPL and LIBCOMMON, LIBDISK, I2C, LIBGENERIC, SERIAL, POWER, NAND and > CONFIG_SPL_LDSCRIPT to board config > CHG renamed CONFIG_SYS_SPL_* to CONFIG_SPL_* > ADD CONFIG_SYS_NAND_U_BOOT_START, _OFFS, _SIZE, _DST to board config: Where to > expect u-boot and where to load it. > ADD some barrier to not build board_eth_init in SPL > DEL no changes to board.cfg > DEL everything used the old nand_spl layout (Makefile, linker script, > spl-devkit8000.c) > CHG cosmetic > > Transition from V1 to V2 also includes that this patch is now based on > - the new SPL layout by Aneesh V and Daniel Schwierzeck > - the OMAP4 SPL patches by Aneesh V > > This is the successor of "[U-Boot,5/5] devkit8000 nand_spl: add nand_spl > support" > (http://article.gmane.org/gmane.comp.boot-loaders.u-boot/102111) > > Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com> Put your SoB before the first '---'! > --- > board/timll/devkit8000/devkit8000.c | 2 +- > include/configs/devkit8000.h | 46 +++++++++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+), 1 deletions(-) > > diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c > index 95afaaa..9b53742 100644 > --- a/board/timll/devkit8000/devkit8000.c > +++ b/board/timll/devkit8000/devkit8000.c > @@ -119,7 +119,7 @@ void set_muxconf_regs(void) > MUX_DEVKIT8000(); > } > > -#ifdef CONFIG_DRIVER_DM9000 > +#if defined(CONFIG_DRIVER_DM9000) & !defined(CONFIG_SPL_BUILD) > /* > * Routine: board_eth_init > * Description: Setting up the Ethernet hardware. > diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h > index 125c690..46c1e3d 100644 > --- a/include/configs/devkit8000.h > +++ b/include/configs/devkit8000.h > @@ -307,4 +307,50 @@ > CONFIG_SYS_INIT_RAM_SIZE - \ > GENERATED_GBL_DATA_SIZE) > > +/* SRAM config */ > +#define CONFIG_SYS_SRAM_START 0x40200000 > +#define CONFIG_SYS_SRAM_SIZE 0xFFFF /*64 kB*/ 64 kB is (64 << 10) which is 0x10000! 0xFFFF is 64 kB - 1 > + > +/* Defines for SPL */ > +#define CONFIG_SPL > + > +#define CONFIG_SPL_LIBCOMMON_SUPPORT > +#define CONFIG_SPL_LIBDISK_SUPPORT > +#define CONFIG_SPL_I2C_SUPPORT > +#define CONFIG_SPL_LIBGENERIC_SUPPORT > +#define CONFIG_SPL_SERIAL_SUPPORT > +#define CONFIG_SPL_POWER_SUPPORT > +#define CONFIG_SPL_NAND_SUPPORT > +#define CONFIG_SPL_LDSCRIPT $(CPUDIR)/omap-common/u-boot-spl.lds > + > +#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ > +#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */ This is correct > +#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK > + > +#define CONFIG_SPL_BSS_START_ADDR 0x80000000 /*CONFIG_SYS_SDRAM_BASE*/ > +#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 > + > +/* NAND boot config */ > +#define CONFIG_SYS_NAND_PAGE_COUNT 64 > +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 > +#define CONFIG_SYS_NAND_OOBSIZE 64 > +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) > +#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 > +#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\ > + 10, 11, 12, 13} > + > +#define CONFIG_SYS_NAND_ECCSIZE 512 > +#define CONFIG_SYS_NAND_ECCBYTES 3 > + > +#define CONFIG_SYS_NAND_ECCSTEPS (CONFIG_SYS_NAND_PAGE_SIZE / \ > + CONFIG_SYS_NAND_ECCSIZE) > +#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \ > + CONFIG_SYS_NAND_ECCSTEPS) > + > +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST > + > +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 > +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000 > +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE > + > #endif /* __CONFIG_H */ > -- > 1.7.4.1 regards Andreas Bießmann
Dear Andreas, On 07/26/2011 08:17 AM, Andreas Bießmann wrote: > Dear Simon, > > Am 25.07.2011 um 20:05 schrieb Simon Schwarz: > >> Add NAND SPL support to the devkit8000 config >> >> --- >> V1 changes: >> ADD devkit8000_nand to board.cfg >> ADD nand_spl Makefile, llinker script, spl-devkit8000.c >> ADD config ecc, SRAM, SPL to board config >> ADD CONFIG_SYS_SRAM_START and _SIZE to board config >> ADD CONFIG_SYS_SPL_TEXT_BASE, _MAX_SIZE and SPL_STACK to board config >> >> V2 changes: >> ADD CONFIG_SPL and LIBCOMMON, LIBDISK, I2C, LIBGENERIC, SERIAL, POWER, NAND and >> CONFIG_SPL_LDSCRIPT to board config >> CHG renamed CONFIG_SYS_SPL_* to CONFIG_SPL_* >> ADD CONFIG_SYS_NAND_U_BOOT_START, _OFFS, _SIZE, _DST to board config: Where to >> expect u-boot and where to load it. >> ADD some barrier to not build board_eth_init in SPL >> DEL no changes to board.cfg >> DEL everything used the old nand_spl layout (Makefile, linker script, >> spl-devkit8000.c) >> CHG cosmetic >> >> Transition from V1 to V2 also includes that this patch is now based on >> - the new SPL layout by Aneesh V and Daniel Schwierzeck >> - the OMAP4 SPL patches by Aneesh V >> >> This is the successor of "[U-Boot,5/5] devkit8000 nand_spl: add nand_spl >> support" >> (http://article.gmane.org/gmane.comp.boot-loaders.u-boot/102111) >> >> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com> > > Put your SoB before the first '---'! Changed. >> --- >> board/timll/devkit8000/devkit8000.c | 2 +- >> include/configs/devkit8000.h | 46 +++++++++++++++++++++++++++++++++++ >> 2 files changed, 47 insertions(+), 1 deletions(-) >> >> diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c >> index 95afaaa..9b53742 100644 >> --- a/board/timll/devkit8000/devkit8000.c >> +++ b/board/timll/devkit8000/devkit8000.c >> @@ -119,7 +119,7 @@ void set_muxconf_regs(void) >> MUX_DEVKIT8000(); >> } >> >> -#ifdef CONFIG_DRIVER_DM9000 >> +#if defined(CONFIG_DRIVER_DM9000)& !defined(CONFIG_SPL_BUILD) >> /* >> * Routine: board_eth_init >> * Description: Setting up the Ethernet hardware. >> diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h >> index 125c690..46c1e3d 100644 >> --- a/include/configs/devkit8000.h >> +++ b/include/configs/devkit8000.h >> @@ -307,4 +307,50 @@ >> CONFIG_SYS_INIT_RAM_SIZE - \ >> GENERATED_GBL_DATA_SIZE) >> >> +/* SRAM config */ >> +#define CONFIG_SYS_SRAM_START 0x40200000 >> +#define CONFIG_SYS_SRAM_SIZE 0xFFFF /*64 kB*/ > > 64 kB is (64<< 10) which is 0x10000! > 0xFFFF is 64 kB - 1 Changed. >> + >> +/* Defines for SPL */ >> +#define CONFIG_SPL >> + >> +#define CONFIG_SPL_LIBCOMMON_SUPPORT >> +#define CONFIG_SPL_LIBDISK_SUPPORT >> +#define CONFIG_SPL_I2C_SUPPORT >> +#define CONFIG_SPL_LIBGENERIC_SUPPORT >> +#define CONFIG_SPL_SERIAL_SUPPORT >> +#define CONFIG_SPL_POWER_SUPPORT >> +#define CONFIG_SPL_NAND_SUPPORT >> +#define CONFIG_SPL_LDSCRIPT $(CPUDIR)/omap-common/u-boot-spl.lds >> + >> +#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ >> +#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */ > > This is correct > >> +#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK >> + >> +#define CONFIG_SPL_BSS_START_ADDR 0x80000000 /*CONFIG_SYS_SDRAM_BASE*/ >> +#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 >> + >> +/* NAND boot config */ >> +#define CONFIG_SYS_NAND_PAGE_COUNT 64 >> +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 >> +#define CONFIG_SYS_NAND_OOBSIZE 64 >> +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) >> +#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 >> +#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\ >> + 10, 11, 12, 13} >> + >> +#define CONFIG_SYS_NAND_ECCSIZE 512 >> +#define CONFIG_SYS_NAND_ECCBYTES 3 >> + >> +#define CONFIG_SYS_NAND_ECCSTEPS (CONFIG_SYS_NAND_PAGE_SIZE / \ >> + CONFIG_SYS_NAND_ECCSIZE) >> +#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \ >> + CONFIG_SYS_NAND_ECCSTEPS) >> + >> +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST >> + >> +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 >> +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000 >> +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE >> + >> #endif /* __CONFIG_H */ >> -- >> 1.7.4.1 > > regards > > Andreas Bießmann > Regards Simon
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 95afaaa..9b53742 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -119,7 +119,7 @@ void set_muxconf_regs(void) MUX_DEVKIT8000(); } -#ifdef CONFIG_DRIVER_DM9000 +#if defined(CONFIG_DRIVER_DM9000) & !defined(CONFIG_SPL_BUILD) /* * Routine: board_eth_init * Description: Setting up the Ethernet hardware. diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 125c690..46c1e3d 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -307,4 +307,50 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) +/* SRAM config */ +#define CONFIG_SYS_SRAM_START 0x40200000 +#define CONFIG_SYS_SRAM_SIZE 0xFFFF /*64 kB*/ + +/* Defines for SPL */ +#define CONFIG_SPL + +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBDISK_SUPPORT +#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_POWER_SUPPORT +#define CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_LDSCRIPT $(CPUDIR)/omap-common/u-boot-spl.lds + +#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ +#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */ +#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK + +#define CONFIG_SPL_BSS_START_ADDR 0x80000000 /*CONFIG_SYS_SDRAM_BASE*/ +#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 + +/* NAND boot config */ +#define CONFIG_SYS_NAND_PAGE_COUNT 64 +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 +#define CONFIG_SYS_NAND_OOBSIZE 64 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 +#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\ + 10, 11, 12, 13} + +#define CONFIG_SYS_NAND_ECCSIZE 512 +#define CONFIG_SYS_NAND_ECCBYTES 3 + +#define CONFIG_SYS_NAND_ECCSTEPS (CONFIG_SYS_NAND_PAGE_SIZE / \ + CONFIG_SYS_NAND_ECCSIZE) +#define CONFIG_SYS_NAND_ECCTOTAL (CONFIG_SYS_NAND_ECCBYTES * \ + CONFIG_SYS_NAND_ECCSTEPS) + +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST + +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000 +#define CONFIG_SYS_NAND_U_BOOT_DST CONFIG_SYS_TEXT_BASE + #endif /* __CONFIG_H */
Add NAND SPL support to the devkit8000 config --- V1 changes: ADD devkit8000_nand to board.cfg ADD nand_spl Makefile, llinker script, spl-devkit8000.c ADD config ecc, SRAM, SPL to board config ADD CONFIG_SYS_SRAM_START and _SIZE to board config ADD CONFIG_SYS_SPL_TEXT_BASE, _MAX_SIZE and SPL_STACK to board config V2 changes: ADD CONFIG_SPL and LIBCOMMON, LIBDISK, I2C, LIBGENERIC, SERIAL, POWER, NAND and CONFIG_SPL_LDSCRIPT to board config CHG renamed CONFIG_SYS_SPL_* to CONFIG_SPL_* ADD CONFIG_SYS_NAND_U_BOOT_START, _OFFS, _SIZE, _DST to board config: Where to expect u-boot and where to load it. ADD some barrier to not build board_eth_init in SPL DEL no changes to board.cfg DEL everything used the old nand_spl layout (Makefile, linker script, spl-devkit8000.c) CHG cosmetic Transition from V1 to V2 also includes that this patch is now based on - the new SPL layout by Aneesh V and Daniel Schwierzeck - the OMAP4 SPL patches by Aneesh V This is the successor of "[U-Boot,5/5] devkit8000 nand_spl: add nand_spl support" (http://article.gmane.org/gmane.comp.boot-loaders.u-boot/102111) Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com> --- board/timll/devkit8000/devkit8000.c | 2 +- include/configs/devkit8000.h | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-)