diff options
| author | Adam Ford <aford173@gmail.com> | 2017-10-16 14:08:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-20 16:44:07 -0400 |
| commit | 0a9ef45158d586017839d4b6fccd7f8f16672156 (patch) | |
| tree | 7891e78c9898f7019829f9658f8789cb9b418c31 /include | |
| parent | 0def58f7fd26a237bb08cfbd58ec53372b1ad06b (diff) | |
| download | u-boot-0a9ef45158d586017839d4b6fccd7f8f16672156.tar.gz u-boot-0a9ef45158d586017839d4b6fccd7f8f16672156.tar.bz2 u-boot-0a9ef45158d586017839d4b6fccd7f8f16672156.zip | |
Convert CONFIG_NAND_OMAP_GPMC et al and CONFIG_NAND_MXC to Kconfig
This converts the following to Kconfig:
CONFIG_NAND_MXC
CONFIG_NAND_OMAP_GPMC
CONFIG_NAND_OMAP_GPMC_PREFETCH
CONFIG_NAND_OMAP_ELM
CONFIG_SPL_NAND_AM33XX_BCH
CONFIG_SPL_NAND_SIMPLE
CONFIG_SYS_NAND_BUSWIDTH_16BIT
Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
[trini: Finish migration of CONFIG_SPL_NAND_SIMPLE, fix some build issues,
add CONFIG_NAND_MXC so we can do CONFIG_SYS_NAND_BUSWIDTH_16BIT]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
47 files changed, 0 insertions, 111 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 96294679bf..0e08264858 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -202,9 +202,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #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, 15, 16, 17, \ @@ -232,9 +229,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #endif diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 9b14603918..2400eee390 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -113,7 +113,6 @@ #define CONFIG_PHY_SMSC /* NAND support */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION 1 #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index db75fe547a..400a06eeb2 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -205,8 +205,6 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_NAND_OMAP_GPMC - #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */ #define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR 0x260000 @@ -235,7 +233,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) @@ -251,7 +248,6 @@ #define CONFIG_SPL_NAND_ECC /* NAND boot config */ -#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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 43fcfb2593..f4d2a2e0ce 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -73,10 +73,8 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ -#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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 743f953602..159954d7de 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -256,8 +256,6 @@ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH16_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -299,9 +297,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00180000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index c8eacdd7f8..99a96d9767 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -192,7 +192,6 @@ /* * NAND */ -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE 0xD8000000 #define CONFIG_SYS_NAND_BASE CONFIG_MXC_NAND_REGS_BASE @@ -200,7 +199,6 @@ #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_PAGE_COUNT CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 44af4d3dee..6435e5d9c9 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -242,9 +242,6 @@ #define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"*/ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 062c99c7ab..e7770b69db 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -355,8 +355,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { \ 2, 3, 4, 5, 6, 7, 8, 9, \ @@ -389,9 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #endif diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 07a173ff14..2af575a138 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -71,7 +71,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* OMAP4 and later ELM support */ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -184,9 +183,7 @@ MMCARGS */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x8000000 -#define CONFIG_NAND_OMAP_GPMC /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index b7887d90d4..80d4e49f6d 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -135,9 +135,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #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, 15, 16, 17, \ @@ -165,9 +162,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* USB configuration */ #define CONFIG_USB_MUSB_DSPS diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 6e7dcc66de..d0b990cb04 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -104,7 +104,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -240,7 +239,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index b44777fc98..4a31944e4b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -107,7 +107,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index bbc455a244..7012a95fd7 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -25,7 +25,6 @@ #endif /* NAND support */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 821b1fe534..1250112662 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -214,7 +214,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 4ad4570caa..526a81a382 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -179,7 +179,6 @@ /* SPL will use serial */ /* SPL loads an image from NAND */ -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index bd325e1305..2c2d608160 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -187,7 +187,6 @@ #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ /* NAND boot config */ -#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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 3333e5efc5..f8bffe68f2 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -162,13 +162,10 @@ #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_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -195,9 +192,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 3560611081..df8169e410 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -162,7 +162,6 @@ /* * NAND FLASH driver setup */ -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 7c680954cb..962856e101 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -125,7 +125,6 @@ /* * NAND */ -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE 0xd8000000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0xd8000000 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 1899732e5f..2bb7d079f6 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -176,7 +176,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD /* diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index dcc12dd604..8b5f169733 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -75,7 +75,6 @@ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR_AXI -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_SYS_NAND_LARGEPAGE diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 2a77430e7c..b4b8c4367e 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -239,9 +239,6 @@ */ /* **** PISMO SUPPORT *** */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH /* Redundant Environment */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ @@ -268,7 +265,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 3867f7a091..a9bfec2c49 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -122,7 +122,6 @@ /* * NAND driver */ -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index f16bfb98e4..18695d2686 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -182,7 +182,6 @@ /* * NAND FLASH driver setup */ -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 2417a1ab9c..d1d5ae523f 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR_AXI -#define CONFIG_NAND_MXC #define CONFIG_MXC_NAND_REGS_BASE NFC_BASE_ADDR_AXI #define CONFIG_MXC_NAND_IP_REGS_BASE NFC_BASE_ADDR #define CONFIG_SYS_NAND_LARGEPAGE diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 06232bdfea..399ed07855 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -68,7 +68,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ @@ -245,7 +244,6 @@ /* Defines for SPL */ /* NAND boot config */ -#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 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 417d45b582..f9a7e0ca8a 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -57,7 +57,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 3618d0ec1a..4adc66e2ab 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -48,10 +48,8 @@ /* NAND */ #if defined(CONFIG_NAND) -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_FLASH_BASE NAND_BASE #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#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 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 5118b93446..123de88711 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_ONENAND_BLOCK_SIZE (128*1024) /* NAND config */ -#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 @@ -136,7 +135,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_NAND_OMAP_GPMC /* UBI configuration */ #define CONFIG_SPL_UBI 1 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index f7db79d11c..5f8f9d7854 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -63,13 +63,10 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC - #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index cb92bd9c08..8257afbe61 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -191,7 +191,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE 0x800 /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 7d5e926d1b..659bf0776f 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -48,7 +48,6 @@ */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index cbbe7d4e2f..ed40a4b9e3 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 58b683a481..5dba7d279a 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_CS 3 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE #define CONFIG_SYS_NAND_MASK_CLE 0x10 @@ -192,7 +191,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 242a13912b..570c375cdc 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -113,8 +113,6 @@ /* SPL */ /* NAND support */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM /* NAND Configuration. */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 1997c2dd5a..7ef95faca4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -115,7 +115,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -501,8 +500,6 @@ "512k(mtdoops)," \ "-(configuration)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BASE (0x08000000) /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index ba8483f0bf..80828272f2 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -123,7 +123,6 @@ */ /* **** PISMO SUPPORT *** */ -#define CONFIG_NAND_OMAP_GPMC /* Redundant Environment */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ @@ -155,7 +154,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_CONSOLE -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ @@ -186,7 +184,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 @@ -199,7 +196,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index f19a230b7a..8ca50dc078 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -79,7 +79,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -88,7 +87,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -214,7 +212,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 430c9a7623..3cdd9741b2 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -86,7 +86,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 1898a82356..ddeef6007d 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -66,19 +66,15 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* NAND: SPL related configs */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* NAND: device related configs */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #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, 15, 16, 17, \ @@ -111,7 +107,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ #define CONFIG_SPL_TEXT_BASE 0x40400000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index bf44121a0f..66cacdf347 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -74,10 +74,6 @@ * s_init when we have SPL used. */ -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - /* Now bring in the rest of the common code. */ #include <configs/ti_armv7_omap.h> diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index 306f503d9e..da5fc8108f 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -21,7 +21,6 @@ * access CS0 at is 0x8000000. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #ifndef CONFIG_SYS_NAND_BASE #define CONFIG_SYS_NAND_BASE 0x8000000 #endif diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 531bffca8c..72c4b184d9 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -61,7 +61,6 @@ (64 << 20)) #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_NAND_BASE 0x30000000 #endif diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 018e4c2512..8994400de9 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -142,10 +142,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ #undef CONFIG_SYS_I2C diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 73c1d8f66e..539164177b 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -103,10 +103,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD #undef CONFIG_TIMER #endif diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 33071ef507..8e245e9182 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -82,7 +82,6 @@ "2m(fdt)," \ "-(ubi)" -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -244,7 +243,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 15b21ef32b..8ea5e48483 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -171,7 +171,6 @@ /* * NAND FLASH driver setup */ -#define CONFIG_NAND_MXC #define CONFIG_NAND_MXC_V1_1 #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_MAX_NAND_DEVICE 1 |