[U-Boot] [PATCH 1/2] Makefile: change rule to build IMX image
config.mk in board directory is obsolete and should be removed. The patch allows to get rid of own config.mk adding the imximage.cfg file to the options in the boards.cfg
Signed-off-by: Stefano Babic sbabic@denx.de --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index fd21ef3..fff5741 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ $(obj)u-boot.img: $(obj)u-boot.bin -d $< $@
$(obj)u-boot.imx: $(obj)u-boot.bin - $(obj)tools/mkimage -n $(IMX_CONFIG) -T imximage \ + $(obj)tools/mkimage -n $(CONFIG_IMX_CONFIG) -T imximage \ -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
$(obj)u-boot.kwb: $(obj)u-boot.bin
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 --- board/freescale/mx51evk/config.mk | 25 ------------------------- boards.cfg | 2 +- include/configs/mx51evk.h | 2 ++ 3 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 board/freescale/mx51evk/config.mk
diff --git a/board/freescale/mx51evk/config.mk b/board/freescale/mx51evk/config.mk deleted file mode 100644 index 6e90671..0000000 --- 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 18bcc69..b8e228c 100644 --- a/boards.cfg +++ b/boards.cfg @@ -105,7 +105,7 @@ magnesium arm arm926ejs imx27lite logicpd omap5912osk arm arm926ejs - ti omap edminiv2 arm arm926ejs - LaCie orion5x ca9x4_ct_vxp arm armv7 vexpress armltd -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 omap3_overo arm armv7 overo - omap3 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 591d6e1..8da8222 100755 --- 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>
On 01/24/2011 11:14 AM, Stefano Babic wrote:
config.mk in board directory is obsolete and should be removed. The patch allows to get rid of own config.mk adding the imximage.cfg file to the options in the boards.cfg
Signed-off-by: Stefano Babic sbabic@denx.de
Wolfgang,
the patch is for the top Makefile, but it is related to IMX boards only. Do you agree if I already merge it into u-boot-imx ?
Regards, Stefano
Dear Stefano Babic,
In message 4D46C87F.2000803@denx.de you wrote:
On 01/24/2011 11:14 AM, Stefano Babic wrote:
config.mk in board directory is obsolete and should be removed. The patch allows to get rid of own config.mk adding the imximage.cfg file to the options in the boards.cfg
Signed-off-by: Stefano Babic sbabic@denx.de
the patch is for the top Makefile, but it is related to IMX boards only. Do you agree if I already merge it into u-boot-imx ?
Yes, please do. Sorry for the delay.
Best regards,
Wolfgang Denk
participants (2)
-
Stefano Babic -
Wolfgang Denk