December 2005 - U-Boot

[U-Boot-Users] [PATCH] add support for Nat Semi DP83865 PHY to MPC85xx TSEC driver
by Murray.Jensen＠csiro.au 12 Mar '06

12 Mar '06

This patch adds support for the National Semiconductor DP83865 gigabit ethernet PHY to the MPC85xx TSEC ethernet driver. Cheers! Murray... CHANGELOG entry: * Patch by Murray Jensen <Murray.Jensen(a)csiro.au>, July 8, 2005: - add Nat Semi DP83865 PHY support to MPC85xx TSEC driver Copyright: This patch 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. -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] [PATCH] add (some) definitions for MPC85xx local bus controller
by Murray.Jensen＠csiro.au 12 Mar '06

12 Mar '06

This patch adds (some) definitions for the MPC85xx local bus controller register bits, in a similar vein to the MPC8260 memory controller, which is almost identical. Cheers! Murray... CHANGELOG entry: * Patch by Murray Jensen <Murray.Jensen(a)csiro.au>, July 8, 2005: - add (some) definitions for the MPC85xx local bus controller Copyright: This patch 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. -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] [PATCH] CPM I/O port pin functions for MPC85xx
by Murray.Jensen＠csiro.au 12 Mar '06

12 Mar '06

This patch adds the file "include/asm-ppc/iopin_85xx.h" which mirrors the functions in "include/asm-ppc/iopin_8260.h" for manipulating the CPM2 I/O pins for MPC85xx processors (that have a CPM). Cheers! Murray... CHANGELOG entry: * Patch by Murray Jensen <Murray.Jensen(a)csiro.au>, July 8, 2005: - add CPM2 I/O pin functions for MPC85xx processors Copyright: This patch 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. -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] [PATCH] fix conditional for including ks8695eth driver
by Greg Ungerer 12 Mar '06

12 Mar '06

Move the c-preprocessor conditional check for compiling the ks8695eth driver code to after including the headers. Otherwise it can never be compiled in. Index: drivers/ks8695eth.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/drivers/ks8695eth.c,v retrieving revision 1.2 diff -u -r1.2 ks8695eth.c --- drivers/ks8695eth.c 23 May 2005 10:49:51 -0000 1.2 +++ drivers/ks8695eth.c 3 Jun 2005 14:13:54 -0000 @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef CONFIG_DRIVER_KS8695ETH - /****************************************************************************/ #include <common.h> @@ -28,6 +26,7 @@ #include <asm/io.h> #include <asm/arch/platform.h> +#ifdef CONFIG_DRIVER_KS8695ETH /****************************************************************************/ /*

3 3

[U-Boot-Users] RFC: PCI table based cfg change?
by Kumar Gala 12 Mar '06

12 Mar '06

