colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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

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

@@ -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

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

@@ -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