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 --- include/configs/sbc8349.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include/configs/sbc8349.h') diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index b8f4b6e..94588e2 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 -- cgit v1.1