I was hoping to get some feedback on the following patch. It is intended to deal with the case if we are configuring a PCI bridge via the pci_config_table, we need some way of reporting back the fact that the bus number has changed. - kumar --- a/drivers/pci.c +++ b/drivers/pci.c @@ -459,6 +459,7 @@ int pci_hose_scan_bus(struct pci_control PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev)); if (cfg) { cfg->config_device(hose, dev, cfg); + sub_bus = max(sub_bus, hose->current_busno); #ifdef CONFIG_PCI_PNP } else { int n = pciauto_config_device(hose, dev);

3 2

[U-Boot-Users] [PATCH] Only disable the MPC83xx watchdog if its enabled out of reset
by Kumar Gala 12 Mar '06

12 Mar '06

Only disable the MPC83xx watchdog if its enabled out of reset Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> CHANGELOG: * Only disable the MPC83xx watchdog if its enabled out of reset. If its disabled out of reset SW can later enable it if so desired Patch by Kumar Gala 21 Dec 2005 --- commit 660737c7f106a7c7817375ed29e52fbf28c5838f tree d2448e66f669ed2a5464535eab5a747aafe14eb1 parent ae907acc35249e178692e74a6f76df6eb217cf6b author Kumar Gala <galak(a)kernel.crashing.org> Wed, 21 Dec 2005 17:39:01 -0600 committer Kumar Gala <galak(a)kernel.crashing.org> Wed, 21 Dec 2005 17:39:01 -0600 cpu/mpc83xx/start.S | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S index fb001a6..0e1a5fd 100644 --- a/cpu/mpc83xx/start.S +++ b/cpu/mpc83xx/start.S @@ -426,8 +426,14 @@ init_e300_core: /* time t 10 */ #else /* Disable Wathcdog */ /*-------------------*/ + lwz r4, SWCRR(r3) + /* Check to see if its enabled for disabling + once disabled by SW you can't re-enable */ + andi. r4, r4, 0x4 + beq 1f xor r4, r4, r4 stw r4, SWCRR(r3) +1: #endif /* CONFIG_WATCHDOG */ /* Initialize the Hardware Implementation-dependent Registers */

2 1

[U-Boot-Users] [PATCH] Report back PCI bus when doing table based device config
by Kumar Gala 12 Mar '06

12 Mar '06

Report back PCI bus when doing table based device config Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> CHANGELOG: * Report back PCI bus when doing table based device config Patch by Kumar Gala 14 Dec 2005 --- commit 837f814f04849814fd95710796e8e107b01c9121 tree d8f0e663f827d5fb4deb9b5e20841cd9ddcc2807 parent d7b4ec6d89455f45e3c0e6d48daaba4d917c26a7 author Kumar Gala <galak(a)kernel.crashing.org> Wed, 14 Dec 2005 17:59:49 -0600 committer Kumar Gala <galak(a)kernel.crashing.org> Wed, 14 Dec 2005 17:59:49 -0600 drivers/pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index 5360030..3c24b99 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -459,6 +459,7 @@ int pci_hose_scan_bus(struct pci_control PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev)); if (cfg) { cfg->config_device(hose, dev, cfg); + sub_bus = max(sub_bus, hose->current_busno); #ifdef CONFIG_PCI_PNP } else { int n = pciauto_config_device(hose, dev);

2 1

[U-Boot-Users] [PATCH] Allow config of GPIO direction & data registers at boot on 83xx
by Kumar Gala 12 Mar '06

12 Mar '06

Allow config of GPIO direction & data registers at boot on 83xx Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> CHANGELOG: * Allow config of GPIO direction & data registers at boot on 83xx Patch by Kumar Gala 14 Dec 2005 Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- commit 318fab58c6c6cd81b407edd2a06a35f4778f9bc9 tree 4c59954eab46500b5b75f2201cc1a9c631c0d23c parent 08dac06850e30a256df62803e8ca22c86f92c7cb author Kumar Gala <galak(a)kernel.crashing.org> Wed, 14 Dec 2005 17:53:19 -0600 committer Kumar Gala <galak(a)kernel.crashing.org> Wed, 14 Dec 2005 17:53:19 -0600 cpu/mpc83xx/cpu_init.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c index e75b8b7..db28a6a 100644 --- a/cpu/mpc83xx/cpu_init.c +++ b/cpu/mpc83xx/cpu_init.c @@ -154,6 +154,14 @@ void cpu_init_f (volatile immap_t * im) im->sysconf.lblaw[7].bar = CFG_LBLAWBAR7_PRELIM; im->sysconf.lblaw[7].ar = CFG_LBLAWAR7_PRELIM; #endif +#ifdef CFG_GPIO1_PRELIM + im->pgio[0].dir = CFG_GPIO1_DIR; + im->pgio[0].dat = CFG_GPIO1_DAT; +#endif +#ifdef CFG_GPIO2_PRELIM + im->pgio[1].dir = CFG_GPIO2_DIR; + im->pgio[1].dat = CFG_GPIO2_DAT; +#endif }

2 1

[U-Boot-Users] [PATCH] Add helper function for generic flat device tree fixups for 83xx
by Kumar Gala 12 Mar '06

12 Mar '06

Add helper function for generic flat device tree fixups for 83xx Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> CHANGELOG: * Add helper function for generic flat device tree fixups for 83xx Patch by Kumar Gala 13 Dec 2005 --- commit b0ffe0fd03bdd3118a2261e183387110c7f98b62 tree 7e533ce44581532f5aefc00a7fbc805690e6815d parent dbd0923389252c41a48ed9827b2359af9d52567e author Kumar Gala <galak(a)kernel.crashing.org> Tue, 13 Dec 2005 11:17:24 -0600 committer Kumar Gala <galak(a)kernel.crashing.org> Tue, 13 Dec 2005 11:17:24 -0600 cpu/mpc83xx/cpu.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 8c9b515..f20d584 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -151,3 +151,36 @@ void watchdog_reset (void) hang(); /* FIXME: implement watchdog_reset()? */ } #endif /* CONFIG_WATCHDOG */ + +#if defined(CONFIG_OF_FLAT_TREE) +void +ft_cpu_setup(void *blob, bd_t *bd) +{ + u32 *p; + int len; + ulong clock; + + clock = bd->bi_busfreq; + p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); + if (p != NULL) + *p = cpu_to_be32(clock); + + p = ft_get_prop(blob, "/" OF_SOC "/serial@4500/clock-frequency", &len); + if (p != NULL) + *p = cpu_to_be32(clock); + + p = ft_get_prop(blob, "/" OF_SOC "/serial@4600/clock-frequency", &len); + if (p != NULL) + *p = cpu_to_be32(clock); + +#ifdef CONFIG_MPC83XX_TSEC1 + p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/address", &len); + memcpy(p, bd->bi_enetaddr, 6); +#endif + +#ifdef CONFIG_MPC83XX_TSEC2 + p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/address", &len); + memcpy(p, bd->bi_enet1addr, 6); +#endif +} +#endif

