diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/raw/kmeter1_nand.c | 12 | ||||
| -rw-r--r-- | drivers/mtd/spi/fsl_espi_spl.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/nand/raw/kmeter1_nand.c b/drivers/mtd/nand/raw/kmeter1_nand.c index 84564b2f70a..dfe73d64e46 100644 --- a/drivers/mtd/nand/raw/kmeter1_nand.c +++ b/drivers/mtd/nand/raw/kmeter1_nand.c @@ -10,13 +10,13 @@ #include <linux/delay.h> #include <linux/mtd/rawnand.h> -#define CONFIG_NAND_MODE_REG (void *)(CFG_SYS_NAND_BASE + 0x20000) -#define CONFIG_NAND_DATA_REG (void *)(CFG_SYS_NAND_BASE + 0x30000) +#define CFG_NAND_MODE_REG (void *)(CFG_SYS_NAND_BASE + 0x20000) +#define CFG_NAND_DATA_REG (void *)(CFG_SYS_NAND_BASE + 0x30000) -#define read_mode() in_8(CONFIG_NAND_MODE_REG) -#define write_mode(val) out_8(CONFIG_NAND_MODE_REG, val) -#define read_data() in_8(CONFIG_NAND_DATA_REG) -#define write_data(val) out_8(CONFIG_NAND_DATA_REG, val) +#define read_mode() in_8(CFG_NAND_MODE_REG) +#define write_mode(val) out_8(CFG_NAND_MODE_REG, val) +#define read_data() in_8(CFG_NAND_DATA_REG) +#define write_data(val) out_8(CFG_NAND_DATA_REG, val) #define KPN_RDY2 (1 << 7) #define KPN_RDY1 (1 << 6) diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index dfc35d6eabf..cdbdbd6ea58 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -11,7 +11,7 @@ #define ESPI_BOOT_IMAGE_SIZE 0x48 #define ESPI_BOOT_IMAGE_ADDR 0x50 -#define CONFIG_CFG_DATA_SECTOR 0 +#define CFG_CFG_DATA_SECTOR 0 void fsl_spi_spl_load_image(uint32_t offs, unsigned int size, void *vdst) { @@ -62,7 +62,7 @@ void fsl_spi_boot(void) } memset(buf, 0, flash->page_size); - spi_flash_read(flash, CONFIG_CFG_DATA_SECTOR, + spi_flash_read(flash, CFG_CFG_DATA_SECTOR, flash->page_size, (void *)buf); offset = *(u32 *)(buf + ESPI_BOOT_IMAGE_ADDR); /* Skip spl code */ |