Commit d24f2d32 authored by Wolfgang Denk's avatar Wolfgang Denk

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: 's avatarWolfgang Denk <wd@denx.de>
Acked-by: 's avatarMike Frysinger <vapier@gentoo.org>
parent 9329cdfb
......@@ -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
}
......
ifndef NAND_SPL
ifeq ($(CONFIG_MK_NAND), y)
ifeq ($(CONFIG_NAND), y)
TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
endif
endif
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -29,7 +29,7 @@
#include "../board/freescale/common/ics307_clk.h"
#ifdef CONFIG_MK_36BIT
#ifdef CONFIG_36BIT
#define CONFIG_PHYS_64BIT
#endif
......
......@@ -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
......
......@@ -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
......
......@@ -34,7 +34,7 @@
/*
* Top level Makefile configuration choices
*/
#ifdef CONFIG_MK_66
#ifdef CONFIG_66
#define CONFIG_PCI_66
#endif
......
......@@ -69,12 +69,12 @@
#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
* 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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -34,7 +34,7 @@
/*
* Top level Makefile configuration choices
*/
#ifdef CONFIG_MK_66
#ifdef CONFIG_66
#define CONFIG_PCI_66
#endif
......
......@@ -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
......
......@@ -37,7 +37,7 @@
/*
* Top level Makefile configuration choices
*/
#ifdef CONFIG_MK_caddy2
#ifdef CONFIG_caddy2
#define VME_CADDY2
#endif
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment