From: Becky Bruce <beckyb@kernel.crashing.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/13] PM854: rename CONFIG_SYS_LBC_SDRAM_BASE CONFIG_SYS_LBC_BASE
Date: Thu, 2 Dec 2010 17:45:32 -0600 [thread overview]
Message-ID: <1291333539-11884-7-git-send-email-beckyb@kernel.crashing.org> (raw)
In-Reply-To: <1291333539-11884-6-git-send-email-beckyb@kernel.crashing.org>
As far as I can tell, this board doesn't actually configure the LBC
for SDRAM. I've renamed this to avoid confusion (and to make the
initdram() cleanup easier later.)
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
board/pm854/law.c | 5 ++---
board/pm854/tlb.c | 4 ++--
include/configs/PM854.h | 6 +-----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/board/pm854/law.c b/board/pm854/law.c
index ac21d7a..bea9259 100644
--- a/board/pm854/law.c
+++ b/board/pm854/law.c
@@ -35,7 +35,7 @@
* 0xc000_0000 0xdfff_ffff RapidIO 512M
* 0xe000_0000 0xe000_ffff CCSR 1M
* 0xe200_0000 0xe2ff_ffff PCI1 IO 16M
- * 0xf000_0000 0xf7ff_ffff SDRAM 128M
+ * 0xf000_0000 0xf7ff_ffff LBC 128M
* 0xf800_0000 0xf80f_ffff BCSR 1M
* 0xfc00_0000 0xffff_ffff FLASH (boot bank) 64M
*
@@ -49,8 +49,7 @@ struct law_entry law_table[] = {
SET_LAW(CONFIG_SYS_DDR_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_DDR),
#endif
SET_LAW(CONFIG_SYS_PCI1_MEM_PHYS, LAW_SIZE_512M, LAW_TRGT_IF_PCI),
- /* This is not so much the SDRAM map as it is the whole localbus map. */
- SET_LAW(CONFIG_SYS_LBC_SDRAM_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
+ SET_LAW(CONFIG_SYS_LBC_BASE, LAW_SIZE_256M, LAW_TRGT_IF_LBC),
SET_LAW(CONFIG_SYS_PCI1_IO_PHYS, LAW_SIZE_16M, LAW_TRGT_IF_PCI),
SET_LAW(CONFIG_SYS_RIO_MEM_BASE, LAW_SIZE_512M, LAW_TRGT_IF_RIO),
};
diff --git a/board/pm854/tlb.c b/board/pm854/tlb.c
index 5e74e2d..dadb75c 100644
--- a/board/pm854/tlb.c
+++ b/board/pm854/tlb.c
@@ -93,9 +93,9 @@ struct fsl_e_tlb_entry tlb_table[] = {
/*
* TLB 6: 64M Cacheable, non-guarded
- * 0xf000_0000 64M LBC SDRAM
+ * 0xf000_0000 64M LBC
*/
- SET_TLB_ENTRY(1, CONFIG_SYS_LBC_SDRAM_BASE, CONFIG_SYS_LBC_SDRAM_BASE,
+ SET_TLB_ENTRY(1, CONFIG_SYS_LBC_BASE, CONFIG_SYS_LBC_BASE,
MAS3_SX|MAS3_SW|MAS3_SR, 0,
0, 6, BOOKE_PAGESZ_64M, 1),
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 1e2089f..39283b2 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -123,11 +123,7 @@
#define CONFIG_SYS_DDR_MODE 0x00000062 /* DLL,normal,seq,4/2.5 */
#define CONFIG_SYS_DDR_INTERVAL 0x045b0100 /* autocharge,no open page */
-/*
- * SDRAM on the Local Bus
- */
-#define CONFIG_SYS_LBC_SDRAM_BASE 0xf0000000 /* Localbus SDRAM */
-#define CONFIG_SYS_LBC_SDRAM_SIZE 0 /* LBC SDRAM is 0 MB */
+#define CONFIG_SYS_LBC_BASE 0xf0000000 /* Localbus */
#define CONFIG_SYS_FLASH_BASE 0xfe000000 /* start of 32 MB FLASH */
#define CONFIG_SYS_BR0_PRELIM 0xfe001801 /* port size 32bit */
--
1.6.0.6
next prev parent reply other threads:[~2010-12-02 23:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-02 23:45 [U-Boot] [PATCH 00/13] Go to common initdram() on 85xx-based boards Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 01/13] mpc8540eval: Split initdram() into initdram() and sdram_init() Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 02/13] tqm85xx: create fixed_sdram() to do sdram setup Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 03/13] mpc85xx/tlb.c: Allow platforms to specify wimge bits Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 04/13] socrates: rename sdram_setup fixed_sdram() Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 05/13] mpc8569mds: Remove unnecessary CONFIG_SYS_LBC_SDRAM_BASE definition Becky Bruce
2010-12-02 23:45 ` Becky Bruce [this message]
2010-12-02 23:45 ` [U-Boot] [PATCH 07/13] PM856: Rename CONFIG_SYS_LBC_SDRAM_BASE CONFIG_SYS_LBC_BASE Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 08/13] SBC8560: #define CONFIG_SYS_LBC_NO_SDRAM_INIT Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 09/13] stxgp3: " Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 10/13] SBC8540: " Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 11/13] MPC8568/MPC8569: Remove CONFIG_DDR_DLL define Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 12/13] mpc85xx boards: initdram() cleanup/bugfix Becky Bruce
2010-12-02 23:45 ` [U-Boot] [PATCH 13/13] 85xx boards: Rename CONFIG_DDR_DLL to CONFIG_SYS_FSL_ERRATUM_DDR_MSYNC_IN Becky Bruce
2010-12-03 16:09 ` [U-Boot] [PATCH 12/13] mpc85xx boards: initdram() cleanup/bugfix Peter Tyser
2010-12-03 20:54 ` [U-Boot] [PATCH 08/13] SBC8560: #define CONFIG_SYS_LBC_NO_SDRAM_INIT Becky Bruce
2010-12-03 21:22 ` Peter Tyser
2010-12-03 2:26 ` Timur Tabi
2010-12-03 20:44 ` Becky Bruce
2010-12-03 21:48 ` Kumar Gala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291333539-11884-7-git-send-email-beckyb@kernel.crashing.org \
--to=beckyb@kernel.crashing.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox