From patchwork Tue Nov 20 12:06:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "esw@bus-elektronik.de" X-Patchwork-Id: 200310 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 23A262C0091 for ; Tue, 20 Nov 2012 23:06:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EE7424A056; Tue, 20 Nov 2012 13:06:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kwdo7qRclxaj; Tue, 20 Nov 2012 13:06:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 86C854A04E; Tue, 20 Nov 2012 13:06:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E4E614A04E for ; Tue, 20 Nov 2012 13:06:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0ApBwZoFUY99 for ; Tue, 20 Nov 2012 13:06:44 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from smtp.bus-elektronik.de (smtp.bus-elektronik.de [212.144.119.5]) by theia.denx.de (Postfix) with ESMTPS id 3684C4A04C for ; Tue, 20 Nov 2012 13:06:43 +0100 (CET) Received: from CAS2.busriesa.bus (192.168.30.80) by Edge-Transport.busriesa.bus (192.168.30.20) with Microsoft SMTP Server (TLS) id 14.1.421.2; Tue, 20 Nov 2012 13:06:37 +0100 Received: from scharsiglinux.bus-elektronik.de (10.0.0.198) by cas.busriesa.bus (192.168.53.173) with Microsoft SMTP Server id 14.2.318.4; Tue, 20 Nov 2012 13:06:35 +0100 Received: by scharsiglinux.bus-elektronik.de (Postfix, from userid 500) id 656F08E0B60; Tue, 20 Nov 2012 13:06:35 +0100 (CET) From: "Jens Scharsig (BuS Elektronik)" To: Date: Tue, 20 Nov 2012 13:06:25 +0100 Message-ID: <1353413185-4365-1-git-send-email-esw@bus-elektronik.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Cc: js_at_ng@scharsoft.de Subject: [U-Boot] [PATCH] coldfire: eb_cpu5282: fix: boot from internal flash X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: "Jens Scharsig (BuS Elektronik)" * By a sequence of unfavorable conditions in the config header file, the eb_cpu5282 booting from internal stopped after relocation. Blame it is a faulty value of CONFIG_SYS_MONITOR_BASE. This patch fix this by replace the wrong condition in config header with option in board.cfg Signed-off-by: Jens Scharsig (BuS Elektronik) --- boards.cfg | 4 ++-- include/configs/eb_cpu5282.h | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/boards.cfg b/boards.cfg index 7ae663c..2e08a34 100644 --- a/boards.cfg +++ b/boards.cfg @@ -372,8 +372,8 @@ M5235EVB m68k mcf523x m5235evb freesca M5235EVB_Flash32 m68k mcf523x m5235evb freescale - M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000 cobra5272 m68k mcf52x2 cobra5272 - idmr m68k mcf52x2 -eb_cpu5282 m68k mcf52x2 eb_cpu5282 BuS - eb_cpu5282:SYS_TEXT_BASE=0xFF000000 -eb_cpu5282_internal m68k mcf52x2 eb_cpu5282 BuS - eb_cpu5282:SYS_TEXT_BASE=0xF0000000 +eb_cpu5282 m68k mcf52x2 eb_cpu5282 BuS - eb_cpu5282:SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400 +eb_cpu5282_internal m68k mcf52x2 eb_cpu5282 BuS - eb_cpu5282:SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418 TASREG m68k mcf52x2 tasreg esd M5208EVBE m68k mcf52x2 m5208evbe freescale M5249EVB m68k mcf52x2 m5249evb freescale diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 5a0d321..459f568 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -168,14 +168,6 @@ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_BASE0 #define CONFIG_SYS_SDRAM_SIZE CONFIG_SYS_SDRAM_SIZE0 -/* If M5282 port is fully implemented the monitor base will be behind - * the vector table. */ -#if (CONFIG_SYS_TEXT_BASE != CONFIG_SYS_INT_FLASH_BASE) -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x400) -#else -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_TEXT_BASE + 0x418) /* 24 Byte for CFM-Config */ -#endif - #define CONFIG_SYS_MONITOR_LEN 0x20000 #define CONFIG_SYS_MALLOC_LEN (256 << 10) #define CONFIG_SYS_BOOTPARAMS_LEN 64*1024