January 2008 - U-Boot

[U-Boot-Users] [PATCH 1/9 v2] 85xx: Move LAW init code into C
by Kumar Gala 16 Jan '08

16 Jan '08

Move the initialization of the LAWs into C code and provide an API to allow modification of LAWs after init. Board code is responsible to provide a law_table and num_law_entries. We should be able to use the same code on 86xx as well. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- This whole set of patches are in my k.o u-boot mpc85xx tree. cpu/mpc85xx/cpu_init.c | 8 ++++ cpu/mpc85xx/spd_sdram.c | 8 ++++ cpu/mpc85xx/start.S | 2 + drivers/misc/Makefile | 1 + drivers/misc/fsl_law.c | 70 +++++++++++++++++++++++++++++++++++++++ include/asm-ppc/fsl_law.h | 80 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 169 insertions(+), 0 deletions(-) create mode 100644 drivers/misc/fsl_law.c create mode 100644 include/asm-ppc/fsl_law.h diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c index fdb9ecb..9a65142 100644 --- a/cpu/mpc85xx/cpu_init.c +++ b/cpu/mpc85xx/cpu_init.c @@ -31,6 +31,7 @@ #include <asm/processor.h> #include <ioports.h> #include <asm/io.h> +#include <asm/fsl_law.h> DECLARE_GLOBAL_DATA_PTR; @@ -140,6 +141,9 @@ void cpu_init_f (void) /* Clear initial global data */ memset ((void *) gd, 0, sizeof (gd_t)); +#ifdef CONFIG_FSL_LAW + init_laws(); +#endif #ifdef CONFIG_CPM2 config_8560_ioports((ccsr_cpm_t *)CFG_MPC85xx_CPM_ADDR); @@ -222,11 +226,15 @@ void cpu_init_f (void) int cpu_init_r(void) { #ifdef CONFIG_CLEAR_LAW0 +#ifdef CONFIG_FSL_LAW + disable_law(0); +#else volatile ccsr_local_ecm_t *ecm = (void *)(CFG_MPC85xx_ECM_ADDR); /* clear alternate boot location LAW (used for sdram, or ddr bank) */ ecm->lawar0 = 0; #endif +#endif #if defined(CONFIG_L2_CACHE) volatile ccsr_l2cache_t *l2cache = (void *)CFG_MPC85xx_L2_ADDR; diff --git a/cpu/mpc85xx/spd_sdram.c b/cpu/mpc85xx/spd_sdram.c index adc9c4d..bb5dc1f 100644 --- a/cpu/mpc85xx/spd_sdram.c +++ b/cpu/mpc85xx/spd_sdram.c @@ -27,6 +27,7 @@ #include <i2c.h> #include <spd.h> #include <asm/mmu.h> +#include <asm/fsl_law.h> #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) @@ -1022,7 +1023,9 @@ spd_sdram(void) static unsigned int setup_laws_and_tlbs(unsigned int memsize) { +#ifndef CONFIG_FSL_LAW volatile ccsr_local_ecm_t *ecm = (void *)(CFG_MPC85xx_ECM_ADDR); +#endif unsigned int tlb_size; unsigned int law_size; unsigned int ram_tlb_index; @@ -1098,12 +1101,17 @@ setup_laws_and_tlbs(unsigned int memsize) /* * Set up LAWBAR for all of DDR. */ + +#ifdef CONFIG_FSL_LAW + set_law(1, CFG_DDR_SDRAM_BASE, law_size, LAW_TRGT_IF_DDR); +#else ecm->lawbar1 = ((CFG_DDR_SDRAM_BASE >> 12) & 0xfffff); ecm->lawar1 = (LAWAR_EN | LAWAR_TRGT_IF_DDR | (LAWAR_SIZE & law_size)); debug("DDR: LAWBAR1=0x%08x\n", ecm->lawbar1); debug("DDR: LARAR1=0x%08x\n", ecm->lawar1); +#endif /* * Confirm that the requested amount of memory was mapped. diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index b489d2f..346369c 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -201,6 +201,7 @@ _start_e500: lis r7,CFG_CCSRBAR@h ori r7,r7,CFG_CCSRBAR@l +#ifndef CONFIG_FSL_LAW bl law_entry mr r6,r0 lwzu r5,0(r6) /* how many windows we actually use */ @@ -216,6 +217,7 @@ _start_e500: addi r2,r2,0x0020 addi r1,r1,0x0020 bdnz 0b +#endif /* Clear and set up some registers. */ li r0,0 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 78cec21..6752172 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libmisc.a COBJS-y += ali512x.o COBJS-y += ns87308.o COBJS-y += status_led.o +COBJS-$(CONFIG_FSL_LAW) += fsl_law.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c new file mode 100644 index 0000000..8bdf5a7 --- /dev/null +++ b/drivers/misc/fsl_law.c @@ -0,0 +1,70 @@ +/* + * Copyright 2008 Freescale Semiconductor, Inc. + * + * (C) Copyright 2000 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * 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 + */ + +#include <common.h> +#include <asm/fsl_law.h> +#include <asm/io.h> + +#define LAWAR_EN 0x80000000 + +void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id) +{ + volatile u32 *base = (volatile u32 *)(CFG_IMMR + 0xc08); + volatile u32 *lawbar = base + 8 * idx; + volatile u32 *lawar = base + 8 * idx + 2; + + out_be32(lawbar, addr >> 12); + out_be32(lawar, LAWAR_EN | ((u32)id << 20) | (u32)sz); + + return ; +} + +void disable_law(u8 idx) +{ + volatile u32 *base = (volatile u32 *)(CFG_IMMR + 0xc08); + volatile u32 *lawbar = base + 8 * idx; + volatile u32 *lawar = base + 8 * idx + 2; + + out_be32(lawar, 0); + out_be32(lawbar, 0); + + return; +} + +void init_laws(void) +{ + int i; + u8 law_idx = 0; + + for (i = 0; i < num_law_entries; i++) { + if (law_table[i].index != -1) + law_idx = law_table[i].index; + + set_law(law_idx++, law_table[i].addr, + law_table[i].size, law_table[i].trgt_id); + } + + return ; +} diff --git a/include/asm-ppc/fsl_law.h b/include/asm-ppc/fsl_law.h new file mode 100644 index 0000000..7cb8840 --- /dev/null +++ b/include/asm-ppc/fsl_law.h @@ -0,0 +1,80 @@ +#ifndef _FSL_LAW_H_ +#define _FSL_LAW_H_ + +#include <asm/io.h> + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define SET_LAW_ENTRY(idx, a, sz, trgt) \ + { .index = idx, .addr = a, .size = sz, .trgt_id = trgt } + +enum law_size { + LAW_SIZE_4K = 0xb, + LAW_SIZE_8K, + LAW_SIZE_16K, + LAW_SIZE_32K, + LAW_SIZE_64K, + LAW_SIZE_128K, + LAW_SIZE_256K, + LAW_SIZE_512K, + LAW_SIZE_1M, + LAW_SIZE_2M, + LAW_SIZE_4M, + LAW_SIZE_8M, + LAW_SIZE_16M, + LAW_SIZE_32M, + LAW_SIZE_64M, + LAW_SIZE_128M, + LAW_SIZE_256M, + LAW_SIZE_512M, + LAW_SIZE_1G, + LAW_SIZE_2G, + LAW_SIZE_4G, + LAW_SIZE_8G, + LAW_SIZE_16G, + LAW_SIZE_32G, +}; + +enum law_trgt_if { + LAW_TRGT_IF_PCI = 0x00, + LAW_TRGT_IF_PCI_2 = 0x01, +#ifndef CONFIG_MPC8641 + LAW_TRGT_IF_PCIE_1 = 0x02, +#endif +#ifndef CONFIG_MPC8572 + LAW_TRGT_IF_PCIE_3 = 0x03, +#endif + LAW_TRGT_IF_LBC = 0x04, + LAW_TRGT_IF_CCSR = 0x08, + LAW_TRGT_IF_DDR_INTRLV = 0x0b, + LAW_TRGT_IF_RIO = 0x0c, + LAW_TRGT_IF_DDR = 0x0f, + LAW_TRGT_IF_DDR_2 = 0x16, /* 2nd controller */ +}; +#define LAW_TRGT_IF_DDR_1 LAW_TRGT_IF_DDR +#define LAW_TRGT_IF_PCI_1 LAW_TRGT_IF_PCI +#define LAW_TRGT_IF_PCIX LAW_TRGT_IF_PCI +#define LAW_TRGT_IF_PCIE_2 LAW_TRGT_IF_PCI_2 + +#ifdef CONFIG_MPC8641 +#define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI +#endif + +#ifdef CONFIG_MPC8572 +#define LAW_TRGT_IF_PCIE_3 LAW_TRGT_IF_PCI +#endif + +struct law_entry { + int index; + phys_addr_t addr; + enum law_size size; + enum law_trgt_if trgt_id; +}; + +extern void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id); +extern void disable_law(u8 idx); +extern void init_laws(void); + +/* define in board code */ +extern struct law_entry law_table[]; +extern int num_law_entries; +#endif -- 1.5.3.7

