Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

omap3: remove remnant macros GPMC_NAND_ECC_LP_x8_LAYOUT and GPMC_NAND_ECC_LP_x16_LAYOUT

Browse source 
OMAP3 used GPMC_NAND_ECC_LP_x8_LAYOUT and GPMC_NAND_ECC_LP_x16_LAYOUT macros
to configure GPMC controller for x7 or x8 bit device connected to its interface.
Now this information is encoded in CONFIG_SYS_NAND_DEVICE_WIDTH macro, so above
macros can be completely removed.

Signed-off-by: Pekon Gupta <pekon@ti.com>
This commit is contained in:
pekon gupta 2014-05-06 00:46:20 +05:30 committed by Tom Rini
parent b80a660338
commit 68128e0a86
8 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/cpu/armv7/omap3/mem.c
View file

@ -21,17 +21,6 @@
struct gpmc *gpmc_cfg; struct gpmc *gpmc_cfg;
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
#if defined(GPMC_NAND_ECC_SP_x8_LAYOUT) || defined(GPMC_NAND_ECC_LP_x8_LAYOUT)
static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
SMNAND_GPMC_CONFIG1,
SMNAND_GPMC_CONFIG2,
SMNAND_GPMC_CONFIG3,
SMNAND_GPMC_CONFIG4,
SMNAND_GPMC_CONFIG5,
SMNAND_GPMC_CONFIG6,
0,
};
#else
static const u32 gpmc_m_nand[GPMC_MAX_REG] = { static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG1,
M_NAND_GPMC_CONFIG2, M_NAND_GPMC_CONFIG2,
@ -40,7 +29,6 @@ static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
M_NAND_GPMC_CONFIG5, M_NAND_GPMC_CONFIG5,
M_NAND_GPMC_CONFIG6, 0 M_NAND_GPMC_CONFIG6, 0
}; };
#endif
#endif /* CONFIG_CMD_NAND */ #endif /* CONFIG_CMD_NAND */
#if defined(CONFIG_CMD_ONENAND) #if defined(CONFIG_CMD_ONENAND)

8
arch/arm/include/asm/arch-omap3/mem.h
View file

@ -354,14 +354,6 @@ enum {
#define GPMC_CS_ENABLE 0x1 #define GPMC_CS_ENABLE 0x1
#define SMNAND_GPMC_CONFIG1 0x00000800
#define SMNAND_GPMC_CONFIG2 0x00141400
#define SMNAND_GPMC_CONFIG3 0x00141400
#define SMNAND_GPMC_CONFIG4 0x0F010F01
#define SMNAND_GPMC_CONFIG5 0x010C1414
#define SMNAND_GPMC_CONFIG6 0x1F0F0A80
#define SMNAND_GPMC_CONFIG7 0x00000C44
#define M_NAND_GPMC_CONFIG1 0x00001800 #define M_NAND_GPMC_CONFIG1 0x00001800
#define M_NAND_GPMC_CONFIG2 0x00141400 #define M_NAND_GPMC_CONFIG2 0x00141400
#define M_NAND_GPMC_CONFIG3 0x00141400 #define M_NAND_GPMC_CONFIG3 0x00141400

12
board/compulab/cm_t35/cm_t35.c
View file

@ -54,12 +54,12 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
}; };
static u32 gpmc_nand_config[GPMC_MAX_REG] = { static u32 gpmc_nand_config[GPMC_MAX_REG] = {
SMNAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG1,
SMNAND_GPMC_CONFIG2, M_NAND_GPMC_CONFIG2,
SMNAND_GPMC_CONFIG3, M_NAND_GPMC_CONFIG3,
SMNAND_GPMC_CONFIG4, M_NAND_GPMC_CONFIG4,
SMNAND_GPMC_CONFIG5, M_NAND_GPMC_CONFIG5,
SMNAND_GPMC_CONFIG6, M_NAND_GPMC_CONFIG6,
0, 0,
}; };

1
include/configs/cm_t335.h
View file

@ -141,7 +141,6 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#define GPMC_NAND_ECC_LP_x8_LAYOUT
#define MTDIDS_DEFAULT "nand0=nand" #define MTDIDS_DEFAULT "nand0=nand"
#define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl)," \ #define MTDPARTS_DEFAULT "mtdparts=nand:2m(spl)," \
"1m(u-boot),1m(u-boot-env)," \ "1m(u-boot),1m(u-boot-env)," \

1
include/configs/cm_t35.h
View file

@ -158,7 +158,6 @@
/* CS0 */ /* CS0 */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */
#define GPMC_NAND_ECC_LP_x8_LAYOUT
/* Environment information */ /* Environment information */
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3

1
include/configs/pengwyn.h
View file

@ -149,7 +149,6 @@
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define GPMC_NAND_ECC_LP_x8_LAYOUT 1
#define MTDIDS_DEFAULT "nand0=omap2-nand.0" #define MTDIDS_DEFAULT "nand0=omap2-nand.0"
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \ #define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \
"128k(SPL.backup1)," \ "128k(SPL.backup1)," \

1
include/configs/tao3530.h
View file

@ -137,7 +137,6 @@
#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
/* to access nand at */ /* to access nand at */
/* CS0 */ /* CS0 */
#define GPMC_NAND_ECC_LP_x16_LAYOUT
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */

1
include/configs/tseries.h
View file

@ -157,7 +157,6 @@
/* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */ /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */
#define CONFIG_NAND_OMAP_ELM #define CONFIG_NAND_OMAP_ELM
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
#define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
#define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_PAGE_SIZE 2048