[U-Boot] [PATCH V2 0/2] OMAP3: am3517_evm: Add BCH8 ECC and UBIFS NAND support
This patch series updates NAND support for the LogicPD AM3517 EVM/EXP development boards and their corresponding System On Modules.
OMAP3: am3517_evm: Use BCH8 ECC for NAND include/configs/am3517_evm.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
OMAP3: am3517_evm: Add NAND MTD partitions with UBI/UBIFS support configs/am3517_evm_defconfig | 2 + include/configs/am3517_evm.h | 309 +++++++++++++++++++++---------------------- 2 files changed, 153 insertions(+), 158 deletions(-)
Select 8-bit BCH ecc-scheme with s/w based error correction - OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
Signed-off-by: Derald D. Woods woods.technical@gmail.com --- include/configs/am3517_evm.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 4d662ad..98a59c5 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -328,8 +328,8 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_NAND_SIMPLE -#define CONFIG_SPL_TEXT_BASE 0x40200800 -#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ +#define CONFIG_SPL_TEXT_BASE 0x40200000 +#define CONFIG_SPL_MAX_SIZE (64 * 1024)
#define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ @@ -354,17 +354,26 @@ #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
/* NAND boot config */ +#define CONFIG_BCH +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #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_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS -#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\ - 10, 11, 12, 13} +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, 10, \ + 11, 12, 13, 14, 16, 17, 18, 19, 20, \ + 21, 22, 23, 24, 25, 26, 27, 28, 30, \ + 31, 32, 33, 34, 35, 36, 37, 38, 39, \ + 40, 41, 42, 44, 45, 46, 47, 48, 49, \ + 50, 51, 52, 53, 54, 55, 56 } + #define CONFIG_SYS_NAND_ECCSIZE 512 -#define CONFIG_SYS_NAND_ECCBYTES 3 -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW +#define CONFIG_SYS_NAND_ECCBYTES 13 +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
On Sat, Mar 05, 2016 at 01:19:58PM -0600, Derald D. Woods wrote:
Select 8-bit BCH ecc-scheme with s/w based error correction
- OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
On Sat, Mar 05, 2016 at 01:19:58PM -0600, Derald D. Woods wrote:
Select 8-bit BCH ecc-scheme with s/w based error correction
- OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
Signed-off-by: Derald D. Woods woods.technical@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
- Add required UBI/UBIFS config definitions - Add reasonable MTD partition layout - Remove JFFS2 config definitions - Drop some CFI verbage and definitions - Make comment 'one-liners' truly one line - Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com --- configs/am3517_evm_defconfig | 2 + include/configs/am3517_evm.h | 309 +++++++++++++++++++++---------------------- 2 files changed, 153 insertions(+), 158 deletions(-)
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index cde84fe..c7699e0 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -4,9 +4,11 @@ CONFIG_TARGET_AM3517_EVM=y CONFIG_SPL=y CONFIG_FIT=y CONFIG_SYS_PROMPT="AM3517_EVM # " +CONFIG_SYS_EXTRA_OPTIONS="NAND" # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_GPIO=y CONFIG_SYS_NS16550=y diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 98a59c5..5b689a8 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -13,14 +13,17 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_SYS_CACHELINE_SIZE 64 +/* High Level Configuration Options */
-/* - * High Level Configuration Options - */ -#define CONFIG_OMAP 1 /* in a TI OMAP core */ -#define CONFIG_OMAP3_AM3517EVM 1 /* working with AM3517EVM */ +#define CONFIG_OMAP #define CONFIG_OMAP_COMMON + +#define CONFIG_SYS_CACHELINE_SIZE 64 + +#define CONFIG_SYS_NO_FLASH + +#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ + /* Common ARM Erratas */ #define CONFIG_ARM_ERRATA_454179 #define CONFIG_ARM_ERRATA_430973 @@ -28,59 +31,48 @@
#define CONFIG_EMIF4 /* The chip has EMIF4 controller */
+/* + * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM + * 64 bytes before this address should be set aside for u-boot.img's + * header. That is 0x800FFFC0--0x80100000 should not be used for any + * other needs. + */ +#define CONFIG_SYS_TEXT_BASE 0x80100000 +#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 +#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 + #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h>
-/* - * Display CPU and Board information - */ -#define CONFIG_DISPLAY_CPUINFO 1 -#define CONFIG_DISPLAY_BOARDINFO 1 +/* Display CPU and Board information */ +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_OF_LIBFDT +#define CONFIG_MISC_INIT_R +#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG +#define CONFIG_REVISION_TAG
/* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
-#define CONFIG_MISC_INIT_R - -#define CONFIG_OF_LIBFDT - -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_REVISION_TAG 1 +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (16 << 20)
-/* - * Size of malloc() pool - */ -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB sector */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10)) -/* - * DDR related - */ -#define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024) - -/* - * Hardware drivers - */ +/* Hardware drivers */
-/* - * OMAP GPIO configuration - */ +/* OMAP GPIO configuration */ #define CONFIG_OMAP_GPIO
-/* - * NS16550 Configuration - */ +/* NS16550 Configuration */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
-/* - * select serial console configuration - */ +/* select serial console configuration */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 3 /* UART3 on AM3517 EVM */ @@ -90,10 +82,12 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_MMC 1 -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_OMAP_HSMMC 1 -#define CONFIG_DOS_PARTITION 1 + +/* SD/MMC */ +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_OMAP_HSMMC +#define CONFIG_DOS_PARTITION
/* * USB configuration @@ -111,7 +105,6 @@
#define CONFIG_USB_STORAGE #define CONGIG_CMD_STORAGE -#define CONFIG_CMD_FAT
#ifdef CONFIG_USB_KEYBOARD #define CONFIG_SYS_USB_EVENT_POLL @@ -129,30 +122,29 @@ #endif /* CONFIG_USB_MUSB_AM35X */
/* commands to include */ -#define CONFIG_CMD_EXT2 /* EXT2 Support */ -#define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ +#define CONFIG_CMD_NAND +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE - +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_CMD_PART +#define CONFIG_CMD_ASKENV #define CONFIG_CMD_BOOTZ - -#define CONFIG_CMD_I2C /* I2C serial bus support */ -#define CONFIG_CMD_MMC /* MMC support */ -#define CONFIG_CMD_NAND /* NAND support */ +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MMC #define CONFIG_CMD_DHCP -#undef CONFIG_CMD_PING +#define CONFIG_CMD_PING +#define CONFIG_CMD_MTDPARTS
- -#define CONFIG_SYS_NO_FLASH +/* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_OMAP34XX
-/* - * Ethernet - */ +/* Ethernet */ #define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC_USE_RMII #define CONFIG_MII @@ -162,23 +154,66 @@ #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10
-/* - * Board NAND Info. - */ +/* Board NAND Info. */ +#ifdef CONFIG_NAND +#define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_GPMC_PREFETCH +#define CONFIG_BCH +#define CONFIG_CMD_UBI /* UBI-formated MTD partition support */ +#define CONFIG_CMD_UBIFS /* Read-only UBI volume operations */ +#define CONFIG_RBTREE /* required by CONFIG_CMD_UBI */ +#define CONFIG_LZO /* required by CONFIG_CMD_UBIFS */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access */ /* nand at CS0 */ - #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_JFFS2_NAND -/* nand device jffs2 lives on */ -#define CONFIG_JFFS2_DEV "nand0" -/* start of jffs2 partition */ -#define CONFIG_JFFS2_PART_OFFSET 0x680000 -#define CONFIG_JFFS2_PART_SIZE 0xf980000 /* sz of jffs2 part */ +#define CONFIG_SYS_NAND_BUSWIDTH_16BIT +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#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 NAND_LARGE_BADBLOCK_POS +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, 10, \ + 11, 12, 13, 14, 16, 17, 18, 19, 20, \ + 21, 22, 23, 24, 25, 26, 27, 28, 30, \ + 31, 32, 33, 34, 35, 36, 37, 38, 39, \ + 40, 41, 42, 44, 45, 46, 47, 48, 49, \ + 50, 51, 52, 53, 54, 55, 56 } + +#define CONFIG_SYS_NAND_ECCSIZE 512 +#define CONFIG_SYS_NAND_ECCBYTES 13 +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 +#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 +#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +/* NAND block size is 128 KiB. Synchronize these values with + * corresponding Device Tree entries in Linux: + * MLO(SPL) 4 * NAND_BLOCK_SIZE = 512 KiB @ 0x000000 + * U-Boot 15 * NAND_BLOCK_SIZE = 1920 KiB @ 0x080000 + * U-Boot environment 2 * NAND_BLOCK_SIZE = 256 KiB @ 0x260000 + * Kernel 64 * NAND_BLOCK_SIZE = 8 MiB @ 0x2A0000 + * DTB 4 * NAND_BLOCK_SIZE = 512 KiB @ 0xAA0000 + * RootFS Remaining Flash Space @ 0xB20000 + */ +#define MTDIDS_DEFAULT "nand0=omap2-nand.0" +#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \ + "512k(MLO)," \ + "1920k(u-boot)," \ + "256k(u-boot-env)," \ + "8m(kernel)," \ + "512k(dtb)," \ + "-(rootfs)" +#else +#define MTDIDS_DEFAULT +#define MTDPARTS_DEFAULT +#endif /* CONFIG_NAND */
/* Environment information */ #define CONFIG_BOOTDELAY 10 @@ -194,18 +229,24 @@ "bootenv=uEnv.txt\0" \ "cmdline=\0" \ "optargs=\0" \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ "mmcdev=0\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcrootfstype=ext4 rootwait fixrtc\0" \ "mmcargs=setenv bootargs console=${console} " \ + "${mtdparts} " \ "${optargs} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype} " \ "${cmdline}\0" \ "nandargs=setenv bootargs console=${console} " \ - "root=/dev/mtdblock4 rw " \ - "rootfstype=jffs2\0" \ + "${mtdparts} " \ + "${optargs} " \ + "root=ubi0:rootfs rw ubi.mtd=rootfs " \ + "rootfstype=ubifs rootwait " \ + "${cmdline}\0" \ "loadbootenv=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootenv}\0"\ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ @@ -218,8 +259,9 @@ "bootz ${loadaddr} - ${fdtaddr}\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ - "nand read ${loadaddr} 280000 400000; " \ - "bootm ${loadaddr}\0" \ + "nand read ${loadaddr} 2a0000 800000; " \ + "nand read ${fdtaddr} aa0000 80000; " \ + "bootm ${loadaddr} - ${fdtaddr}\0" \
#define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ @@ -240,20 +282,25 @@ "fi; " \ "else run nandboot; fi"
-#define CONFIG_AUTO_COMPLETE 1 -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ +/* Miscellaneous configurable options */ +#define CONFIG_AUTO_COMPLETE +#define CONFIG_CMDLINE_EDITING +#define CONFIG_VERSION_VARIABLE +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_PARTITION_UUIDS + +/* We set the max number of command args high to avoid HUSH bugs. */ +#define CONFIG_SYS_MAXARGS 64 + +/* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 512 /* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 32 /* max number of command */ - /* args */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + + sizeof(CONFIG_SYS_PROMPT) + 16) /* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + /* memtest works on */ #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) #define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ @@ -270,16 +317,18 @@ #define CONFIG_SYS_TIMERBASE OMAP34XX_GPT2 #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
-/*----------------------------------------------------------------------- - * Physical Memory Map - */ -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ -#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 +/* Physical Memory Map */ +#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 +#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 +#define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024) +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 +#define CONFIG_SYS_INIT_RAM_SIZE 0x800 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE)
-/*----------------------------------------------------------------------- - * FLASH and environment organization - */ +/* FLASH and environment organization */
/* **** PISMO SUPPORT *** */ #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors */ @@ -287,42 +336,19 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
-#if defined(CONFIG_CMD_NAND) +#if defined(CONFIG_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE #endif
/* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
-#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_ENV_IS_IN_NAND 1 -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ - #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_ENV_SIZE CONFIG_SYS_ENV_SECT_SIZE +#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET - -/*----------------------------------------------------------------------- - * CFI FLASH driver setup - */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) -#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) - -/* Flash banks JFFS2 should use */ -#define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \ - CONFIG_SYS_MAX_NAND_DEVICE) -#define CONFIG_SYS_JFFS2_MEM_NAND -/* use flash_info[2] */ -#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS -#define CONFIG_SYS_JFFS2_NUM_BANKS 1 - -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 -#define CONFIG_SYS_INIT_RAM_SIZE 0x800 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) +#define CONFIG_ENV_IS_IN_NAND
/* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK @@ -337,7 +363,7 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT @@ -350,41 +376,8 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC +#define CONFIG_SPL_MTD_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
-/* NAND boot config */ -#define CONFIG_BCH -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT -#define CONFIG_SYS_NAND_5_ADDR_CYCLE -#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 NAND_LARGE_BADBLOCK_POS -#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, 10, \ - 11, 12, 13, 14, 16, 17, 18, 19, 20, \ - 21, 22, 23, 24, 25, 26, 27, 28, 30, \ - 31, 32, 33, 34, 35, 36, 37, 38, 39, \ - 40, 41, 42, 44, 45, 46, 47, 48, 49, \ - 50, 51, 52, 53, 54, 55, 56 } - -#define CONFIG_SYS_NAND_ECCSIZE 512 -#define CONFIG_SYS_NAND_ECCBYTES 13 -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_SYS_NAND_MAX_OOBFREE 2 -#define CONFIG_SYS_NAND_MAX_ECCPOS 56 -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 - -/* - * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM - * 64 bytes before this address should be set aside for u-boot.img's - * header. That is 0x800FFFC0--0x80100000 should not be used for any - * other needs. - */ -#define CONFIG_SYS_TEXT_BASE 0x80100000 -#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 - #endif /* __CONFIG_H */
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
On Mar 7, 2016 5:35 PM, "Tom Rini" trini@konsulko.com wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
Have any OMAP3-ish boards fully converted over fully Kconfig?
-- Tom
On Mon, Mar 07, 2016 at 05:38:36PM -0600, Adam Ford wrote:
On Mar 7, 2016 5:35 PM, "Tom Rini" trini@konsulko.com wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
Have any OMAP3-ish boards fully converted over fully Kconfig?
Nothing has been fully converted over to Kconfig, everything is at the same'ish level. You're thinking DM I think :)
I'm not blocking this patch going in on Kconfig'ing stuff, either.
On Mon, Mar 07, 2016 at 06:36:56PM -0500, Tom Rini wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
-- Tom
What is the best example of it being done correctly? For OMAP3, I have an older BeagleBoard Rev. C4 and the AM3517 EXP to work with. I also have a SAMA5D3 xplained, with an Atmel SoC, and the iMX233 OlinuXino MAXI.
-- Derald
On Mar 7, 2016 6:24 PM, "Derald D. Woods" woods.technical@gmail.com wrote:
On Mon, Mar 07, 2016 at 06:36:56PM -0500, Tom Rini wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
-- Tom
What is the best example of it being done correctly? For OMAP3, I have an older BeagleBoard Rev. C4 and the AM3517 EXP to work with. I also have a SAMA5D3 xplained, with an Atmel SoC, and the iMX233 OlinuXino MAXI.
I know I am behind on helping with these boards, but moving out of my house takes a lot of time, but I would like to help port any/all Logic PD boards that TI doesn't do.
Adam
-- Derald
On Mon, Mar 07, 2016 at 06:24:05PM -0600, Derald D. Woods wrote:
On Mon, Mar 07, 2016 at 06:36:56PM -0500, Tom Rini wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
What is the best example of it being done correctly? For OMAP3, I have an older BeagleBoard Rev. C4 and the AM3517 EXP to work with. I also have a SAMA5D3 xplained, with an Atmel SoC, and the iMX233 OlinuXino MAXI.
In this case it's not about board, but about options. CONFIG_NAND needs to go away in favour of NAND being an option in drivers/mtd/nand/Kconfig, and include/configs/ cleaned out. ./tools/moveconfig.py can help here.
On Mon, Mar 07, 2016 at 08:33:33PM -0500, Tom Rini wrote:
On Mon, Mar 07, 2016 at 06:24:05PM -0600, Derald D. Woods wrote:
On Mon, Mar 07, 2016 at 06:36:56PM -0500, Tom Rini wrote:
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
... but we shouldn't be adding more extra options, we should be converting to Kconfig. Any chance you can find some time to work on starting to convert some of that over for this board at least? Thanks!
What is the best example of it being done correctly? For OMAP3, I have an older BeagleBoard Rev. C4 and the AM3517 EXP to work with. I also have a SAMA5D3 xplained, with an Atmel SoC, and the iMX233 OlinuXino MAXI.
In this case it's not about board, but about options. CONFIG_NAND needs to go away in favour of NAND being an option in drivers/mtd/nand/Kconfig, and include/configs/ cleaned out. ./tools/moveconfig.py can help here.
-- Tom
Thanks. That clarifies things a bit. This will nudge me more towards proper config generation with Kconfig.
On Sat, Mar 05, 2016 at 01:19:59PM -0600, Derald D. Woods wrote:
- Add required UBI/UBIFS config definitions
- Add reasonable MTD partition layout
- Remove JFFS2 config definitions
- Drop some CFI verbage and definitions
- Make comment 'one-liners' truly one line
- Improve readability and content arrangement
Signed-off-by: Derald D. Woods woods.technical@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (3)
-
Adam Ford -
Derald D. Woods -
Tom Rini