From d24f2d321d8e78e990d100000d8efc4845c78b1c Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Mon, 4 Oct 2010 19:58:00 +0200 Subject: mkconfig: change CONFIG_MK_ prefix into plain CONFIG_ When planning for more generalization and Makefile cleanup it became obvious that the introduction of a separate CONFIG_MK_ name space for config options that were set through scripting in the Makefile was not a good idea. Originally the idea was to provide a script-free approach to supply configuration options - there was no real need for a separate name space. But when we now convert the existing Makefile entries to make use of this approach, it would mean that we have to touch a large number of board config files and add #ifdef / #define sequences to "convert" from the CONFIG_MK_ to the CONFIG_ name space. It seems much cleaner to get rid of this somewhat arbitrary _MK string now for the few boards that actually use it. Signed-off-by: Wolfgang Denk Acked-by: Mike Frysinger --- board/bf527-ezkit/video.c | 10 +++++----- board/freescale/mpc8315erdb/config.mk | 2 +- board/freescale/mpc8536ds/config.mk | 6 +++--- board/freescale/mpc8569mds/config.mk | 2 +- board/freescale/p1_p2_rdb/config.mk | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'board') diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c index 87e7658b4d..ca5e9b0454 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 bf972fbe56..b601601541 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 3f5447a436..ac15ff380b 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 86f138c19c..4f7e18da31 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 1f9f7b68a2..2d306bb6d4 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 -- cgit v1.2.1