2 1

[U-Boot-Users] [PATCH] Allow board code to fixup the OF flat device tree before booting a kernel
by Kumar Gala 12 Mar '06

12 Mar '06

Allow board code to fixup the OF flat device tree before booting a kernel Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> CHANGELOG: * Allow board code to fixup the OF flat device tree before booting a kernel Patch by Kumar Gala 13 Dec 2005 --- commit 943fd6f23661331e7ab70f9ab190387f5e0ca1ff tree 182dedeba4351f5c4e1cfd1c12a7870fad50b76a parent 7abb967b49b86994aca615acc60cbc322efb9b98 author Kumar Gala <galak(a)kernel.crashing.org> Tue, 13 Dec 2005 11:09:21 -0600 committer Kumar Gala <galak(a)kernel.crashing.org> Tue, 13 Dec 2005 11:09:21 -0600 README | 6 ++++++ common/ft_build.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/README b/README index 21f5bf0..ea37dac 100644 --- a/README +++ b/README @@ -411,6 +411,7 @@ The following options need to be configu The maximum size of the constructed OF tree. OF_CPU - The proper name of the cpus node. + OF_SOC - The proper name of the soc node. OF_TBCLK - The timebase frequency. CONFIG_OF_HAS_BD_T @@ -423,6 +424,11 @@ The following options need to be configu The resulting flat device tree will have a copy of u-boot's environment variables + CONFIG_OF_BOARD_SETUP + + Board code has addition modification that it wants to make + to the flat device tree before handing it off to the kernel + - Serial Ports: CFG_PL010_SERIAL diff --git a/common/ft_build.c b/common/ft_build.c index c67af6f..bebee30 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -690,9 +690,12 @@ void ft_setup(void *blob, int size, bd_t if (p != NULL) *p = cpu_to_be32(clock); #endif - #endif /* __powerpc__ */ +#ifdef CONFIG_OF_BOARD_SETUP + ft_board_setup(blob, bd); +#endif + /* printf("final OF-tree\n"); ft_dump_blob(blob);

2 1