aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2011-01-24 00:14:27 +0000
committerStefano Babic <sbabic@denx.de>2011-02-25 11:50:47 +0100
commit037ee3c4f489a3cb878897ce081eb6c1d45f3802 (patch)
tree6d416dfc62abf8926b7017cf49b37ca4be55d0bb
parent5ced66c082b0f3e81628bbe0004b099abce702b8 (diff)
MX51: drop config.mk from mx51evk
The config.mk file in board directory is now obsolete and should be removed. Add option for the IMX image into boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
-rw-r--r--board/freescale/mx51evk/config.mk25
-rw-r--r--boards.cfg2
-rw-r--r--include/configs/mx51evk.h2
3 files changed, 3 insertions, 26 deletions
diff --git a/board/freescale/mx51evk/config.mk b/board/freescale/mx51evk/config.mk
deleted file mode 100644
index 6e90671d0..000000000
--- a/board/freescale/mx51evk/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-CONFIG_SYS_TEXT_BASE = 0x97800000
-IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg
-ALL += $(obj)u-boot.imx
diff --git a/boards.cfg b/boards.cfg
index 45c3102b0..81885a544 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -108,7 +108,7 @@ edminiv2 arm arm926ejs - LaCie
dkb arm arm926ejs - Marvell pantheon
ca9x4_ct_vxp arm armv7 vexpress armltd
efikamx arm armv7 efikamx - mx5
-mx51evk arm armv7 mx51evk freescale mx5
+mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
mx53evk arm armv7 mx53evk freescale mx5
vision2 arm armv7 vision2 ttcontrol mx5
cm_t35 arm armv7 cm_t35 - omap3
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 591d6e1a9..8da822212 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,6 +33,8 @@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_TEXT_BASE 0x97800000
+
#define CONFIG_L2_OFF
#include <asm/arch/imx-regs.h>