From: Wolfgang Denk Date: Mon, 4 Oct 2010 17:58:00 +0000 (+0200) Subject: mkconfig: change CONFIG_MK_ prefix into plain CONFIG_ X-Git-Tag: v2010.12-rc1~96 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d24f2d321d8e78e990d100000d8efc4845c78b1c;p=u-boot 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 --- 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 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index abc29c04fe..a9466eae55 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -25,7 +25,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_TEXT_BASE 0x00100000 #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 0a9f47b97c..89609639c0 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -29,22 +29,22 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT 1 #endif -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 #endif -#ifdef CONFIG_MK_SDCARD +#ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #endif -#ifdef CONFIG_MK_SPIFLASH +#ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #endif diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 95c0a9ffc4..75c4801aa4 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -51,7 +51,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_CLK_FREQ 66666666 #define CONFIG_DDR_CLK_FREQ CONFIG_SYS_CLK_FREQ -#ifdef CONFIG_MK_ATM +#ifdef CONFIG_ATM #define CONFIG_PQ_MDS_PIB #define CONFIG_PQ_MDS_PIB_ATM #endif @@ -62,7 +62,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_L2_CACHE /* toggle L2 cache */ #define CONFIG_BTB /* toggle branch predition */ -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 34ebbdbc34..d720fe92a8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -29,7 +29,7 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT #endif diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index fa45b5be17..f97660c010 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -30,31 +30,31 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_P1011RDB +#ifdef CONFIG_P1011RDB #define CONFIG_P1011 #endif -#ifdef CONFIG_MK_P1020RDB +#ifdef CONFIG_P1020RDB #define CONFIG_P1020 #endif -#ifdef CONFIG_MK_P2010RDB +#ifdef CONFIG_P2010RDB #define CONFIG_P2010 #endif -#ifdef CONFIG_MK_P2020RDB +#ifdef CONFIG_P2020RDB #define CONFIG_P2020 #endif -#ifdef CONFIG_MK_NAND +#ifdef CONFIG_NAND #define CONFIG_NAND_U_BOOT 1 #define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 #endif -#ifdef CONFIG_MK_SDCARD +#ifdef CONFIG_SDCARD #define CONFIG_RAMBOOT_SDCARD 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #endif -#ifdef CONFIG_MK_SPIFLASH +#ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH 1 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #endif diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 74cff0c6a7..d94c308df2 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -29,7 +29,7 @@ #include "../board/freescale/common/ics307_clk.h" -#ifdef CONFIG_MK_36BIT +#ifdef CONFIG_36BIT #define CONFIG_PHYS_64BIT #endif @@ -92,7 +92,7 @@ /* DDR Setup */ #define CONFIG_VERY_BIG_RAM -#ifdef CONFIG_MK_DDR2 +#ifdef CONFIG_DDR2 #define CONFIG_FSL_DDR2 #else #define CONFIG_FSL_DDR3 1 diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index d6b3cb8ca5..688f8a211b 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -34,7 +34,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_PCI_66 #endif diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 7c8281cae7..359e9c7895 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -69,12 +69,12 @@ #include /* - * CONFIG_MK_RAM defines if u-boot is loaded via BDM (or started from + * CONFIG_RAM defines if u-boot is loaded via BDM (or started from * a different bootloader that has already performed RAM setup) or * started directly from flash, which is the regular case for production * boards. */ -#ifdef CONFIG_MK_RAM +#ifdef CONFIG_RAM #define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_TEXT_BASE 0x40020000 #define ENABLE_JFFS 0 diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 54fc063f9a..fa9053b618 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -154,7 +154,7 @@ /* * Video Settings */ -#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 +#ifdef CONFIG_BF527_EZKIT_REV_2_1 # define CONFIG_LQ035Q1_SPI_BUS 0 # define CONFIG_LQ035Q1_SPI_CS 7 #endif diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 4b00391a09..ff25ee2754 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -5,21 +5,21 @@ #ifndef __CONFIG_H #define __CONFIG_H -#ifdef CONFIG_MK_edb9301 +#ifdef CONFIG_edb9301 #define CONFIG_EDB9301 -#elif defined(CONFIG_MK_edb9302) +#elif defined(CONFIG_edb9302) #define CONFIG_EDB9302 -#elif defined(CONFIG_MK_edb9302a) +#elif defined(CONFIG_edb9302a) #define CONFIG_EDB9302A -#elif defined(CONFIG_MK_edb9307) +#elif defined(CONFIG_edb9307) #define CONFIG_EDB9307 -#elif defined(CONFIG_MK_edb9307a) +#elif defined(CONFIG_edb9307a) #define CONFIG_EDB9307A -#elif defined(CONFIG_MK_edb9312) +#elif defined(CONFIG_edb9312) #define CONFIG_EDB9312 -#elif defined(CONFIG_MK_edb9315) +#elif defined(CONFIG_edb9315) #define CONFIG_EDB9315 -#elif defined(CONFIG_MK_edb9315a) +#elif defined(CONFIG_edb9315a) #define CONFIG_EDB9315A #else #error "no board defined" diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b8f4b6eee8..94588e2603 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -34,15 +34,11 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_PCI -#define CONFIG_PCI -#endif - -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define PCI_66M #endif -#ifdef CONFIG_MK_33 +#ifdef CONFIG_33 #define PCI_33M #endif diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 8d047dec8d..9eb85252ed 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -32,20 +32,19 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_PCI -#define CONFIG_PCI +#ifdef CONFIG_PCI #define CONFIG_PCI1 #endif -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_SYS_CLK_DIV 1 #endif -#ifdef CONFIG_MK_33 +#ifdef CONFIG_33 #define CONFIG_SYS_CLK_DIV 2 #endif -#ifdef CONFIG_MK_PCIE +#ifdef CONFIG_PCIE #define CONFIG_PCIE1 #endif diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 635227800e..09f0a70013 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -34,7 +34,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_66 +#ifdef CONFIG_66 #define CONFIG_PCI_66 #endif diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h index 0248abadc9..37bdebb392 100644 --- a/include/configs/spear3xx.h +++ b/include/configs/spear3xx.h @@ -28,13 +28,13 @@ * High Level Configuration Options * (easy to change) */ -#if defined(CONFIG_MK_spear300) +#if defined(CONFIG_spear300) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR300 1 -#elif defined(CONFIG_MK_spear310) +#elif defined(CONFIG_spear310) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR310 1 -#elif defined(CONFIG_MK_spear320) +#elif defined(CONFIG_spear320) #define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR320 1 #endif diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index f2fb59203f..3c5dba3734 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -37,7 +37,7 @@ /* * Top level Makefile configuration choices */ -#ifdef CONFIG_MK_caddy2 +#ifdef CONFIG_caddy2 #define VME_CADDY2 #endif diff --git a/mkconfig b/mkconfig index f3054ce924..2fda1d4c41 100755 --- a/mkconfig +++ b/mkconfig @@ -150,7 +150,7 @@ echo "/* Automatically generated - do not edit */" >>config.h for i in ${TARGETS} ; do i="`echo ${i} | sed '/=/ {s/=/\t/;q } ; { s/$/\t1/ }'`" - echo "#define CONFIG_MK_${i}" >>config.h ; + echo "#define CONFIG_${i}" >>config.h ; done cat << EOF >> config.h