1 0

Re: [U-Boot-Users] [PATCH V2] ppc4xx: Add DU440 board support
by Matthias Fuchs 16 Jan '08

16 Jan '08

My dear old Mr. 'mir-doch-egal', I don't dare to remember your old times at your previous company ... I think it would be funny for other's to post some of Stefan's code here from his pre-Denx era. The comments would explose the list's size limit :-) Yes, I will fix the issue below. Just a minute. BTW, what about removing some lines when quoting such a huge patch. On Wednesday 16 January 2008 12:19, Stefan Roese wrote: > On Wednesday 16 January 2008, Matthias Fuchs wrote: > > Signed-off-by: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> > > Still some comments below. > > > + if(dvi_init()) > > Space after "(" please. > > > + du440_post_errors++; > > +int last_stage_init(void) > > +{ > > + int e, i; > > Empty newline after variable declaration. > > > + /* everyting is ok: turn on POST-LED */ > > + int U; > > Upper case variables? Please use something else here. > > > + oldbus = I2C_GET_BUS(); > > +{ > > + int U; > > Again. > > > + */ > > Yes, please don't forget about this. Sounds interesting. :) > > > +int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) You are welcome to do this before me. Matthias

1 1

[U-Boot-Users] Plea for email reply trimming
by Jerry Van Baren 16 Jan '08

16 Jan '08

There has been a rash of untrimmed email replies lately. All that is needed is enough to get the context, we don't need the whole email (including full patches with a few comments sprinkled in). Please trim more aggressively. Thanks, gvb /me hands the soapbox back to Wolfgang.

1 0

[U-Boot-Users] patches / pull requests? mail lost - please resend
by Wolfgang Denk 16 Jan '08

16 Jan '08

Hi, due to s stupis mail configuration error (while switching to a new ISP) I lost all e-mail that arrived between 08:30 MET and now. If there were any patches / pull requests that should make it into this merge window, please resend these directly to me (at wd(a)denx.de). Sorry for the inconvenience. Best regards, Wolfgang Denk -- Software Engineering: Embedded and Realtime Systems, Embedded Linux Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Gods don't like people not doing much work. People who aren't busy all the time might start to _think_. - Terry Pratchett, _Small Gods_

1 0

[U-Boot-Users] [PATCH] NAND: Change nand_wait_ready() to not call nand_wait()
by Stefan Roese 16 Jan '08

16 Jan '08

This patch changes nand_wait_ready() to not just call nand_wait(), since this will send a new command to the NAND chip. We just want to wait for the chip to become ready here. Signed-off-by: Stefan Roese <sr(a)denx.de> --- William & Stig, could you please review this patch and test it on your platforms? Thanks. drivers/mtd/nand/nand_base.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 5a8196e..6c5c794 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -489,7 +489,16 @@ EXPORT_SYMBOL_GPL(nand_wait_ready); void nand_wait_ready(struct mtd_info *mtd) { struct nand_chip *chip = mtd->priv; - nand_wait(mtd, chip); + u32 timeo = (CFG_HZ * 20) / 1000; + + reset_timer(); + + /* wait until command is processed or timeout occures */ + while (get_timer(0) < timeo) { + if (chip->dev_ready) + if (chip->dev_ready(mtd)) + break; + } } #endif -- 1.5.4.rc2

5 13

[U-Boot-Users] [PATCH] Correct NAND erase percentage output
by Dirk Behme 16 Jan '08

16 Jan '08

For NAND erase sizes smaller than one NAND erase block, erase percentage output becomes grater than 100% e.g. -- cut -- > nand info Device 0: NAND 64MiB 1,8V 8-bit, sector size 16 KiB > nand erase 0x100000 0x2000 NAND erase: device 0 offset 0x100000, size 0x2000 Erasing at 0x100000 -- 200% complete. OK > -- cut -- Correct this and give user a warning that more is erased than specified: -- cut -- > nand erase 0x100000 0x2000 NAND erase: device 0 offset 0x100000, size 0x2000 Warning: Erase size 0x00002000 smaller than one erase block 0x00004000 Erasing 0x00004000 instead Erasing at 0x100000 -- 100% complete. OK > -- cut -- This patch is against u-boot-nand-flash.git. Signed-off-by: Dirk Behme <dirk.behme(a)gmail.com> --- drivers/mtd/nand/nand_util.c_orig 2008-01-14 21:13:10.000000000 +0100 +++ drivers/mtd/nand/nand_util.c 2008-01-14 21:46:53.000000000 +0100 @@ -153,6 +153,13 @@ int nand_erase_opts(nand_info_t *meminfo priv_nand->bbt = NULL; } + if(erase_length < meminfo->erasesize) { + printf("Warning: Erase size 0x%08x smaller than one " \ + "erase block 0x%08x\n",erase_length, meminfo->erasesize); + printf(" Erasing 0x%08x instead\n", meminfo->erasesize); + erase_length = meminfo->erasesize; + } + for (; erase.addr < opts->offset + erase_length; erase.addr += meminfo->erasesize) {

3 2

[U-Boot-Users] [PATCH] OneNAND: Separate U-Boot dependent code from OneNAND
by Kyungmin Park 16 Jan '08

16 Jan '08

OneNAND: Separate U-Boot dependent code from OneNAND Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile index 2049413..92074b2 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libonenand.a -COBJS := onenand_base.o onenand_bbt.o +COBJS := onenand_uboot.o onenand_base.o onenand_bbt.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 7983a4a..d4003a2 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -1271,24 +1271,4 @@ void onenand_release(struct mtd_info *mtd) { } -/* - * OneNAND initialization at U-Boot - */ -struct mtd_info onenand_mtd; -struct onenand_chip onenand_chip; - -void onenand_init(void) -{ - memset(&onenand_mtd, 0, sizeof(struct mtd_info)); - memset(&onenand_chip, 0, sizeof(struct onenand_chip)); - - onenand_chip.base = (void *)CFG_ONENAND_BASE; - onenand_mtd.priv = &onenand_chip; - - onenand_scan(&onenand_mtd, 1); - - puts("OneNAND: "); - print_size(onenand_mtd.size, "\n"); -} - #endif /* CONFIG_CMD_ONENAND */ diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c new file mode 100644 index 0000000..bd7466a --- /dev/null +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -0,0 +1,41 @@ +/* + * drivers/mtd/onenand/onenand_uboot.c + * + * Copyright (C) 2005-2008 Samsung Electronics + * Kyungmin Park <kyungmin.park(a)samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * OneNAND initialization at U-Boot + */ + +#include <common.h> + +#ifdef CONFIG_CMD_ONENAND + +#include <linux/mtd/compat.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/onenand.h> + +struct mtd_info onenand_mtd; +struct onenand_chip onenand_chip; + +void onenand_init(void) +{ + memset(&onenand_mtd, 0, sizeof(struct mtd_info)); + memset(&onenand_chip, 0, sizeof(struct onenand_chip)); + + onenand_chip.base = (void *) CFG_ONENAND_BASE; + onenand_mtd.priv = &onenand_chip; + + onenand_scan(&onenand_mtd, 1); + + puts("OneNAND: "); + print_size(onenand_mtd.size, "\n"); +} + +#endif /* CONFIG_CMD_ONENAND */

2 1

[U-Boot-Users] [PATCH] ppc_4xx:Fix post spr.c for PPC405
by Niklaus Giger 16 Jan '08

16 Jan '08

post/cpu/ppc4xx/spr.c contained a few checks for registers only present for PPC440 and derivates processor. Signed-off-by: Niklaus Giger <niklaus.giger(a)netstal.com> --- post/cpu/ppc4xx/spr.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c index 3e74634..c12e378 100644 --- a/post/cpu/ppc4xx/spr.c +++ b/post/cpu/ppc4xx/spr.c @@ -80,7 +80,9 @@ static struct { {0x107, "SPRG7", 0x00000000, 0x00000000}, {0x10c, "TBL", 0x00000000, 0x00000000}, {0x10d, "TBU", 0x00000000, 0x00000000}, +#ifdef CONFIG_440 {0x11e, "PIR", 0x0000000f, 0x00000000}, +#endif {0x130, "DBSR", 0x00000000, 0x00000000}, {0x134, "DBCR0", 0x00000000, 0x00000000}, {0x135, "DBCR1", 0x00000000, 0x00000000}, @@ -95,6 +97,7 @@ static struct { {0x13f, "DVC2", 0x00000000, 0x00000000}, {0x150, "TSR", 0x00000000, 0x00000000}, {0x154, "TCR", 0x00000000, 0x00000000}, +#ifdef CONFIG_440 {0x190, "IVOR0", 0x0000fff0, 0x00000100}, {0x191, "IVOR1", 0x0000fff0, 0x00000200}, {0x192, "IVOR2", 0x0000fff0, 0x00000300}, @@ -111,6 +114,7 @@ static struct { {0x19d, "IVOR13", 0x0000fff0, 0x00001300}, {0x19e, "IVOR14", 0x0000fff0, 0x00001400}, {0x19f, "IVOR15", 0x0000fff0, 0x00002000}, +#endif {0x23a, "MCSRR0", 0x00000000, 0x00000000}, {0x23b, "MCSRR1", 0x00000000, 0x00000000}, {0x23c, "MCSR", 0x00000000, 0x00000000}, @@ -131,8 +135,10 @@ static struct { {0x395, "DTV1", 0x00000000, 0x00000000}, {0x396, "DTV2", 0x00000000, 0x00000000}, {0x397, "DTV3", 0x00000000, 0x00000000}, +#ifdef CONFIG_440 {0x398, "DVLIM", 0x0fc1f83f, 0x0001f800}, {0x399, "IVLIM", 0x0fc1f83f, 0x0001f800}, +#endif {0x39b, "RSTCFG", 0x00000000, 0x00000000}, {0x39c, "DCDBTRL", 0x00000000, 0x00000000}, {0x39d, "DCDBTRH", 0x00000000, 0x00000000}, -- 1.5.2.5 -- Niklaus Giger Netstal Maschinen AG CH-8752 Naefels

2 2

[U-Boot-Users] CUSTODIANS: List of open issues / not applied patches
by Wolfgang Denk 16 Jan '08

16 Jan '08

Hello everybody, this is a heads-up especially for all custodians... Please review the following list of postings / patches that - to the best of my knowledge - habve not been processed yet; at least I did not mark them as rejected, nor did I find them in the current U-Boot tree. If possible, please apply and send pull requests ASAP! Thanks. [It would be helpful to me if you could include my private message ID (the number in column 1) when referring to one of these postings; thanks.] 9799 09/18 urwithsughosh@gma Re: [U-Boot-Users] [PATCH]: Reset issue fix on mpc85xx 9804 09/18 Jason Jin [PATCH] fsl_pci_init Fix command register initialization issue. 9952 09/24 Anatolij Gustschi [U-Boot-Users] [PATCH] Add Fujitsu CoralP/Lime video driver 9967 09/24 Troy Kisky Re: [U-Boot-Users] PATCH - Fix oob data copied into supplied buffer 9969 09/25 Shinya Kuribayash Re: [U-Boot-Users] [MIPS] Make mips_io_port_base more generic 10068 09/28 Vasiliy Leoenenko [PATCH] M18 flash (Sibley) support (attempt 2) 10078 09/28 Dan Wilson [U-Boot-Users] [PATCH] tsec.c patch for receiver reset 10081 09/29 Shinya Kuribayash [MIPS] Make mips_io_port_base more generic 10159 10/04 Vlad Lungu [U-Boot-Users] [PATCH] Target support for qemu -M mips 10281 10/10 Vlad Lungu [PATCH] Fixed pcnet io_base 10282 10/10 Vlad Lungu [PATCH] Added Am79C970A chip id to pcnet 10397 10/12 Tony Li [U-Boot-Users] [PATCH] mpc83xx: Add ATM makefile entry for MPC8360EM 10676 10/22 Anton Vorontsov [U-Boot-Users] [PATCH] MPC8568E-MDS: reset UCCs to use them reliably 10686 10/23 Shinya Kuribayash Re: [U-Boot-Users] [PATCH 1/1] Fix mips_io_port_base multiple declar 10690 10/22 Anton Vorontsov [U-Boot-Users] [PATCH] MPC8568E-MDS: set up QE pario for UART1 10810 10/25 Johannes Stezenba [U-Boot-Users] [patch 0/3] KB9202 CodeSourcery ARM EABI toolchain bu 11193 11/07 llandre [U-Boot-Users] [PATCH] ARM optimized memcpy/memmove routines 11230 11/09 "Martin Krause" RE: [U-Boot-Users] [PATCH] TQM5200B: update MTD partition layout 11473 11/19 Matthias Fuchs Re: [U-Boot-Users] flash hardware protection with CFI driver does no 11522 11/20 stefano babic [U-Boot-Users] [PATCH] Fix gcc issues in pxa-regs.h 11523 11/20 stefano babic [U-Boot-Users] [PATCH] MMC for PXA 27X (resubmit) 11635 11/23 sivaji [U-Boot-Users] MPC8548 problem in Boot Sequencer mode 11911 12/01 Daniel Mack Re: [U-Boot-Users] [PATCH] add support for Toradex Colibri module 11928 12/03 Yoshihiro Shimoda [PATCH] serial_sh: Add support for SH7720 11929 12/03 Yoshihiro Shimoda [PATCH] sh: Add support SH3 and SH7720 11930 12/03 Yoshihiro Shimoda [PATCH] Add support for MS7720RP02 board 12002 12/06 Ladislav Michl [U-Boot-Users] [PATCH] ARM: Fix at91rm9200dk base address 12003 12/06 Ladislav Michl [U-Boot-Users] [PATCH] ARM: AT91RM9200 based boards config cleanup 12007 12/07 Ladislav Michl [U-Boot-Users] [PATCH] ARM: Board voiceblue update 12044 12/08 Jean-Christophe P Re: [U-Boot-Users] PATCH: add support for MII-connected ethernet swi 12046 12/08 Jean-Christophe P Re: [U-Boot-Users] PATCH: ixp42x UART: support 230400bps, enable RTS 12057 12/09 Jean-Christophe P Re: [U-Boot-Users] PATCH: add support for MII-connected ethernet swi 12096 12/10 Jean-Christophe P [U-Boot-Users] [PATCH] bf537-stamp: remove already defined is_zero_e 12257 12/13 Jean-Christophe P [U-Boot-Users] [PATCH] Nios2: remove common/cmd_bdinfo.c unused vari 12382 12/18 Hebbar Re: [U-Boot-Users] [PATCH] ARM926: compile cpu_init_crit function on 12383 12/18 Hebbar Re: [U-Boot-Users] [PATCH] ARM926: Remove compiler warning: target C 12384 12/18 Hebbar Re: [U-Boot-Users] [PATCH] ARM: I2C Init function call in lib_arm/bo 12385 12/18 Hebbar Re: [U-Boot-Users] [PATCH] ARM926: Display Ethernet info in do_bdinf 12390 12/19 Kumar Gala [U-Boot-Users] [PATCH] Reworked FSL Book-E TLB macros to be more rea 12392 12/19 Joakim Tjernlund Re: [U-Boot-Users] 83xx, FSL_UEC reducing boot latency, printf causi 12393 12/19 Stefan Roese [U-Boot-Users] fdt chosen node handling 12394 12/19 Joakim Tjernlund Re: [U-Boot-Users] 83xx, FSL_UEC reducing boot latency, printf causi 12395 12/19 "Gururaja Hebbar Re: [U-Boot-Users] [PATCH] ARM926: compile cpu_init_crit function on 12396 12/19 Dirk Behme Re: [U-Boot-Users] [PATCH] ARM926: compile cpu_init_crit function on 12404 12/19 Harald Welte [U-Boot-Users] [PATCH] ARM: arm920/s3c24xx: IRQ demulitplexer callba 12405 12/19 Harald Welte [U-Boot-Users] [PATCH] ARM: arm920t: Allow use of 'gd' pointer from 12408 12/19 Harald Welte [U-Boot-Users] [PATCH] ARM: s3c24xx: Multiple serial port support 12412 12/19 Harald Welte [U-Boot-Users] [PATCH] ARM: S3C24x0 SoC NAND controller support 12510 12/22 Jean-Christophe P [U-Boot-Users] [PATCH 1/1] qemu-mips: active HUSH PARSER, AUTO_COMPL 12548 12/25 Anton Vorontsov [U-Boot-Users] [PATCH] mpc83xx: UEC: add support for Broadcom BCM548 12549 12/25 Anton Vorontsov [U-Boot-Users] [PATCH] mpc83xx: add support for the MPC8360E-RDK 12602 12/27 Wolfgang Denk [U-Boot-Users] [PATCH] OMAP5912: fix FIFO handling in UART driver 12818 01/04 Jon Loeliger [U-Boot-Users] [PATCH] Convert MPC8610HPCD to use libfdt. 12820 01/04 Timur Tabi Re: [U-Boot-Users] [PATCH] 8610: Fix lingering compile warnings. 12859 01/07 Timur Tabi [U-Boot-Users] [PATCH v2] 85xx: add ability to upload QE firmware 12866 01/07 Kumar Gala Re: [U-Boot-Users] [PATCH] MPC85xx KGDB support 12870 01/08 Kumar Gala [U-Boot-Users] [PATCH] 85xx: Remove cache config from configs.h 12934 01/08 Ben Warren [U-Boot-Users] [PATCH] Fix Ethernet init() return codes 12938 01/08 Ben Warren [U-Boot-Users] [PATCH V2] Fix Ethernet init() return codes. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Applying computer technology is simply finding the right wrench to pound in the correct screw.

18 23

[U-Boot-Users] [PATCH] mpc86xx: Remove CONFIG_OF_FLAT_TREE for sbc8641d
by Joe Hamman 16 Jan '08

16 Jan '08

Update sbc8641d reference board to use CONFIG_OF_LIBFDT. Signed-off by: Joe Hamman <joe.hamman(a)embeddedspecialties.com> diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 7adc42f..3d1d100 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -35,11 +35,8 @@ #include <asm/immap_86xx.h> #include <asm/immap_fsl_pci.h> #include <spd.h> -adc42f..3d1d100 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -35,11 +35,8 @@ #inclu -#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -extern void ft_cpu_setup (void *blob, bd_t * bd); -#endif +#include <libfdt.h> +#include <fdt_support.h> #if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) extern void ddr_enable_ecc (unsigned int dram_size); @@ -341,22 +338,51 @@ void pci_init_board(void) } -#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) -void ft_board_setup (void *blob, bd_t * bd) +#if defined(CONFIG_OF_BOARD_SETUP) +void +ft_board_setup(void *blob, bd_t *bd) { - u32 *p; - int len; + int node, tmp[2]; + const char *path; + + fdt_fixup_ethernet(blob, bd); - ft_cpu_setup (blob, bd); + do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, + "timebase-frequency", bd->bi_busfreq / 4, 1); + do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, + "bus-frequency", bd->bi_busfreq, 1); + do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, + "clock-frequency", bd->bi_intfreq, 1); + do_fixup_by_prop_u32(blob, "device_type", "soc", 4, + "bus-frequency", bd->bi_busfreq, 1); - p = ft_get_prop (blob, "/memory/reg", &len); - if (p != NULL) { - *p++ = cpu_to_be32 (bd->bi_memstart); - *p = cpu_to_be32 (bd->bi_memsize); + do_fixup_by_compat_u32(blob, "ns16550", + "clock-frequency", bd->bi_busfreq, 1); + + fdt_fixup_memory(blob, bd->bi_memstart, bd->bi_memsize); + + node = fdt_path_offset(blob, "/aliases"); + tmp[0] = 0; + if (node >= 0) { +#ifdef CONFIG_PCI1 + path = fdt_getprop(blob, node, "pci0", NULL); + if (path) { + tmp[1] = pci1_hose.last_busno - pci1_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } +#endif +#ifdef CONFIG_PCI2 + path = fdt_getprop(blob, node, "pci1", NULL); + if (path) { + tmp[1] = pci2_hose.last_busno - pci2_hose.first_busno; + do_fixup_by_path(blob, path, "bus-range", &tmp, 8, 1); + } +#endif } } #endif + void sbc8641d_reset_board (void) { puts ("Resetting board....\n"); diff --git a/config.mk b/config.mk diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 54eac38..2c8da6e 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -267,13 +267,9 @@ /* * Pass open firmware flat tree to kernel */ -#define CONFIG_OF_FLAT_TREE 1 -#define CONFIG_OF_BOARD_SETUP 1 - -#define OF_CPU "PowerPC,8641@0" -#define OF_SOC "soc@f8000000" -#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc@f8000000/serial@4500" +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CFG_64BIT_VSPRINTF 1 #define CFG_64BIT_STRTOUL 1

3 2