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

mkconfig: change CONFIG_MK_ prefix into plain CONFIG_

Browse source 
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 <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Wolfgang Denk 2010-10-04 19:58:00 +02:00
parent 9329cdfb30
commit d24f2d321d
21 changed files with 54 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
board/bf527-ezkit/video.c
View file

@ -24,7 +24,7 @@
#define LCD_Y_RES 240 /* Vertical Resolution */ #define LCD_Y_RES 240 /* Vertical Resolution */
#define DMA_BUS_SIZE 16 #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) && \ #if !defined(CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI) && \
!defined(CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI) !defined(CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI)
@ -125,7 +125,7 @@
#define PPI_PACK_EN 0x80 #define PPI_PACK_EN 0x80
#define PPI_POLS_1 0x8000 #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 struct spi_slave *slave;
static int lq035q1_control(unsigned char reg, unsigned short value) static int lq035q1_control(unsigned char reg, unsigned short value)
{ {
@ -305,7 +305,7 @@ void EnableTIMER12(void)
int video_init(void *dst) 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_SHUT_CTL, LQ035_ON);
lq035q1_control(LQ035_DRIVER_OUTPUT_CTL, (CONFIG_LQ035Q1_LCD_MODE & lq035q1_control(LQ035_DRIVER_OUTPUT_CTL, (CONFIG_LQ035Q1_LCD_MODE &
LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT); LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT);
@ -318,7 +318,7 @@ int video_init(void *dst)
Init_PPI(); Init_PPI();
EnablePPI(); EnablePPI();
#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 #ifdef CONFIG_BF527_EZKIT_REV_2_1
EnableTIMER12(); EnableTIMER12();
#else #else
/* Frame sync 2 (VS) needs to start at least one PPI clk earlier */ /* Frame sync 2 (VS) needs to start at least one PPI clk earlier */
@ -388,7 +388,7 @@ void video_stop(void)
DisableDMA(); DisableDMA();
DisableTIMER0(); DisableTIMER0();
DisableTIMER1(); DisableTIMER1();
#ifdef CONFIG_MK_BF527_EZKIT_REV_2_1 #ifdef CONFIG_BF527_EZKIT_REV_2_1
lq035q1_control(LQ035_SHUT_CTL, LQ035_SHUT); lq035q1_control(LQ035_SHUT_CTL, LQ035_SHUT);
#endif #endif
} }

2
board/freescale/mpc8315erdb/config.mk
View file

@ -1,5 +1,5 @@
ifndef NAND_SPL ifndef NAND_SPL
ifeq ($(CONFIG_MK_NAND), y) ifeq ($(CONFIG_NAND), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
endif endif
endif endif

6
board/freescale/mpc8536ds/config.mk
View file

@ -24,18 +24,18 @@
# mpc8536ds board # mpc8536ds board
# #
ifndef NAND_SPL ifndef NAND_SPL
ifeq ($(CONFIG_MK_NAND), y) ifeq ($(CONFIG_NAND), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
endif endif
endif endif
ifeq ($(CONFIG_MK_SDCARD), y) ifeq ($(CONFIG_SDCARD), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
RESET_VECTOR_ADDRESS = 0xf8fffffc RESET_VECTOR_ADDRESS = 0xf8fffffc
endif endif
ifeq ($(CONFIG_MK_SPIFLASH), y) ifeq ($(CONFIG_SPIFLASH), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
RESET_VECTOR_ADDRESS = 0xf8fffffc RESET_VECTOR_ADDRESS = 0xf8fffffc
endif endif

2
board/freescale/mpc8569mds/config.mk
View file

@ -24,7 +24,7 @@
# mpc8569mds board # mpc8569mds board
# #
ifndef NAND_SPL ifndef NAND_SPL
ifeq ($(CONFIG_MK_NAND), y) ifeq ($(CONFIG_NAND), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
endif endif

6
board/freescale/p1_p2_rdb/config.mk
View file

@ -25,18 +25,18 @@
# #
ifndef NAND_SPL ifndef NAND_SPL
ifeq ($(CONFIG_MK_NAND), y) ifeq ($(CONFIG_NAND), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
endif endif
endif endif
ifeq ($(CONFIG_MK_SDCARD), y) ifeq ($(CONFIG_SDCARD), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
RESET_VECTOR_ADDRESS = 0xf8fffffc RESET_VECTOR_ADDRESS = 0xf8fffffc
endif endif
ifeq ($(CONFIG_MK_SPIFLASH), y) ifeq ($(CONFIG_SPIFLASH), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE) TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
RESET_VECTOR_ADDRESS = 0xf8fffffc RESET_VECTOR_ADDRESS = 0xf8fffffc
endif endif

2
include/configs/MPC8315ERDB.h
View file

@ -25,7 +25,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#ifdef CONFIG_MK_NAND #ifdef CONFIG_NAND
#define CONFIG_NAND_U_BOOT 1 #define CONFIG_NAND_U_BOOT 1
#define CONFIG_RAMBOOT_TEXT_BASE 0x00100000 #define CONFIG_RAMBOOT_TEXT_BASE 0x00100000
#endif #endif

8
include/configs/MPC8536DS.h
View file

@ -29,22 +29,22 @@
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"
#ifdef CONFIG_MK_36BIT #ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT 1 #define CONFIG_PHYS_64BIT 1
#endif #endif
#ifdef CONFIG_MK_NAND #ifdef CONFIG_NAND
#define CONFIG_NAND_U_BOOT 1 #define CONFIG_NAND_U_BOOT 1
#define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_NAND 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000
#endif #endif
#ifdef CONFIG_MK_SDCARD #ifdef CONFIG_SDCARD
#define CONFIG_RAMBOOT_SDCARD 1 #define CONFIG_RAMBOOT_SDCARD 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000
#endif #endif
#ifdef CONFIG_MK_SPIFLASH #ifdef CONFIG_SPIFLASH
#define CONFIG_RAMBOOT_SPIFLASH 1 #define CONFIG_RAMBOOT_SPIFLASH 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000
#endif #endif

4
include/configs/MPC8569MDS.h
View file

@ -51,7 +51,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_CLK_FREQ 66666666 #define CONFIG_SYS_CLK_FREQ 66666666
#define CONFIG_DDR_CLK_FREQ CONFIG_SYS_CLK_FREQ #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
#define CONFIG_PQ_MDS_PIB_ATM #define CONFIG_PQ_MDS_PIB_ATM
#endif #endif
@ -62,7 +62,7 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_L2_CACHE /* toggle L2 cache */ #define CONFIG_L2_CACHE /* toggle L2 cache */
#define CONFIG_BTB /* toggle branch predition */ #define CONFIG_BTB /* toggle branch predition */
#ifdef CONFIG_MK_NAND #ifdef CONFIG_NAND
#define CONFIG_NAND_U_BOOT 1 #define CONFIG_NAND_U_BOOT 1
#define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_NAND 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000

2
include/configs/MPC8572DS.h
View file

@ -29,7 +29,7 @@
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"
#ifdef CONFIG_MK_36BIT #ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#endif #endif

14
include/configs/P1_P2_RDB.h
View file

@ -30,31 +30,31 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#ifdef CONFIG_MK_P1011RDB #ifdef CONFIG_P1011RDB
#define CONFIG_P1011 #define CONFIG_P1011
#endif #endif
#ifdef CONFIG_MK_P1020RDB #ifdef CONFIG_P1020RDB
#define CONFIG_P1020 #define CONFIG_P1020
#endif #endif
#ifdef CONFIG_MK_P2010RDB #ifdef CONFIG_P2010RDB
#define CONFIG_P2010 #define CONFIG_P2010
#endif #endif
#ifdef CONFIG_MK_P2020RDB #ifdef CONFIG_P2020RDB
#define CONFIG_P2020 #define CONFIG_P2020
#endif #endif
#ifdef CONFIG_MK_NAND #ifdef CONFIG_NAND
#define CONFIG_NAND_U_BOOT 1 #define CONFIG_NAND_U_BOOT 1
#define CONFIG_RAMBOOT_NAND 1 #define CONFIG_RAMBOOT_NAND 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f82000
#endif #endif
#ifdef CONFIG_MK_SDCARD #ifdef CONFIG_SDCARD
#define CONFIG_RAMBOOT_SDCARD 1 #define CONFIG_RAMBOOT_SDCARD 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000
#endif #endif
#ifdef CONFIG_MK_SPIFLASH #ifdef CONFIG_SPIFLASH
#define CONFIG_RAMBOOT_SPIFLASH 1 #define CONFIG_RAMBOOT_SPIFLASH 1
#define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000 #define CONFIG_RAMBOOT_TEXT_BASE 0xf8f80000
#endif #endif

4
include/configs/P2020DS.h
View file

@ -29,7 +29,7 @@
#include "../board/freescale/common/ics307_clk.h" #include "../board/freescale/common/ics307_clk.h"
#ifdef CONFIG_MK_36BIT #ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT #define CONFIG_PHYS_64BIT
#endif #endif
@ -92,7 +92,7 @@
/* DDR Setup */ /* DDR Setup */
#define CONFIG_VERY_BIG_RAM #define CONFIG_VERY_BIG_RAM
#ifdef CONFIG_MK_DDR2 #ifdef CONFIG_DDR2
#define CONFIG_FSL_DDR2 #define CONFIG_FSL_DDR2
#else #else
#define CONFIG_FSL_DDR3 1 #define CONFIG_FSL_DDR3 1

2
include/configs/SBC8540.h
View file

@ -34,7 +34,7 @@
/* /*
* Top level Makefile configuration choices * Top level Makefile configuration choices
*/ */
#ifdef CONFIG_MK_66 #ifdef CONFIG_66
#define CONFIG_PCI_66 #define CONFIG_PCI_66
#endif #endif

4
include/configs/astro_mcf5373l.h
View file

@ -69,12 +69,12 @@
#include <config_cmd_default.h> #include <config_cmd_default.h>
/* /*
* 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 * a different bootloader that has already performed RAM setup) or
* started directly from flash, which is the regular case for production * started directly from flash, which is the regular case for production
* boards. * boards.
*/ */
#ifdef CONFIG_MK_RAM #ifdef CONFIG_RAM
#define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_MONITOR_IS_IN_RAM
#define CONFIG_TEXT_BASE 0x40020000 #define CONFIG_TEXT_BASE 0x40020000
#define ENABLE_JFFS 0 #define ENABLE_JFFS 0

2
include/configs/bf527-ezkit.h
View file

@ -154,7 +154,7 @@
/* /*
* Video Settings * 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_BUS 0
# define CONFIG_LQ035Q1_SPI_CS 7 # define CONFIG_LQ035Q1_SPI_CS 7
#endif #endif

16
include/configs/edb93xx.h
View file

@ -5,21 +5,21 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#ifdef CONFIG_MK_edb9301 #ifdef CONFIG_edb9301
#define CONFIG_EDB9301 #define CONFIG_EDB9301
#elif defined(CONFIG_MK_edb9302) #elif defined(CONFIG_edb9302)
#define CONFIG_EDB9302 #define CONFIG_EDB9302
#elif defined(CONFIG_MK_edb9302a) #elif defined(CONFIG_edb9302a)
#define CONFIG_EDB9302A #define CONFIG_EDB9302A
#elif defined(CONFIG_MK_edb9307) #elif defined(CONFIG_edb9307)
#define CONFIG_EDB9307 #define CONFIG_EDB9307
#elif defined(CONFIG_MK_edb9307a) #elif defined(CONFIG_edb9307a)
#define CONFIG_EDB9307A #define CONFIG_EDB9307A
#elif defined(CONFIG_MK_edb9312) #elif defined(CONFIG_edb9312)
#define CONFIG_EDB9312 #define CONFIG_EDB9312
#elif defined(CONFIG_MK_edb9315) #elif defined(CONFIG_edb9315)
#define CONFIG_EDB9315 #define CONFIG_EDB9315
#elif defined(CONFIG_MK_edb9315a) #elif defined(CONFIG_edb9315a)
#define CONFIG_EDB9315A #define CONFIG_EDB9315A
#else #else
#error "no board defined" #error "no board defined"

8
include/configs/sbc8349.h
View file

@ -34,15 +34,11 @@
/* /*
* Top level Makefile configuration choices * Top level Makefile configuration choices
*/ */
#ifdef CONFIG_MK_PCI #ifdef CONFIG_66
#define CONFIG_PCI
#endif
#ifdef CONFIG_MK_66
#define PCI_66M #define PCI_66M
#endif #endif
#ifdef CONFIG_MK_33 #ifdef CONFIG_33
#define PCI_33M #define PCI_33M
#endif #endif

9
include/configs/sbc8548.h
View file

@ -32,20 +32,19 @@
/* /*
* Top level Makefile configuration choices * Top level Makefile configuration choices
*/ */
#ifdef CONFIG_MK_PCI #ifdef CONFIG_PCI
#define CONFIG_PCI
#define CONFIG_PCI1 #define CONFIG_PCI1
#endif #endif
#ifdef CONFIG_MK_66 #ifdef CONFIG_66
#define CONFIG_SYS_CLK_DIV 1 #define CONFIG_SYS_CLK_DIV 1
#endif #endif
#ifdef CONFIG_MK_33 #ifdef CONFIG_33
#define CONFIG_SYS_CLK_DIV 2 #define CONFIG_SYS_CLK_DIV 2
#endif #endif
#ifdef CONFIG_MK_PCIE #ifdef CONFIG_PCIE
#define CONFIG_PCIE1 #define CONFIG_PCIE1
#endif #endif

2
include/configs/sbc8560.h
View file

@ -34,7 +34,7 @@
/* /*
* Top level Makefile configuration choices * Top level Makefile configuration choices
*/ */
#ifdef CONFIG_MK_66 #ifdef CONFIG_66
#define CONFIG_PCI_66 #define CONFIG_PCI_66
#endif #endif

6
include/configs/spear3xx.h
View file

@ -28,13 +28,13 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#if defined(CONFIG_MK_spear300) #if defined(CONFIG_spear300)
#define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR3XX 1
#define CONFIG_SPEAR300 1 #define CONFIG_SPEAR300 1
#elif defined(CONFIG_MK_spear310) #elif defined(CONFIG_spear310)
#define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR3XX 1
#define CONFIG_SPEAR310 1 #define CONFIG_SPEAR310 1
#elif defined(CONFIG_MK_spear320) #elif defined(CONFIG_spear320)
#define CONFIG_SPEAR3XX 1 #define CONFIG_SPEAR3XX 1
#define CONFIG_SPEAR320 1 #define CONFIG_SPEAR320 1
#endif #endif

2
include/configs/vme8349.h
View file

@ -37,7 +37,7 @@
/* /*
* Top level Makefile configuration choices * Top level Makefile configuration choices
*/ */
#ifdef CONFIG_MK_caddy2 #ifdef CONFIG_caddy2
#define VME_CADDY2 #define VME_CADDY2
#endif #endif

2
mkconfig
View file

@ -150,7 +150,7 @@ echo "/* Automatically generated - do not edit */" >>config.h
for i in ${TARGETS} ; do for i in ${TARGETS} ; do
i="`echo ${i} | sed '/=/ {s/=/\t/;q } ; { s/$/\t1/ }'`" i="`echo ${i} | sed '/=/ {s/=/\t/;q } ; { s/$/\t1/ }'`"
echo "#define CONFIG_MK_${i}" >>config.h ; echo "#define CONFIG_${i}" >>config.h ;
done done
cat << EOF >> config.h cat << EOF >> config.h