diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/bf527-ezkit/video.c | 10 | ||||
| -rw-r--r-- | board/freescale/mpc8315erdb/config.mk | 2 | ||||
| -rw-r--r-- | board/freescale/mpc8536ds/config.mk | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8569mds/config.mk | 2 | ||||
| -rw-r--r-- | board/freescale/p1_p2_rdb/config.mk | 6 | 
5 files changed, 13 insertions, 13 deletions
| diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c index 87e7658b4..ca5e9b045 100644 --- a/board/bf527-ezkit/video.c +++ b/board/bf527-ezkit/video.c @@ -24,7 +24,7 @@  #define LCD_Y_RES		240	/* Vertical Resolution */  #define DMA_BUS_SIZE		16 -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 /* lq035q1 */ +#ifdef CONFIG_BF527_EZKIT_REV_2_1 /* lq035q1 */  #if !defined(CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI) && \      !defined(CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI) @@ -125,7 +125,7 @@  #define PPI_PACK_EN		0x80  #define PPI_POLS_1		0x8000 -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1  static struct spi_slave *slave;  static int lq035q1_control(unsigned char reg, unsigned short value)  { @@ -305,7 +305,7 @@ void EnableTIMER12(void)  int video_init(void *dst)  { -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1  	lq035q1_control(LQ035_SHUT_CTL, LQ035_ON);  	lq035q1_control(LQ035_DRIVER_OUTPUT_CTL, (CONFIG_LQ035Q1_LCD_MODE &  		LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT); @@ -318,7 +318,7 @@ int video_init(void *dst)  	Init_PPI();  	EnablePPI(); -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1  	EnableTIMER12();  #else  	/* Frame sync 2 (VS) needs to start at least one PPI clk earlier */ @@ -388,7 +388,7 @@ void video_stop(void)  	DisableDMA();  	DisableTIMER0();  	DisableTIMER1(); -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1  	lq035q1_control(LQ035_SHUT_CTL, LQ035_SHUT);  #endif  } diff --git a/board/freescale/mpc8315erdb/config.mk b/board/freescale/mpc8315erdb/config.mk index bf972fbe5..b60160154 100644 --- a/board/freescale/mpc8315erdb/config.mk +++ b/board/freescale/mpc8315erdb/config.mk @@ -1,5 +1,5 @@  ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) +ifeq ($(CONFIG_NAND), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  endif  endif diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk index 3f5447a43..ac15ff380 100644 --- a/board/freescale/mpc8536ds/config.mk +++ b/board/freescale/mpc8536ds/config.mk @@ -24,18 +24,18 @@  # mpc8536ds board  #  ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) +ifeq ($(CONFIG_NAND), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds  endif  endif -ifeq ($(CONFIG_MK_SDCARD), y) +ifeq ($(CONFIG_SDCARD), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  RESET_VECTOR_ADDRESS = 0xf8fffffc  endif -ifeq ($(CONFIG_MK_SPIFLASH), y) +ifeq ($(CONFIG_SPIFLASH), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  RESET_VECTOR_ADDRESS = 0xf8fffffc  endif diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk index 86f138c19..4f7e18da3 100644 --- a/board/freescale/mpc8569mds/config.mk +++ b/board/freescale/mpc8569mds/config.mk @@ -24,7 +24,7 @@  # mpc8569mds board  #  ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) +ifeq ($(CONFIG_NAND), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds  endif diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk index 1f9f7b68a..2d306bb6d 100644 --- a/board/freescale/p1_p2_rdb/config.mk +++ b/board/freescale/p1_p2_rdb/config.mk @@ -25,18 +25,18 @@  #  ifndef NAND_SPL -ifeq ($(CONFIG_MK_NAND), y) +ifeq ($(CONFIG_NAND), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds  endif  endif -ifeq ($(CONFIG_MK_SDCARD), y) +ifeq ($(CONFIG_SDCARD), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  RESET_VECTOR_ADDRESS = 0xf8fffffc  endif -ifeq ($(CONFIG_MK_SPIFLASH), y) +ifeq ($(CONFIG_SPIFLASH), y)  TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)  RESET_VECTOR_ADDRESS = 0xf8fffffc  endif |