Re: [U-Boot] [PATCH] ppc4xx: Improve DDR autodetect
Hi Wolfgang, On Saturday 24 January 2009, Wolfgang Denk wrote: > > Added support for a second memory bank to DDR autodetection for 440 > > platforms. > > Made hardcoded values configurable. > > > > Signed-off-by: Dirk Eibach > > --- > > cpu/ppc4xx/sdram.c | 55 > > +++ 1 files changed, 50 > > insertions(+), 5 deletions(-) > > I haven't seen any comments on this yet? This patch (and others as well) is queued for the next merge window which opened yesterday. I'll update my ppc4xx and cfi-flash repos next week and send a pull request. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Blackfin network updates
should i push changes for the Blackfin on-chip network driver through Ben's net tree or can i have you pull them straight from my repo ? obviously changes to this driver only affect Blackfin parts, but the file itself lives in drivers/net/ ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] SATA: do not auto-initialize during boot
On Tuesday 23 December 2008 00:10:39 Mike Frysinger wrote: > Rather than have the board code initialize SATA automatically during boot, > make the user manually run "sata init". This brings the SATA subsystem in > line with common U-Boot policy. > > Rather than having a dedicated weak function "is_sata_supported", people > can override sata_initialize() to do their weird board stuff. Then they > can call the actual __sata_initialize(). i dont think anyone has a problem with this latest version (or at least, all the issues brought up before have been addressed), so can this be merged ? -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-blackfin.git
On Friday 23 January 2009 20:07:42 Wolfgang Denk wrote: > In message <200901231828.04120.vap...@gentoo.org> you wrote: > > > If you are trying to help, there are other, better ways: > > > > > > - You can post Acked-by: or even better Tested-by: messages > > > (now *that* would be really helpful!) > > > > > > - You can apply such patches to a *separate branch* in your repo (or > > > somewhere else), and then post a summary Acked-by: or Tested-by: > > > message > > > > i dont see how those are relevant here seeing as how they all have my > > Signed- off-by tag ... that implies both my ack and test. > > > > i figured pinging every non-Blackfin-specific patch by me would be more > > time consuming than a simple pull request for you. would it be ok if i > > used a different branch then and indicated in the summary along those > > lines ? > > Yes, that would be helpful - that is exactly what I suggested above. ill try and do that in the future then, thanks -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
On Sat, 24 Jan 2009 02:14:16 +0100 Wolfgang Denk wrote: > In message <20090123175552.3f60db0b.kim.phill...@freescale.com> you wrote: > > > > me neither. I know it works with gcc 4.2, just not gcc 4.1, and I > > don't know what version the ELDK currently uses. I'll just take it > > since it's so early in the cycle, and WD seems to be overtaking me in > > 83xx patches anyway ;). I expect the issue to be fixed before the next > > release though. > > ELDK uses: > > ELDK 4.0: gcc version 4.0.0 > ELDK 4.1: gcc version 4.0.0 > ELDK 4.2: gcc version 4.2.2 great, then all should be ok. Thank you Wolfgang, Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] u-boot for ARM
Hello 2009/1/24 Amandeep Bhullar : > I was reading the README and it talks about configuring a large number > of options. Where do I define these options? In which file? > > if i just give the command > $ make arm926ejs_config > if comes with a message > make: *** No rule to make target 'arm926ejs_config'. Stop. That's correct, 'make' is unable to find such target. You must specify the target corresponding to your board, for example "make davinci_dvevm_config", i.e. prefix preceding '_config' normally indicate a platform's name. -- Roman Mashak ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-mpc85xx.git
Dear Andy Fleming,
In message <1232753424-2863-1-git-send-email-aflem...@freescale.com> you wrote:
> are available in the git repository at:
>
> git://www.denx.de/git/u-boot-mpc85xx.git master
>
> Dave Liu (5):
> fsl-ddr: update the bit mask for DDR3 controller
> fsl-ddr: clean up the ddr code for DDR3 controller
> fsl-ddr: make the self refresh idle threshold configurable
> fsl-ddr: use the 1T timing as default configuration
> 85xx: enable the auto self refresh for wake up ARP
>
> Haiying Wang (2):
> Add README file for MPC8572DS board
> Add secondary CPUs processor frequency for e500 core
>
> Kumar Gala (10):
> 85xx: separate PIXIS virtual from physical address
> 85xx: separate FLASH BASE virtual from physical address
> 85xx: Convert CONFIG_SYS_{PCI*,RIO*}_MEM_BASE to _MEM_BUS for FSL boards
> 85xx: Convert CONFIG_SYS_PCI*_IO_BASE to _IO_BUS for FSL boards
> 85xx: Use CONFIG_SYS_{PCI*,RIO*}_MEM_PHYS for physical address on FSL
> boards
> 85xx: Introduce CONFIG_SYS_PCI*_MEM_VIRT for FSL boards
> 85xx: Introduce CONFIG_SYS_PCI*_IO_VIRT for FSL boards
> 85xx: Use BR_ADDR macro for NAND chipselects
> 85xx: Handle eLBC difference w/36-bit physical
> 85xx: Add a 36-bit physical configuration for MPC8572DS
>
> MAKEALL |1 +
> Makefile|8 ++-
> board/freescale/mpc8536ds/ddr.c |6 +
> board/freescale/mpc8536ds/law.c |4 +-
> board/freescale/mpc8536ds/mpc8536ds.c | 30 +++---
> board/freescale/mpc8536ds/tlb.c |8 +-
> board/freescale/mpc8540ads/ddr.c|3 +
> board/freescale/mpc8540ads/law.c|2 +-
> board/freescale/mpc8540ads/tlb.c|8 +-
> board/freescale/mpc8541cds/tlb.c|8 +-
> board/freescale/mpc8544ds/ddr.c |3 +
> board/freescale/mpc8544ds/mpc8544ds.c | 34 +++---
> board/freescale/mpc8544ds/tlb.c |6 +-
> board/freescale/mpc8548cds/mpc8548cds.c |8 +-
> board/freescale/mpc8548cds/tlb.c|6 +-
> board/freescale/mpc8555cds/tlb.c|8 +-
> board/freescale/mpc8560ads/ddr.c|3 +
> board/freescale/mpc8560ads/law.c|2 +-
> board/freescale/mpc8560ads/tlb.c|8 +-
> board/freescale/mpc8568mds/law.c|2 +-
> board/freescale/mpc8568mds/mpc8568mds.c |8 +-
> board/freescale/mpc8568mds/tlb.c|2 +-
> board/freescale/mpc8572ds/law.c |4 +-
> board/freescale/mpc8572ds/mpc8572ds.c | 16 ++--
> board/freescale/mpc8572ds/tlb.c | 12 +-
> board/freescale/mpc8610hpcd/ddr.c |3 +
> board/freescale/mpc8641hpcn/ddr.c |2 +
> board/stxgp3/ddr.c |3 +
> board/stxssa/ddr.c |3 +
> cpu/mpc85xx/cpu.c |7 +-
> cpu/mpc85xx/fdt.c | 15 +++-
> cpu/mpc85xx/pci.c | 32 +--
> cpu/mpc85xx/speed.c | 10 +-
> cpu/mpc8xxx/ddr/ctrl_regs.c | 48 ++
> cpu/mpc8xxx/ddr/options.c |2 +-
> doc/README.mpc8572ds| 167
> +++
> include/asm-ppc/fsl_ddr_sdram.h |7 ++
> include/asm-ppc/fsl_lbc.h |8 ++-
> include/configs/MPC8536DS.h | 63 +++-
> include/configs/MPC8540ADS.h| 13 ++-
> include/configs/MPC8541CDS.h| 16 ++-
> include/configs/MPC8544DS.h | 47 ++
> include/configs/MPC8548CDS.h| 28 --
> include/configs/MPC8555CDS.h| 16 ++-
> include/configs/MPC8560ADS.h| 13 ++-
> include/configs/MPC8568MDS.h| 20 +++--
> include/configs/MPC8572DS.h | 98 ++
> include/e500.h |6 +-
> 48 files changed, 595 insertions(+), 232 deletions(-)
> create mode 100644 doc/README.mpc8572ds
Done, thanks.
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: w...@denx.de
No more blah, blah, blah!
-- Kirk, "Miri", stardate 2713.6
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH/RFC, 0/2] I2C rework -- what do you think?
Hi everyone, Here is the first draft of major I2C subsystem rework. This is not a patch that should be applied to the tree--it will break systems with I2C busses over multiplexers and probably something else--but rather a Request For Comments. I would like to here all the objections, suggestions etc. before I go on and undertake a big job to change all the boards and other stuff to the new code. It is a big job and I don't want to spend a lot of time doing something that nobody would accept. My goal is to somehow untie I2C subsystem from platform-specific parts. This is not an attempt for a "code cleanup" though some cleanup could be achieved in process. But this is not a goal, it is just a probable side effect. Primary goal is to allow multiple I2C busses on a board served by different I2C controllers (on-SoC, external, bit-banging.) As of now we have rudimentary support for multiple BUILT-IN adapters in some SoCs (e.g. fsl_i2c.c) but this support is platform specific and does NOT allow any additional (external etc.) adapters. This is not a problem for a vast majority of supported boards that usually have a single I2C bus but there are cases when boards have several busses served by different I2C adapters. I personally have the first prototype of such a board right now in PCB fab. It's MPC8548E based mATX motherboard that uses both built-in I2C adapters (fsl_i2c.c) AND the third one off of SM502 chip sitting on PCI bus. All 3 busses are required for proper system initialization and operation because we have 3 I2C devices with the same address, 0x68 that can not be changed. For existing boards we have just 2 MUTUALLY EXCLUSIVE options, CONFIG_HARD_I2C and CONFIG_SOFT_I2C. That gives very little control over I2C subsystem. It won't even allow for having a bit-banged I2C bus in addition to a hardware adapter, less for several such busses or anything external (e.g. some chipset adapters that would give some control over sensors and such.) This is obvious even from that HARD/SOFT I2C exclusivness -- bit-banging I2C interface is ortogonal to a built-in hardware one so why wouldn't we were able to use both? One can even have several bit-banging busses as long as GPIO pins are available... There are 2 different ways to address this issue -- make another platform specific monster or rework the entire I2C subsystem to make that multibus support generic and common U-Bootwide. This is an attempt to make I2C uniform and scalable. Here is a little manifest... First of all, there is a basic entity, I2C bus. It can be a simple I2C bus from the only I2C adapter on a SoC, several busses from several adapters, both on-SoC and external, and several busses growing off of several adapters via I2C multiplexers/switches (e.g. PCA9544 etc.) They are all the same for the rest of code accessed with single set of i2c_read()/i2c_write() and friends for all busses no matter what adapter they are on and if they are directly connected to an adapter or reached through a set of I2C mux chips. Any I2C operation is performed on the CURRENT bus. Current bus is set with i2c_set_bus_num(). In case of directly connected busses it merely changes a global variable that is used as an index into an array. If some busses are connected via I2C muxes, it disconnects the previously connected muxes if any and sets all chips along the path to the new bus so next access will go to that bus. All those paths are statically allocated at compile time according to board's config file. That means we can use I2C from flash before U-Boot is relocated to DRAM thus allowing us to use SPD for DRAM initialization. It is also means we do NOT need that "i2c bus" or whatever command to setup a bus behind muxes for consecutive access--we just choose that bus number and that's it. All busses are explicitely defined in boards' config files so we know exactly where all accesses are going. I did test it on MPC8548CDS system and it works OK. There is a patch for MPC8548CDS.h in the patchset that changes it to the new I2C code and a speculative example of multiadapter multibus configuration with 3 adapters and 5 busses 3 of which are connected with I2C muxes, 2 from them are multihop. Please let me know guys what you think so I would be able to start with a big patch. --- ** * k...@homeKOI8 Net < > The impossible we do immediately. * * Las Vegas NV, USA < > Miracles require 24-hour notice. * ** ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-mpc83xx
Dear Kim Phillips, In message <20090123181051.dc935d8f.kim.phill...@freescale.com> you wrote: > WD, > > u-boot-mpc83xx added support for two new boards - the keymile1 and the > SIMPC8313 - plus PCI-E support and mostly nand-related fixes. Please > pull: > > The following changes since commit 6dadc9195ad642cc662632f4d92f92d3d71e8bf2: > Mike Frysinger (1): > Blackfin: use common strmhz() in system output > > are available in the git repository at: > > git://git.denx.de/u-boot-mpc83xx.git master > > Anton Vorontsov (3): > mpc83xx: Add support for MPC83xx PCI-E controllers > mpc83xx: Add PCI-E support for MPC8315ERDB boards > mpc83xx: Add PCI-E support for MPC837XEMDS boards > > Heiko Schocher (3): > powerpc: 83xx: add support for the kmeter1 board > powerpc: keymile: Add a check for the PIGGY debug board > powerpc, keymile boards: extract identical config options > > Ira Snyder (2): > 83xx: PCI agent mode fixes for multi-board systems > MPC8349EMDS: do not setup unused PCI clock outputs in PCI agent mode > > Ron Madrid (2): > mpc83xx: Size optimization of start.S > mpc83xx: New board support for SIMPC8313 > > Scott Wood (1): > 83xx: Use the proper sequence for updating IMMR. > > MAINTAINERS |5 + > MAKEALL |2 + > Makefile| 18 + > board/freescale/mpc8315erdb/mpc8315erdb.c | 52 +++ > board/freescale/mpc8349emds/pci.c |7 - > board/freescale/mpc837xemds/mpc837xemds.c |6 +- > board/freescale/mpc837xemds/pci.c | 89 +- > board/freescale/mpc837xemds/pci.h |6 + > board/keymile/common/common.c | 23 +- > board/keymile/common/common.h | 20 + > board/keymile/kmeter1/Makefile | 53 +++ > board/keymile/kmeter1/config.mk | 24 ++ > board/keymile/kmeter1/kmeter1.c | 158 > board/keymile/mgcoge/mgcoge.c | 10 +- > board/keymile/mgsuvd/mgsuvd.c |8 +- > board/sheldon/simpc8313/Makefile| 50 +++ > board/sheldon/simpc8313/config.mk | 13 + > board/sheldon/simpc8313/sdram.c | 193 ++ > board/sheldon/simpc8313/simpc8313.c | 134 +++ > cpu/mpc83xx/Makefile|1 + > cpu/mpc83xx/pci.c |5 + > cpu/mpc83xx/pcie.c | 314 +++ > cpu/mpc83xx/speed.c |4 +- > cpu/mpc83xx/start.S | 95 +++-- > doc/README.kmeter1 | 91 + > doc/README.simpc8313| 80 > include/asm-ppc/global_data.h |2 +- > include/asm-ppc/immap_83xx.h| 119 ++- > include/configs/MPC8315ERDB.h | 21 + > include/configs/MPC837XEMDS.h | 21 + > include/configs/SIMPC8313.h | 544 > +++ > include/configs/keymile-common.h| 113 ++ > include/configs/kmeter1.h | 457 ++ > include/configs/mgcoge.h| 51 +--- > include/configs/mgsuvd.h| 72 + > include/mpc83xx.h | 68 +++- > include/pci.h |4 + > nand_spl/board/sheldon/simpc8313/Makefile | 100 + > nand_spl/board/sheldon/simpc8313/u-boot.lds | 52 +++ > 39 files changed, 2883 insertions(+), 202 deletions(-) > create mode 100644 board/freescale/mpc837xemds/pci.h > create mode 100644 board/keymile/common/common.h > create mode 100644 board/keymile/kmeter1/Makefile > create mode 100644 board/keymile/kmeter1/config.mk > create mode 100644 board/keymile/kmeter1/kmeter1.c > create mode 100644 board/sheldon/simpc8313/Makefile > create mode 100644 board/sheldon/simpc8313/config.mk > create mode 100644 board/sheldon/simpc8313/sdram.c > create mode 100644 board/sheldon/simpc8313/simpc8313.c > create mode 100644 cpu/mpc83xx/pcie.c > create mode 100644 doc/README.kmeter1 > create mode 100644 doc/README.simpc8313 > create mode 100644 include/configs/SIMPC8313.h > create mode 100644 include/configs/keymile-common.h > create mode 100644 include/configs/kmeter1.h > create mode 100644 nand_spl/board/sheldon/simpc8313/Makefile > create mode 100644 nand_spl/board/sheldon/simpc8313/u-boot.lds Done, thanks. 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: w...@denx.de The most exciting phrase to hear in science, the one that heralds new discoveries, is not "Eureka!" (I found it!) but "That's funny ..."
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
Dear Kim Phillips, In message <20090123175552.3f60db0b.kim.phill...@freescale.com> you wrote: > > me neither. I know it works with gcc 4.2, just not gcc 4.1, and I > don't know what version the ELDK currently uses. I'll just take it > since it's so early in the cycle, and WD seems to be overtaking me in > 83xx patches anyway ;). I expect the issue to be fixed before the next > release though. ELDK uses: ELDK 4.0: gcc version 4.0.0 ELDK 4.1: gcc version 4.0.0 ELDK 4.2: gcc version 4.2.2 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: w...@denx.de I can't understand it. I can't even understand the people who can understand it.- Queen Juliana of the Netherlands. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH/RFC, 2/2] I2C rework -- what do you think
diff -purN u-boot.orig/drivers/i2c/fsl_uni_i2c.c
u-boot/drivers/i2c/fsl_uni_i2c.c
--- u-boot.orig/drivers/i2c/fsl_uni_i2c.c 1969-12-31 16:00:00.0
-0800
+++ u-boot/drivers/i2c/fsl_uni_i2c.c2009-01-23 16:01:48.0 -0800
@@ -0,0 +1,461 @@
+/*
+ * Copyright (c) 2009 Sergey Kubushyn
+ *
+ * Changes for multibus/multiadapter I2C support.
+ *
+ * Copyright 2006 Freescale Semiconductor, Inc.
+ *
+ * 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.
+ *
+ * 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
+
+#ifdef CONFIG_FSL_UNI_I2C
+
+#include
+#include/* Functional interface */
+
+#include
+#include/* HW definitions */
+
+#define I2C_TIMEOUT(CONFIG_SYS_HZ / 4)
+
+#define I2C_READ_BIT 1
+#define I2C_WRITE_BIT 0
+
+#define FSL_NAME(arg) "fsl_i2c@" MK_NAME(arg)
+#define MK_NAME(arg) #arg
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct fsl_i2c *i2c_dev[2] = {
+ (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C_OFFSET),
+#ifdef CONFIG_SYS_FSL_I2C2_OFFSET
+ (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_I2C2_OFFSET)
+#endif
+};
+
+/* I2C speed map for a DFSR value of 1 */
+
+/*
+ * Map I2C frequency dividers to FDR and DFSR values
+ *
+ * This structure is used to define the elements of a table that maps I2C
+ * frequency divider (I2C clock rate divided by I2C bus speed) to a value to be
+ * programmed into the Frequency Divider Ratio (FDR) and Digital Filter
+ * Sampling Rate (DFSR) registers.
+ *
+ * The actual table should be defined in the board file, and it must be called
+ * fsl_i2c_speed_map[].
+ *
+ * The last entry of the table must have a value of {-1, X}, where X is same
+ * FDR/DFSR values as the second-to-last entry. This guarantees that any
+ * search through the array will always find a match.
+ *
+ * The values of the divider must be in increasing numerical order, i.e.
+ * fsl_i2c_speed_map[x+1].divider > fsl_i2c_speed_map[x].divider.
+ *
+ * For this table, the values are based on a value of 1 for the DFSR
+ * register. See the application note AN2919 "Determining the I2C Frequency
+ * Divider Ratio for SCL"
+ *
+ * ColdFire I2C frequency dividers for FDR values are different from
+ * PowerPC. The protocol to use the I2C module is still the same.
+ * A different table is defined and are based on MCF5xxx user manual.
+ *
+ */
+static const struct {
+ unsigned short divider;
+#ifdef __PPC__
+ u8 dfsr;
+#endif
+ u8 fdr;
+} fsl_i2c_speed_map[] = {
+#ifdef __PPC__
+ {160, 1, 32}, {192, 1, 33}, {224, 1, 34}, {256, 1, 35},
+ {288, 1, 0}, {320, 1, 1}, {352, 6, 1}, {384, 1, 2}, {416, 6, 2},
+ {448, 1, 38}, {480, 1, 3}, {512, 1, 39}, {544, 11, 3}, {576, 1, 4},
+ {608, 22, 3}, {640, 1, 5}, {672, 32, 3}, {704, 11, 5}, {736, 43, 3},
+ {768, 1, 6}, {800, 54, 3}, {832, 11, 6}, {896, 1, 42}, {960, 1, 7},
+ {1024, 1, 43}, {1088, 22, 7}, {1152, 1, 8}, {1216, 43, 7}, {1280, 1, 9},
+ {1408, 22, 9}, {1536, 1, 10}, {1664, 22, 10}, {1792, 1, 46},
+ {1920, 1, 11}, {2048, 1, 47}, {2176, 43, 11}, {2304, 1, 12},
+ {2560, 1, 13}, {2816, 43, 13}, {3072, 1, 14}, {3328, 43, 14},
+ {3584, 1, 50}, {3840, 1, 15}, {4096, 1, 51}, {4608, 1, 16},
+ {5120, 1, 17}, {6144, 1, 18}, {7168, 1, 54}, {7680, 1, 19},
+ {8192, 1, 55}, {9216, 1, 20}, {10240, 1, 21}, {12288, 1, 22},
+ {14336, 1, 58}, {15360, 1, 23}, {16384, 1, 59}, {18432, 1, 24},
+ {20480, 1, 25}, {24576, 1, 26}, {28672, 1, 62}, {30720, 1, 27},
+ {32768, 1, 63}, {36864, 1, 28}, {40960, 1, 29}, {49152, 1, 30},
+ {61440, 1, 31}, {-1, 1, 31}
+#elif defined(__M68K__)
+ {20, 32}, {22, 33}, {24, 34}, {26, 35},
+ {28, 0}, {28, 36}, {30, 1}, {32, 37},
+ {34, 2}, {36, 38}, {40, 3}, {40, 39},
+ {44, 4}, {48, 5}, {48, 40}, {56, 6},
+ {56, 41}, {64, 42}, {68, 7}, {72, 43},
+ {80, 8}, {80, 44}, {88, 9}, {96, 41},
+ {104, 10}, {112, 42}, {128, 11}, {128, 43},
+ {144, 12}, {160, 13}, {160, 48}, {192, 14},
+ {192, 49}, {224, 50}, {240, 15}, {256, 51},
+ {288, 16}, {320, 17}, {320, 52}, {384, 18},
+ {384, 53}, {448, 54}, {480, 19}, {512, 55},
+ {576, 20}, {640, 21}, {640, 56}, {768, 22},
+ {768, 57}, {960, 23}, {896, 58}, {1024, 59},
+ {1152, 24}, {1280, 25}, {1280, 60}, {1536, 26},
+ {1536, 61}, {1792, 62}, {1920, 27}, {2048, 63},
+ {2304, 28}, {
[U-Boot] [PATCH/RFC, 1/2] I2C rework -- what do you think
diff -purN u-boot.orig/common/cmd_i2c.c u-boot/common/cmd_i2c.c
--- u-boot.orig/common/cmd_i2c.c2008-11-25 16:41:07.0 -0800
+++ u-boot/common/cmd_i2c.c 2009-01-23 16:01:48.0 -0800
@@ -1,4 +1,9 @@
/*
+ * (C) Copyright 2009
+ * Sergey Kubushyn, himself, k...@koi8.net
+ *
+ * Changes for unified multibus/multiadapter I2C support.
+ *
* (C) Copyright 2001
* Gerald Van Baren, Custom IDEAS, vanba...@cideas.com.
*
@@ -106,7 +111,7 @@ static uint i2c_mm_last_alen;
* pairs. The following macros take care of this */
#if defined(CONFIG_SYS_I2C_NOPROBES)
-#if defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_SYS_NUM_I2C_BUSSES > 1
static struct
{
uchar bus;
@@ -122,19 +127,11 @@ static uchar i2c_no_probes[] = CONFIG_SY
#define COMPARE_BUS(b,i) ((b) == 0) /* Make compiler happy */
#define COMPARE_ADDR(a,i) (i2c_no_probes[(i)] == (a))
#define NO_PROBE_ADDR(i) i2c_no_probes[(i)]
-#endif /* CONFIG_MULTI_BUS */
+#endif /* CONFIG_SYS_NUM_I2C_BUSSES > 1 */
#define NUM_ELEMENTS_NOPROBE (sizeof(i2c_no_probes)/sizeof(i2c_no_probes[0]))
#endif
-#if defined(CONFIG_I2C_MUX)
-static I2C_MUX_DEVICE *i2c_mux_devices = NULL;
-static int i2c_mux_busid = CONFIG_SYS_MAX_I2C_BUS;
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#endif
-
static int
mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]);
@@ -548,10 +545,10 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrfl
*/
int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
- int j;
+ int j;
#if defined(CONFIG_SYS_I2C_NOPROBES)
- int k, skip;
- uchar bus = GET_BUS_NUM;
+ int k, skip;
+ unsigned intbus = GET_BUS_NUM;
#endif/* NOPROBES */
puts ("Valid chip addresses:");
@@ -1189,59 +1186,79 @@ int do_sdram (cmd_tbl_t * cmdtp, int fla
#if defined(CONFIG_I2C_CMD_TREE)
int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
- i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+ i2c_init (ADAP(i2c_get_bus_num())->speed,
ADAP(i2c_get_bus_num())->slaveaddr);
return 0;
}
-#if defined(CONFIG_I2C_MUX)
-int do_i2c_add_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_i2c_show_bus(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
- int ret=0;
+ int i;
+#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+ int j;
+#endif
if (argc == 1) {
/* show all busses */
- I2C_MUX *mux;
- I2C_MUX_DEVICE *device = i2c_mux_devices;
-
- printf ("Busses reached over muxes:\n");
- while (device != NULL) {
- printf ("Bus ID: %x\n", device->busid);
- printf (" reached over Mux(es):\n");
- mux = device->mux;
- while (mux != NULL) {
- printf ("%...@%x ch: %x\n", mux->name,
mux->chip, mux->channel);
- mux = mux->next;
+ for (i = 0; i < CONFIG_SYS_NUM_I2C_BUSSES; i++) {
+ printf("Bus %d:\t%s", i, ADAP(i)->name);
+#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+ for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
+ if (i2c_bus[i].next_hop[j].chip == 0) break;
+ printf("->%...@0x%2x:%d",
+ i2c_bus[i].next_hop[j].mux.name,
+ i2c_bus[i].next_hop[j].chip,
+ i2c_bus[i].next_hop[j].channel);
}
- device = device->next;
+#endif
+ printf("\n");
}
- } else {
- I2C_MUX_DEVICE *dev;
- dev = i2c_mux_ident_muxstring ((uchar *)argv[1]);
- ret = 0;
+ } else {
+ /* show specific bus */
+ i = simple_strtoul(argv[1], NULL, 10);
+ if (i >= CONFIG_SYS_NUM_I2C_BUSSES) {
+ printf("Invalid bus %d\n", i);
+ return(-1);
+ }
+ printf("Bus %d:\t%s", i, ADAP(i)->name);
+#ifndef CONFIG_SYS_I2C_DIRECT_BUS
+ for (j = 0; j < CONFIG_SYS_I2C_MAX_HOPS; j++) {
+ if (i2c_bus[i].next_hop[j].chip == 0) break;
+ printf("->%...@0x%2x:%d",
+ i2c_bus[i].next_hop[j].mux.name,
+ i2c_bus[i].next_hop[j].chip,
+ i2c_bus[i].next_hop[j].channel);
+ }
+#endif
+ printf("\n");
}
- return ret;
+
+ return(0);
}
-#endif /* CONFIG_I2C_MUX */
-#if defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_SYS_NUM_I2C_BUSSES > 1
int do_i2c_bus_num(cmd_tbl_t * cmdtp, int f
Re: [U-Boot] Pull request u-boot-blackfin.git
Dear Mike Frysinger, In message <200901231828.04120.vap...@gentoo.org> you wrote: > > > If you are trying to help, there are other, better ways: > > > > - You can post Acked-by: or even better Tested-by: messages > > (now *that* would be really helpful!) > > > > - You can apply such patches to a *separate branch* in your repo (or > > somewhere else), and then post a summary Acked-by: or Tested-by: > > message > > i dont see how those are relevant here seeing as how they all have my Signed- > off-by tag ... that implies both my ack and test. > > i figured pinging every non-Blackfin-specific patch by me would be more time > consuming than a simple pull request for you. would it be ok if i used a > different branch then and indicated in the summary along those lines ? Yes, that would be helpful - that is exactly what I suggested above. Thanks. 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: w...@denx.de Crash programs fail because they are based on the theory that, with nine women pregnant, you can get a baby a month. - Wernher von Braun ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] easylogo: add optional gzip support
Dear Mike Frysinger, In message <1230624938-17360-1-git-send-email-vap...@gentoo.org> you wrote: > Some images can be quite large, so add an option to compress the image data > with gzip in the U-Boot image. Then at runtime, the board can decompress it > with the normal zlib functions. > > Signed-off-by: Mike Frysinger > --- > v4 > - redo error handling > > v3 > - fix copyright > - free buffers on error > > v2 > - add error checking > > tools/easylogo/easylogo.c | 98 > ++--- > 1 files changed, 92 insertions(+), 6 deletions(-) Applied, thanks. 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: w...@denx.de Ordnung ist die Lust der Vernunft, aber Unordnung die Wonne der Phantasie - Paul Claudel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] uboot pci enumeration
Hello everybody, Really quick and hopefully easy question: Does uboot do PCI enumeration in common code or is this task left to the individual board specific code and setup tasks.? Thanks a lot in advance!! - Vinay ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] fat: fix unaligned errors
Dear Mike Frysinger, In message <1230947265-19412-1-git-send-email-vap...@gentoo.org> you wrote: > From: Bryan Wu > > A couple of buffers in the fat code are declared as an array of bytes. But > it is then cast up to a structure with 16bit and 32bit members. Since GCC > assumes structure alignment here, we have to force the buffers to be > aligned according to the structure usage. > > Signed-off-by: Bryan Wu > Signed-off-by: Mike Frysinger > --- > v1 > - use alignof() rather than sizeof() > > fs/fat/fat.c |8 +--- > 1 files changed, 5 insertions(+), 3 deletions(-) Applied, thanks. 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: w...@denx.de "There is such a fine line between genius and stupidity." - David St. Hubbins, "Spinal Tap" ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] net: Sort Makefile labels
Dear mon...@monstr.eu, In message you wrote: > From: Michal Simek > > > Signed-off-by: Michal Simek > --- > drivers/net/Makefile |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Sorry, this doesn't apply either: Applying: part_efi: Fix partition size calculation due to inclusive ending LBA. error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Using index info to reconstruct a base tree... error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001. Please rebase and repost. Thanks. 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: w...@denx.de There are two ways to write error-free programs. Only the third one works. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] net: Sort Makefile labels
Dear mon...@monstr.eu, In message you wrote: ... > > COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o > +COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o > COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o I have to admit that I rather sort this by the name of the CONFIG_ variable. Seeing "P" here between two "D"s looks strange to me. Please don't do this. > COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o > COBJS-$(CONFIG_XILINX_EMAC) += xilinx_emac.o > COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o > -COBJS-$(CONFIG_SH_ETHER) += sh_eth.o Of course this is still wrong, like some others. 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: w...@denx.de "There are three principal ways to lose money: wine, women, and en- gineers. While the first two are more pleasant, the third is by far the more certain." -- Baron Rothschild, ca. 1800 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spi flash: fix crash due to spi flash miscommunication
Dear Mike Frysinger,
In message <1230867947-17100-1-git-send-email-vap...@gentoo.org> you wrote:
> From: Brad Bozarth
>
> Higher spi flash layers expect to be given back a pointer that was
> malloced so that it can free the result, but the lower layers return a
> pointer that is in the middle of the malloced memory. Reorder the members
> of the lower spi structures so that things work out.
>
> Signed-off-by: Brad Bozarth
> Signed-off-by: Mike Frysinger
> CC: Haavard Skinnemoen
> ---
> Jason McMullan: your winbond driver will need a similar change:
> drivers/mtd/spi/winbond.c
> +/* spi_flash needs to be first so upper layers can free() it */
>struct winbond_spi_flash {
> - const struct winbond_spi_flash_params *params;
> struct spi_flash flash;
> + const struct winbond_spi_flash_params *params;
>};
>
> drivers/mtd/spi/atmel.c |3 ++-
> drivers/mtd/spi/stmicro.c |3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
Applied, thanks.
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: w...@denx.de
It is dangerous to be sincere unless you are also stupid.
- George Bernard Shaw
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] env_nand malloc not released
Dear Derek Ou, In message <4963ab14.9010...@siconix.com> you wrote: > > In the common/env_nand.c, function env_relocate_spec (for > CONFIG_ENV_OFFSET_REDUND) malloc two memory areas in line 296 and 297. > If it hits line 308 when both environment areas not found, it will > return without freeing the two memory areas. Is this a bug or I am > missing something? Can you please submit a patch? 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: w...@denx.de Little known fact about Middle Earth: The Hobbits had a very sophi- sticated computer network! It was a Tolkien Ring... ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] nand sector size is zero in jffs2 cmds
Dear Derek Ou,
In message <49515bd6.9030...@siconix.com> you wrote:
> The "### ERROR ### Please RESET the board ###" error and the zero NAND
> sector size problem can be fixed by the following patch. However, the
> jffs2 scanning routine does not skip the bad blocks in NAND though.
>
> Derek
> * patch **
> index 7866c80..f6966f3 100644
> --- a/common/cmd_jffs2.c
> +++ b/common/cmd_jffs2.c
> @@ -1853,6 +1853,8 @@ int mtdparts_init(void)
> if (part->size == SIZE_REMAINING)
> part->size = id->size - part->offset;
>
> + part->sector_size = nand_info[id->num].erasesize;
> +
> DEBUGF("part : name = %s, size = 0x%08lx, offset =
> 0x%08lx\n",
> part->name, part->size, part->offset);
Can you please submit a proper patch (after fixing your mailer
configuration which wraps long lines, thus corrupting the patch)?
See http://www.denx.de/wiki/U-Boot/Patches for instructions.
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: w...@denx.de
Perl itself is usually pretty good about telling you what you
shouldn't do. :-) - Larry Wall in <11...@jpl-devvax.jpl.nasa.gov>
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] FPU POST: fix warnings when building with 2.18 binutils
Dear Yuri Tikhonov, In message <200812201454.21852@emcraft.com> you wrote: > > When compile u-boot with the 2.18 binutils the following > warning messages for each object file in post/lib_ppc/fpu/ is > produced at the linking stage: > > post/libpost.a(acc1.o) uses hard float, u-boot uses soft-float > ... > > This is because of the fact that, in general, the soft-float and > hard-float ABIs are incompatible; the 2.18 binutils do checking > of the Tag_GNU_Power_ABI_FP attribute of the files to be linked, and > produce the worning like above if these are not compatible. > > The incompatibility of ABIs is concerned only the float values: > e.g. the soft-float ABI assumes the float argument passing in the > pair of rX registers, and the hard-float ABI assumes passing of > the float argument in the fX register. When we don't pass the float > arguments between the functions compiled with different floatness, > then such an application will work correctly. > This is the case for the FPU POST: u-boot (compiled with soft-float) > doesn't pass to (and doesn't get from) the FPU POST functions any > floats; there are no functions exported from the post/lib_ppc/fpu/ > objects which would work with float parameters/returns too. So, we > can reassure the linker not to worry about the difference in ABI > attributes of linking files just by setting the 'soft-float' > attribute for the objects in post/lib_ppc/fpu. And this patch does > this. > > Also, to avoid passing both soft- and hard-float options in CFLAGS > when compiling the files from post/lib_ppc/fpu (which is OK, but > looks rather dirty) this patch removes the soft-float string from > CFLAGS in post/lib_ppc/fpu/Makefile. > > Signed-off-by: Yuri Tikhonov > --- > include/post.h| 13 + > post/lib_ppc/fpu/20001122-1.c |2 ++ > post/lib_ppc/fpu/20010114-2.c |2 ++ > post/lib_ppc/fpu/20010226-1.c |2 ++ > post/lib_ppc/fpu/980619-1.c |2 ++ > post/lib_ppc/fpu/Makefile |1 + > post/lib_ppc/fpu/acc1.c |2 ++ > post/lib_ppc/fpu/compare-fp-1.c |2 ++ > post/lib_ppc/fpu/fpu.c|2 ++ > post/lib_ppc/fpu/mul-subnormal-single-1.c |2 ++ > 10 files changed, 30 insertions(+), 0 deletions(-) Applied, thanks. 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: w...@denx.de It is much easier to suggest solutions when you know nothing ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v6 2/3] Add support for Maxim's DS4510 I2C device
Dear Peter Tyser, In message <66c064c1d9cdb0c59faa039f15ad175bfc50d254.1229551661.git.pty...@xes-inc.com> you wrote: > Initial support for the DS4510, a CPU supervisor with > integrated EEPROM, SRAM, and 4 programmable non-volatile > GPIO pins. The CONFIG_DS4510 define enables support > for the device while the CONFIG_CMD_DS4510 define > enables the ds4510 command. The additional > CONFIG_DS4510_INFO, CONFIG_DS4510_MEM, and > CONFIG_DS4510_RST defines add additional sub-commands > to the ds4510 command when defined. > > Signed-off-by: Peter Tyser > --- > README|4 + > drivers/misc/Makefile |1 + > drivers/misc/ds4510.c | 424 > + > include/ds4510.h | 75 + > 4 files changed, 504 insertions(+), 0 deletions(-) > create mode 100644 drivers/misc/ds4510.c > create mode 100644 include/ds4510.h Applied, thanks. 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: w...@denx.de The only person who always got his work done by Friday was Robinson Crusoe. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] common: Iteration limit for memory test.
Dear Dirk Eibach, In message <1229435516-6390-1-git-send-email-eib...@gdsys.de> you wrote: > The iteration limit is passed to mtest as a fourth parameter: > [start [end [pattern [iterations > If no fourth parameter is supplied, there is no iteration limit and the > test will loop forever. > > Signed-off-by: Dirk Eibach > --- > > - removed whitespace messup > - removed all cleanup that does not belong here > > common/cmd_mem.c | 45 +++-- > 1 files changed, 31 insertions(+), 14 deletions(-) Applied, thanks. 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: w...@denx.de The joys of love made her human and the agonies of love destroyed her. -- Spock, "Requiem for Methuselah", stardate 5842.8 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] serial: Rename driver vcth to vct to support other board variants
Dear Stefan Roese,
In message <1229352012-28442-1-git-send-email...@denx.de> you wrote:
> Moved driver vcth.c to vct.c to better reflect the VCT board series.
> This driver is now used by the VCT platforms:
>
> vct_premium
> vct_platinum
> vct_platinumsvc
>
> Signed-off-by: Stefan Roese
> ---
> drivers/serial/Makefile |2 +-
> drivers/serial/{vcth.c => vct.c} |8 ++--
> 2 files changed, 7 insertions(+), 3 deletions(-)
> rename drivers/serial/{vcth.c => vct.c} (94%)
Applied, thanks.
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: w...@denx.de
For every complex problem, there is a solution that is simple, neat,
and wrong. -- H. L. Mencken
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] part_efi: Fix partition size calculation due to inclusive ending LBA.
Dear Richard Retanubun, In message <494286ed.2070...@ruggedcom.com> you wrote: > From b24eaf52ade5e5f1e94243f727d4c0f6d0fccdf5 Mon Sep 17 00:00:00 2001 > From: Richard Retanubun > Date: Fri, 12 Dec 2008 10:23:45 -0500 > Subject: [PATCH] The ending LBA is inclusive. Hence, the partition size > should be > ((ending-LBA + 1) - starting-LBA) to get the proper partition size. > > This is confirmed against the results from the parted tool. > (e.g. use parted /dev/sda -s unit S print) and observe the size. > > Signed-off-by: Richard Retanubun Sorry, this does not apply: Applying: part_efi: Fix partition size calculation due to inclusive ending LBA. error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Using index info to reconstruct a base tree... error: patch failed: disk/part_efi.c:163 error: disk/part_efi.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001. Please rebase and resubmit. 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: w...@denx.de The joys of love made her human and the agonies of love destroyed her. -- Spock, "Requiem for Methuselah", stardate 5842.8 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] nios: Move README.nios_CONFIG_SYS_NIOS_CPU to doc/ dir
Dear Shinya Kuribayashi,
In message <49413597.9000...@ruby.dti.ne.jp> you wrote:
> Signed-off-by: Shinya Kuribayashi
> ---
>
> Hi Jean,
>
> in the commit 6d0f6bcf (rename CFG_ macros to CONFIG_SYS), this README
> file was added into ${TOPDIR} dir. Was this intended?
>
> Thanks,
>
> Shinya
>
>
> README.nios_CONFIG_SYS_NIOS_CPU | 140
> ---
> doc/README.nios_CONFIG_SYS_NIOS_CPU | 140
> +++
> 2 files changed, 140 insertions(+), 140 deletions(-)
> delete mode 100644 README.nios_CONFIG_SYS_NIOS_CPU
> create mode 100644 doc/README.nios_CONFIG_SYS_NIOS_CPU
Applied, thanks.
You should have crated a rename patch, though.
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: w...@denx.de
"I didn't know it was impossible when I did it."
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] common/main: support bootdelay=0 for CONFIG_AUTOBOOT_KEYED
Dear Peter Korsgaard, In message <1228922656-27689-1-git-send-email-jac...@sunsite.dk> you wrote: > Support bootdelay=0 in abortboot for the CONFIG_AUTOBOOT_KEYED case > similar to the CONFIG_ZERO_BOOTDELAY_CHECK support for the > !CONFIG_AUTOBOOT_KEYED case. > > Do this by reversing the loop so we do atleast one iteration before > checking for timeout. > > Signed-off-by: Peter Korsgaard > --- > common/main.c | 27 ++- > 1 files changed, 14 insertions(+), 13 deletions(-) Applied, thanks. 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: w...@denx.de It became apparent that one reason why the Ice Giants were known as the Ice Giants was because they were, well, giants. The other was that they were made of ice. -Terry Pratchett, _Sourcery_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Added legacy flash ST Micro M29W040B
Dear Niklaus Giger, In message <12287534483062-git-send-email-niklaus.gi...@netstal.com> you wrote: > --- > drivers/mtd/jedec_flash.c | 14 ++ > 1 files changed, 14 insertions(+), 0 deletions(-) Applied, thanks. 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: w...@denx.de Any technology distinguishable from magic is insufficiently advanced. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Improve DDR autodetect
Dear Stefan, In message <1228750920-5032-1-git-send-email-eib...@gdsys.de> Dirk Eibach wrote: > > Added support for a second memory bank to DDR autodetection for 440 > platforms. > Made hardcoded values configurable. > > Signed-off-by: Dirk Eibach > --- > cpu/ppc4xx/sdram.c | 55 +++ > 1 files changed, 50 insertions(+), 5 deletions(-) I haven't seen any comments on this yet? 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: w...@denx.de Things that try to look like things often do look more like things than things. Well-known fact. - Terry Pratchett, _Wyrd Sisters_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fixed off-by-one errors in lib_m68k/interrupts.c
Dear Graeme Russ, In message <1228727091-25238-1-git-send-email-graeme.r...@gmail.com> you wrote: > Signed-off-by: Graeme Russ > --- > lib_m68k/interrupts.c |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Applied, thanks. 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: w...@denx.de HR Manager to job candidate "I see you've had no computer training. Although that qualifies you for upper management, it means you're under-qualified for our entry level positions." ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 10/15] Renamed SC520 configuration options
Dear Graeme Russ, In message <1228606151-10839-11-git-send-email-graeme.r...@gmail.com> you wrote: > Options are now all uniformly CONFIG_SYS_SC520_ > > Signed-off-by: Graeme Russ > --- > board/sc520_cdp/sc520_cdp.c | 16 > cpu/i386/sc520/Makefile |4 ++-- > cpu/i386/sc520/sc520.c|6 +++--- > cpu/i386/sc520/sc520_asm.S|4 ++-- > include/configs/eNET.h|6 +++--- > include/configs/sc520_cdp.h | 10 +- > include/configs/sc520_spunk.h |6 +++--- > 7 files changed, 26 insertions(+), 26 deletions(-) Here your patch series finally broke down: -> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/5146 Commit Body is: -- Renamed SC520 configuration options Options are now all uniformly CONFIG_SYS_SC520_ Signed-off-by: Graeme Russ -- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Renamed SC520 configuration options error: cpu/i386/sc520/Makefile: does not exist in index error: cpu/i386/sc520/sc520.c: does not exist in index error: cpu/i386/sc520/sc520_asm.S: does not exist in index fatal: sha1 information is lacking or useless (cpu/i386/sc520/Makefile). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. When you have resolved this problem run "git am -i -3 --resolved". If you would prefer to skip this patch, instead run "git am -i -3 --skip". To restore the original branch and stop patching run "git am -i -3 --abort". Please check the current code as is in mainline now, and repost cleaned up patches starting with the current one, i. e. [PATCH 10/15] and higher. Thanks. 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: w...@denx.de The only time the world beats a path to your door is when you are in the bathroom. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/15] Removed all references to CONFIG_SYS_RESET_GENERIC
Dear Graeme Russ, In message <1228606151-10839-10-git-send-email-graeme.r...@gmail.com> you wrote: > Generic i386 reset - #define made redundant by weak function > > Signed-off-by: Graeme Russ > --- > include/configs/eNET.h|1 - > include/configs/sc520_cdp.h |1 - > include/configs/sc520_spunk.h |1 - > 3 files changed, 0 insertions(+), 3 deletions(-) Applied, thanks. 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: w...@denx.de Brain: an apparatus with which we think we think.- Ambrose Bierce ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 08/15] Remove #ifdef CONFIG_SC520 in source code
Dear Graeme Russ, In message <1228606151-10839-9-git-send-email-graeme.r...@gmail.com> you wrote: > CONFIG_SC520 is now used for conditional compile > > Signed-off-by: Graeme Russ > --- > cpu/i386/sc520/sc520.c |4 > 1 files changed, 0 insertions(+), 4 deletions(-) Applied, thanks. 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: w...@denx.de Machines take me by surprise with great frequency. - Alan Turing ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 06/15] Moved generic (triple fault) reset code
Dear Graeme Russ, In message <1228606151-10839-7-git-send-email-graeme.r...@gmail.com> you wrote: > Moved from interrupts.c to cpu.c and made into a weak function to allow > vendor specific override > > Signed-off-by: Graeme Russ > --- > Vendor specific CPU reset (like the AMD SC520 MMCR reset) can now be > added to the vendor specific code without the need to remember to #undef > usage of the generic method and if you forget to include your custom > reset method, you will always get the default > --- > cpu/i386/cpu.c| 17 + > cpu/i386/interrupts.c | 16 > 2 files changed, 17 insertions(+), 16 deletions(-) Applied, thanks. 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: w...@denx.de "Though a program be but three lines long, someday it will have to be maintained." - The Tao of Programming ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 05/15] Moved definition of set_vector() to new header file
Dear Graeme Russ, In message <1228606151-10839-6-git-send-email-graeme.r...@gmail.com> you wrote: > Signed-off-by: Graeme Russ > --- > This allows for future tidy ups and functionality that will require > set_vector () > --- > cpu/i386/interrupts.c|3 ++- > include/asm-i386/interrupt.h | 29 + > 2 files changed, 31 insertions(+), 1 deletions(-) > create mode 100644 include/asm-i386/interrupt.h Applied, thanks. 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: w...@denx.de Computers are not intelligent. They only think they are. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 04/15] Moved sc520 specific code into new cpu/i386/sc520 folder
Dear Graeme Russ,
In message <1228606151-10839-5-git-send-email-graeme.r...@gmail.com> you wrote:
> --===0789679670==
>
> Signed-off-by: Graeme Russ
> ---
> Makefile |8 +++---
> cpu/i386/Makefile|3 +-
> cpu/i386/sc520/Makefile | 52
> ++
> cpu/i386/{ => sc520}/sc520.c |0
> cpu/i386/{ => sc520}/sc520_asm.S |0
> 5 files changed, 57 insertions(+), 6 deletions(-)
> create mode 100644 cpu/i386/sc520/Makefile
> rename cpu/i386/{ => sc520}/sc520.c (100%)
> rename cpu/i386/{ => sc520}/sc520_asm.S (100%)
Applied, thanks.
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: w...@denx.de
"'Tis true, 'tis pity, and pity 'tis 'tis true."
- Poloniouius, in Willie the Shake's _Hamlet, Prince of Darkness_
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 03/15] Updated eNET link script for reset -> resetvec section rename
Dear Jean-Christophe PLAGNIOL-VILLARD, In message <20081208063312.ga27...@game.jcrosoft.org> you wrote: > On 10:28 Sun 07 Dec , Graeme Russ wrote: > > Signed-off-by: Graeme Russ > > --- > > board/eNET/u-boot.lds |6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > This need to be done at the same time as the rename to avoid git-bisect error > as example and keep a clean history. You are right. I merged the two patches into one. 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: w...@denx.de When you say "I wrote a program that crashed Windows", people just stare at you blankly and say "Hey, I got those with the system, *for free*".- Linus Torvalds in <3itc77$...@ninurta.fer.uni-lj.si> ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 03/15] Updated eNET link script for reset -> resetvec section rename
Dear Graeme Russ, In message <1228606151-10839-4-git-send-email-graeme.r...@gmail.com> you wrote: > Signed-off-by: Graeme Russ > --- > board/eNET/u-boot.lds |6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) Applied (squashed into previous commit). 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: w...@denx.de Any sufficiently advanced bug is indistinguishable from a feature. - Rich Kulawiec ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 02/15] Renamed cpu/i386/reset.S to resetvec.S
Dear Graeme Russ, In message <1228606151-10839-3-git-send-email-graeme.r...@gmail.com> you wrote: > --===0593892280== > > Brings i386 in line with other CPUs with a reset vector and frees up reset.c > for CPU reset functions > > Signed-off-by: Graeme Russ > --- > Makefile |2 +- > board/sc520_cdp/u-boot.lds |6 +++--- > board/sc520_spunk/u-boot.lds |6 +++--- > cpu/i386/Makefile|2 +- > cpu/i386/reset.S | 37 - > cpu/i386/resetvec.S | 37 + > 6 files changed, 45 insertions(+), 45 deletions(-) > delete mode 100644 cpu/i386/reset.S > create mode 100644 cpu/i386/resetvec.S Applied, thanks. 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: w...@denx.de : 1. What is the possibility of this being added in the future? In the near future, the probability is close to zero. In the distant future, I'll be dead, and posterity can do whatever they like... :-) - lwall ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 01/15] Added initial eNET board support
Dear Graeme Russ, In message <1228606151-10839-2-git-send-email-graeme.r...@gmail.com> you wrote: > --===1515044148== > > Signed-off-by: Graeme Russ > --- > MAKEALL |1 + > Makefile |3 + > board/eNET/Makefile | 57 ++ > board/eNET/config.mk | 24 + > board/eNET/eNET.c | 167 ++ > board/eNET/eNET_start.S | 50 + > board/eNET/eNET_start16.S | 90 > board/eNET/hardware.h | 35 +++ > board/eNET/u-boot.lds | 90 > include/configs/eNET.h| 249 > + > 10 files changed, 766 insertions(+), 0 deletions(-) > create mode 100644 board/eNET/Makefile > create mode 100644 board/eNET/config.mk > create mode 100644 board/eNET/eNET.c > create mode 100644 board/eNET/eNET_start.S > create mode 100644 board/eNET/eNET_start16.S > create mode 100644 board/eNET/hardware.h > create mode 100644 board/eNET/u-boot.lds > create mode 100644 include/configs/eNET.h Applied, thanks. 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: w...@denx.de It usually takes more than three weeks to prepare a good impromptu speech. - Mark Twain ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-mpc83xx
WD, u-boot-mpc83xx added support for two new boards - the keymile1 and the SIMPC8313 - plus PCI-E support and mostly nand-related fixes. Please pull: The following changes since commit 6dadc9195ad642cc662632f4d92f92d3d71e8bf2: Mike Frysinger (1): Blackfin: use common strmhz() in system output are available in the git repository at: git://git.denx.de/u-boot-mpc83xx.git master Anton Vorontsov (3): mpc83xx: Add support for MPC83xx PCI-E controllers mpc83xx: Add PCI-E support for MPC8315ERDB boards mpc83xx: Add PCI-E support for MPC837XEMDS boards Heiko Schocher (3): powerpc: 83xx: add support for the kmeter1 board powerpc: keymile: Add a check for the PIGGY debug board powerpc, keymile boards: extract identical config options Ira Snyder (2): 83xx: PCI agent mode fixes for multi-board systems MPC8349EMDS: do not setup unused PCI clock outputs in PCI agent mode Ron Madrid (2): mpc83xx: Size optimization of start.S mpc83xx: New board support for SIMPC8313 Scott Wood (1): 83xx: Use the proper sequence for updating IMMR. MAINTAINERS |5 + MAKEALL |2 + Makefile| 18 + board/freescale/mpc8315erdb/mpc8315erdb.c | 52 +++ board/freescale/mpc8349emds/pci.c |7 - board/freescale/mpc837xemds/mpc837xemds.c |6 +- board/freescale/mpc837xemds/pci.c | 89 +- board/freescale/mpc837xemds/pci.h |6 + board/keymile/common/common.c | 23 +- board/keymile/common/common.h | 20 + board/keymile/kmeter1/Makefile | 53 +++ board/keymile/kmeter1/config.mk | 24 ++ board/keymile/kmeter1/kmeter1.c | 158 board/keymile/mgcoge/mgcoge.c | 10 +- board/keymile/mgsuvd/mgsuvd.c |8 +- board/sheldon/simpc8313/Makefile| 50 +++ board/sheldon/simpc8313/config.mk | 13 + board/sheldon/simpc8313/sdram.c | 193 ++ board/sheldon/simpc8313/simpc8313.c | 134 +++ cpu/mpc83xx/Makefile|1 + cpu/mpc83xx/pci.c |5 + cpu/mpc83xx/pcie.c | 314 +++ cpu/mpc83xx/speed.c |4 +- cpu/mpc83xx/start.S | 95 +++-- doc/README.kmeter1 | 91 + doc/README.simpc8313| 80 include/asm-ppc/global_data.h |2 +- include/asm-ppc/immap_83xx.h| 119 ++- include/configs/MPC8315ERDB.h | 21 + include/configs/MPC837XEMDS.h | 21 + include/configs/SIMPC8313.h | 544 +++ include/configs/keymile-common.h| 113 ++ include/configs/kmeter1.h | 457 ++ include/configs/mgcoge.h| 51 +--- include/configs/mgsuvd.h| 72 + include/mpc83xx.h | 68 +++- include/pci.h |4 + nand_spl/board/sheldon/simpc8313/Makefile | 100 + nand_spl/board/sheldon/simpc8313/u-boot.lds | 52 +++ 39 files changed, 2883 insertions(+), 202 deletions(-) create mode 100644 board/freescale/mpc837xemds/pci.h create mode 100644 board/keymile/common/common.h create mode 100644 board/keymile/kmeter1/Makefile create mode 100644 board/keymile/kmeter1/config.mk create mode 100644 board/keymile/kmeter1/kmeter1.c create mode 100644 board/sheldon/simpc8313/Makefile create mode 100644 board/sheldon/simpc8313/config.mk create mode 100644 board/sheldon/simpc8313/sdram.c create mode 100644 board/sheldon/simpc8313/simpc8313.c create mode 100644 cpu/mpc83xx/pcie.c create mode 100644 doc/README.kmeter1 create mode 100644 doc/README.simpc8313 create mode 100644 include/configs/SIMPC8313.h create mode 100644 include/configs/keymile-common.h create mode 100644 include/configs/kmeter1.h create mode 100644 nand_spl/board/sheldon/simpc8313/Makefile create mode 100644 nand_spl/board/sheldon/simpc8313/u-boot.lds Thanks, Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] NAND only (no NOR)
Dear Norbert van Bolhuis, In message <4934f7fc.2030...@aimvalley.nl> you wrote: > > Nowadays, do many (PowerPC) embedded devices already risk omitting > NOR flash and use a NAND device solely for booting and storing images ? > > I'm talking about systems with 10 years life-cycle (so no > MP3-players nor medical systems but somewhere in between). Here is a pretty late comment: I recently learned that there are NOR flash chips with a NAND interface. The flash chips manufacturers recommend these for devices that have to boot form NAND for one reason or another, but that require reliable operation over a long time. Go figure... 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: w...@denx.de The light at the end of the tunnel is usually a "No Exit" sign. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] MIMC200: tidy GCLK init code
Dear Mark Jackson, In message <492a99d0.9090...@mimc.co.uk> you wrote: > Change the MIMC200 startup code to use the built-in (rather than > hard-coded) funtions for setting up gclk outputs. > > We'll also move the code to the new, more-appropriate > board_postclk_init() routine. > > Signed-off-by: Mark Jackson > > --- > > board/mimc/mimc200/mimc200.c | 14 -- > 1 files changed, 8 insertions(+), 6 deletions(-) I think you will have to rebase this patch. It does not apply any more. 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: w...@denx.de The idea of male and female are universal constants. -- Kirk, "Metamorphosis", stardate 3219.8 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] Setup extra MIMC200 chip selects
Dear Mark Jackson, In message <492a8d60.3090...@mimc.co.uk> you wrote: > Added code to setup the extra Flash and FRAM chip selects > as used on the MIMC200 board. > > Signed-off-by: Mark Jackson > > --- > cpu/at32ap/cpu.c | 14 ++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/cpu/at32ap/cpu.c b/cpu/at32ap/cpu.c > index 1a13702..3902efe 100644 > --- a/cpu/at32ap/cpu.c > +++ b/cpu/at32ap/cpu.c > @@ -56,6 +56,20 @@ int cpu_init(void) > hsmc3_writel(PULSE0, 0x0b0a0906); > hsmc3_writel(SETUP0, 0x00010002); > > +#ifdef CONFIG_MIMC200 > + /* setup Data Flash chip select (NCS2) */ > + hsmc3_writel(MODE2, 0x20121003); > + hsmc3_writel(CYCLE2, 0x000a0009); > + hsmc3_writel(PULSE2, 0x0a060806); > + hsmc3_writel(SETUP2, 0x00030102); > + > + /* setup FRAM chip select (NCS3) */ > + hsmc3_writel(MODE3, 0x10120001); > + hsmc3_writel(CYCLE3, 0x001e001d); > + hsmc3_writel(PULSE3, 0x08040704); > + hsmc3_writel(SETUP3, 0x02050204); > +#endif I feel it is conceptually wrong to add board specific code to a common CPU specific file. Haavard, please comment? 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: w...@denx.de Accident: A condition in which presence of mind is good, but absence of body is better. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
On Fri, 23 Jan 2009 15:36:40 -0800 (PST) Ron Madrid wrote: > --- On Fri, 1/23/09, Ron Madrid wrote: > > > From: Ron Madrid > > Subject: Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313 > > To: "Kim Phillips" > > Cc: u-boot@lists.denx.de > > Date: Friday, January 23, 2009, 2:29 PM > > --- On Fri, 1/23/09, Kim Phillips > > wrote: > > > > > > > > > > > +ENTRY(_start) > > > > > > +ASSERT(_end <= 0xfff01000, > > "NAND > > > bootstrap > > > > > too big"); > > > > > > > > > > Ron, the above gets asserted when building > > for > > > large page > > > > > nand with a > > > > > gcc 4.1.2 based toolchain: > > > > > > > > Please forgive my ignorance, but how can I go > > about > > > fixing this? How do I > > > > determine my toolchain and how can I use the same > > one > > > you are referring to? > > > > Are there any documents that can point me in the > > right > > > direction? > > > > > > I'm just using what Fedora brought to me on my G5 > > box > > > (native > > > compiler). I still use it because it's close to > > what > > > the ELDK version > > > is (or used to be - I can't immediately tell which > > > version the ELDK is > > > using right now). Where/when did you get your > > toolchain? > > > > I am using the one that came with FC4. I'm guessing > > that I should go ahead > > an update my gcc. I'm in the middle of doing that. > > I'll get back to you > > if I discover anything and then of course I'll > > resubmit. > > I upgraded my gcc and did not see any difference in the builds. I'm not sure > where to go from here. me neither. I know it works with gcc 4.2, just not gcc 4.1, and I don't know what version the ELDK currently uses. I'll just take it since it's so early in the cycle, and WD seems to be overtaking me in 83xx patches anyway ;). I expect the issue to be fixed before the next release though. Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] ARM DaVinci: Add common peripherals andmodules enable functions.
Dear Jean-Christophe, In message <20090119095618.083e0208.h...@hugovil.com> Hugo Villeneuve you wrote: > > From: u-boot-boun...@lists.denx.de on behalf of Hugo Villeneuve > > Sent: Fri 11/21/2008 2:35 PM > > To: u-boot@lists.denx.de > > Subject: [U-Boot] [PATCH 1/1] ARM DaVinci: Add common peripherals > > andmodules enable functions. > > > > Taken all the duplicated code for enabling common modules and apply > > software workarounds from the board specific code into common > > functions. Also added comments explaining the workarounds > > (from TI errata documents) and replaced some numerical bit numbers > > with more meaningful defines. > > = > > > Signed-off-by: Hugo Villeneuve > > --- > > board/davinci/common/psc.c | 65 ++ > > + board/davinci/common/psc.h |3 ++ > > board/davinci/dvevm/dvevm.c | 35 +-- > > board/davinci/schmoogie/schmoogie.c | 37 +-- > > board/davinci/sffsdr/sffsdr.c | 31 +++-- > > board/davinci/sonata/sonata.c | 35 +-- > > 6 files changed, 101 insertions(+), 105 deletions(-) > > I sent this patch two months ago but I didn=B4t receive feedback... Please comment. 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: w...@denx.de Too many people are ready to carry the stool when the piano needs to be moved. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3] Initial support for Nomadik 8815 development
Dear Jean-Christophe PLAGNIOL-VILLARD, In message <20081120122151.ga14...@game.jcrosoft.org> you wrote: > > > From: Alessandro Rubini > > Subject: Initial support for Nomadik 8815 development board ... > applied to u-boot-arm/next Will I see a pull request for that any time soon? 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: w...@denx.de panic: can't find / ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] POWERPC 82xx: add the SCC as an HDLC controller
Dear Gary Jennejohn, In message <20081120113726.0501a...@ernst.jennejohn.org> you wrote: > > Right now this is only used by keymile. > > Signed-off-by: Gary Jennejohn > --- > include/asm-ppc/cpm_8260.h | 28 > 1 files changed, 28 insertions(+), 0 deletions(-) Applied, thanks. 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: w...@denx.de The software required `Windows 95 or better', so I installed Linux. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4 v3] powerpc: 83xx: add support for the kmeter1 board
On Sat, 24 Jan 2009 00:36:34 +0100 Wolfgang Denk wrote: > Dear Heiko Schocher, > > In message <4925268b.2020...@denx.de> you wrote: > > This patch adds support for the kmeter1 board from Keymile, > > based on a Freescale MPC8360 CPU. > > > > - serial console on UART 1 > > - 256 MB DDR2 RAM > > - 64 MB NOR Flash > > - Ethernet RMII Mode over UCC4 > > - PHY SMSC LAN8700 > > > > Signed-off-by: Heiko Schocher > > --- > > > > changes since v2: > > > > added comments from Kim Philips > > added doc/README.kmeter1 > > > > MAINTAINERS |1 + > > MAKEALL |1 + > > Makefile|3 + > > board/keymile/kmeter1/Makefile | 51 > > board/keymile/kmeter1/config.mk | 24 ++ > > board/keymile/kmeter1/kmeter1.c | 153 > > doc/README.kmeter1 | 91 +++ > > include/configs/kmeter1.h | 523 > > +++ > > 8 files changed, 847 insertions(+), 0 deletions(-) > > create mode 100644 board/keymile/kmeter1/Makefile > > create mode 100644 board/keymile/kmeter1/config.mk > > create mode 100644 board/keymile/kmeter1/kmeter1.c > > create mode 100644 doc/README.kmeter1 > > create mode 100644 include/configs/kmeter1.h > > Applied, thanks. eh? this is sitting in u-boot-mpc83xx.git next - I was going to ask you to pull soon. Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/4 v3] powerpc, keymile boards: extract identical config options
Dear Heiko Schocher, In message <492526dd.9010...@denx.de> you wrote: > This patch extracts the identical config options for the > keymile boards mgcoge, mgsuvd and kmeter1 in a new > common config file keymile-common.h. > > Signed-off-by: Heiko Schocher > --- > > changes since v2 > > just rebased > > include/configs/keymile-common.h | 113 > ++ > include/configs/kmeter1.h| 81 +-- > include/configs/mgcoge.h | 61 + > include/configs/mgsuvd.h | 81 +-- > 4 files changed, 120 insertions(+), 216 deletions(-) > create mode 100644 include/configs/keymile-common.h Applied, thanks. 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: w...@denx.de In order to succeed in any enterprise, one must be persistent and patient. Even if one has to run some risks, one must be brave and strong enough to meet and overcome vexing challenges to maintain a successful business in the long run. I cannot help saying that Americans lack this necessary challenging spirit today. - Hajime Karatsu ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/4 v4] powerpc: keymile: Add a check for the PIGGY debug board
Dear Ben Warren, In message <492bae96.1040...@gmail.com> you wrote: > Heiko Schocher wrote: > > Check the presence of the PIGGY on the keymile boards mgcoge, > > mgsuvd and kmeter1. If the PIGGY is not present, dont register > > this Ethernet device. > > > > Signed-off-by: Heiko Schocher > > > Acked-by: Ben Warren > > --- > > > > changes since v3 patch: > > - add comment from Gary Jeenejohn > >calling keymile_hdlc_enet_initialize () in board_eth_init () > > > > board/keymile/common/common.c | 23 +-- > > board/keymile/common/common.h | 20 > > board/keymile/kmeter1/Makefile |6 -- > > board/keymile/kmeter1/kmeter1.c |7 ++- > > board/keymile/mgcoge/mgcoge.c | 10 +++--- > > board/keymile/mgsuvd/mgsuvd.c |8 ++-- > > include/configs/kmeter1.h |9 + > > include/configs/mgcoge.h| 10 ++ > > include/configs/mgsuvd.h|9 + > > 9 files changed, 92 insertions(+), 10 deletions(-) > > create mode 100644 board/keymile/common/common.h Applied, thanks. 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: w...@denx.de Q: How do you tell if you're making love to a nurse, a school- teacher, or an airline stewardess? A: A nurse says: "This won't hurt a bit." A schoolteacher says: "We're going to have to do this over and over again until we get it right." An airline stewardess says: "Just hold this over your mouth and nose, and breath normally." ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4 v3] powerpc: 83xx: add support for the kmeter1 board
Dear Kim, In message <4925268b.2020...@denx.de> you wrote: > This patch adds support for the kmeter1 board from Keymile, > based on a Freescale MPC8360 CPU. > > - serial console on UART 1 > - 256 MB DDR2 RAM > - 64 MB NOR Flash > - Ethernet RMII Mode over UCC4 > - PHY SMSC LAN8700 > > Signed-off-by: Heiko Schocher Oops. I applied this by accident as I misread the MPC8360 as a MPC8260 which would have been my job. Sorry. Hope you don't mind... 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: w...@denx.de Roses are red Violets are blue Some poems rhyme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
--- On Fri, 1/23/09, Ron Madrid wrote: > From: Ron Madrid > Subject: Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313 > To: "Kim Phillips" > Cc: u-boot@lists.denx.de > Date: Friday, January 23, 2009, 2:29 PM > --- On Fri, 1/23/09, Kim Phillips > wrote: > > > > > > > > > +ENTRY(_start) > > > > > +ASSERT(_end <= 0xfff01000, > "NAND > > bootstrap > > > > too big"); > > > > > > > > Ron, the above gets asserted when building > for > > large page > > > > nand with a > > > > gcc 4.1.2 based toolchain: > > > > > > Please forgive my ignorance, but how can I go > about > > fixing this? How do I > > > determine my toolchain and how can I use the same > one > > you are referring to? > > > Are there any documents that can point me in the > right > > direction? > > > > I'm just using what Fedora brought to me on my G5 > box > > (native > > compiler). I still use it because it's close to > what > > the ELDK version > > is (or used to be - I can't immediately tell which > > version the ELDK is > > using right now). Where/when did you get your > toolchain? > > I am using the one that came with FC4. I'm guessing > that I should go ahead > an update my gcc. I'm in the middle of doing that. > I'll get back to you > if I discover anything and then of course I'll > resubmit. I upgraded my gcc and did not see any difference in the builds. I'm not sure where to go from here. Ron ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/4 v3] powerpc: 83xx: add support for the kmeter1 board
Dear Heiko Schocher, In message <4925268b.2020...@denx.de> you wrote: > This patch adds support for the kmeter1 board from Keymile, > based on a Freescale MPC8360 CPU. > > - serial console on UART 1 > - 256 MB DDR2 RAM > - 64 MB NOR Flash > - Ethernet RMII Mode over UCC4 > - PHY SMSC LAN8700 > > Signed-off-by: Heiko Schocher > --- > > changes since v2: > > added comments from Kim Philips > added doc/README.kmeter1 > > MAINTAINERS |1 + > MAKEALL |1 + > Makefile|3 + > board/keymile/kmeter1/Makefile | 51 > board/keymile/kmeter1/config.mk | 24 ++ > board/keymile/kmeter1/kmeter1.c | 153 > doc/README.kmeter1 | 91 +++ > include/configs/kmeter1.h | 523 > +++ > 8 files changed, 847 insertions(+), 0 deletions(-) > create mode 100644 board/keymile/kmeter1/Makefile > create mode 100644 board/keymile/kmeter1/config.mk > create mode 100644 board/keymile/kmeter1/kmeter1.c > create mode 100644 doc/README.kmeter1 > create mode 100644 include/configs/kmeter1.h Applied, thanks. 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: w...@denx.de News is what a chap who doesn't care much about anything wants to read. And it's only news until he's read it. After that it's dead. - Evelyn Waugh _Scoop_ (1938) bk. 1, ch. 5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-mpc85xx.git
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
Dave Liu (5):
fsl-ddr: update the bit mask for DDR3 controller
fsl-ddr: clean up the ddr code for DDR3 controller
fsl-ddr: make the self refresh idle threshold configurable
fsl-ddr: use the 1T timing as default configuration
85xx: enable the auto self refresh for wake up ARP
Haiying Wang (2):
Add README file for MPC8572DS board
Add secondary CPUs processor frequency for e500 core
Kumar Gala (10):
85xx: separate PIXIS virtual from physical address
85xx: separate FLASH BASE virtual from physical address
85xx: Convert CONFIG_SYS_{PCI*,RIO*}_MEM_BASE to _MEM_BUS for FSL boards
85xx: Convert CONFIG_SYS_PCI*_IO_BASE to _IO_BUS for FSL boards
85xx: Use CONFIG_SYS_{PCI*,RIO*}_MEM_PHYS for physical address on FSL
boards
85xx: Introduce CONFIG_SYS_PCI*_MEM_VIRT for FSL boards
85xx: Introduce CONFIG_SYS_PCI*_IO_VIRT for FSL boards
85xx: Use BR_ADDR macro for NAND chipselects
85xx: Handle eLBC difference w/36-bit physical
85xx: Add a 36-bit physical configuration for MPC8572DS
MAKEALL |1 +
Makefile|8 ++-
board/freescale/mpc8536ds/ddr.c |6 +
board/freescale/mpc8536ds/law.c |4 +-
board/freescale/mpc8536ds/mpc8536ds.c | 30 +++---
board/freescale/mpc8536ds/tlb.c |8 +-
board/freescale/mpc8540ads/ddr.c|3 +
board/freescale/mpc8540ads/law.c|2 +-
board/freescale/mpc8540ads/tlb.c|8 +-
board/freescale/mpc8541cds/tlb.c|8 +-
board/freescale/mpc8544ds/ddr.c |3 +
board/freescale/mpc8544ds/mpc8544ds.c | 34 +++---
board/freescale/mpc8544ds/tlb.c |6 +-
board/freescale/mpc8548cds/mpc8548cds.c |8 +-
board/freescale/mpc8548cds/tlb.c|6 +-
board/freescale/mpc8555cds/tlb.c|8 +-
board/freescale/mpc8560ads/ddr.c|3 +
board/freescale/mpc8560ads/law.c|2 +-
board/freescale/mpc8560ads/tlb.c|8 +-
board/freescale/mpc8568mds/law.c|2 +-
board/freescale/mpc8568mds/mpc8568mds.c |8 +-
board/freescale/mpc8568mds/tlb.c|2 +-
board/freescale/mpc8572ds/law.c |4 +-
board/freescale/mpc8572ds/mpc8572ds.c | 16 ++--
board/freescale/mpc8572ds/tlb.c | 12 +-
board/freescale/mpc8610hpcd/ddr.c |3 +
board/freescale/mpc8641hpcn/ddr.c |2 +
board/stxgp3/ddr.c |3 +
board/stxssa/ddr.c |3 +
cpu/mpc85xx/cpu.c |7 +-
cpu/mpc85xx/fdt.c | 15 +++-
cpu/mpc85xx/pci.c | 32 +--
cpu/mpc85xx/speed.c | 10 +-
cpu/mpc8xxx/ddr/ctrl_regs.c | 48 ++
cpu/mpc8xxx/ddr/options.c |2 +-
doc/README.mpc8572ds| 167 +++
include/asm-ppc/fsl_ddr_sdram.h |7 ++
include/asm-ppc/fsl_lbc.h |8 ++-
include/configs/MPC8536DS.h | 63 +++-
include/configs/MPC8540ADS.h| 13 ++-
include/configs/MPC8541CDS.h| 16 ++-
include/configs/MPC8544DS.h | 47 ++
include/configs/MPC8548CDS.h| 28 --
include/configs/MPC8555CDS.h| 16 ++-
include/configs/MPC8560ADS.h| 13 ++-
include/configs/MPC8568MDS.h| 20 +++--
include/configs/MPC8572DS.h | 98 ++
include/e500.h |6 +-
48 files changed, 595 insertions(+), 232 deletions(-)
create mode 100644 doc/README.mpc8572ds
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-blackfin.git
On Friday 23 January 2009 17:43:23 Wolfgang Denk wrote: > In message <200901231708.18378.vap...@gentoo.org> you wrote: > > > Please clean up your repo, and focus on Blackfin specific stuff in > > > the future. Thanks. > > > > they are patches by me that people have either acked or they're the > > latest and no one has responded with any problems. since you have yet to > > apply them, i figured it would be easier for you to pull rather than me > > constantly pinging the same e-mail over and over since they are not in > > any code location that is "owned" by any other tree. i'm not trying to > > "sneak" anything in. after all, it's kind of hard when it's all pretty > > damn clear what the changes are in the summary. > > If you are trying to help, there are other, better ways: > > - You can post Acked-by: or even better Tested-by: messages > (now *that* would be really helpful!) > > - You can apply such patches to a *separate branch* in your repo (or > somewhere else), and then post a summary Acked-by: or Tested-by: > message i dont see how those are relevant here seeing as how they all have my Signed- off-by tag ... that implies both my ack and test. i figured pinging every non-Blackfin-specific patch by me would be more time consuming than a simple pull request for you. would it be ok if i used a different branch then and indicated in the summary along those lines ? i.e. something like: Subject: Pull request u-boot-blackfin.git non-blackfin Message: Here are patches by me that are not Blackfin-related, but have all been posted previously without any more review. The following changes since commit 4d0b54685c5c656023b826089ef8cc0ea1c5cd9e: Haavard Skinnemoen (1): Merge branch 'fixes' are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git non-blackfin ... > But applying unrelated patches to your Blackfin repo is not helpful. > If every custodian was doing this, we would have a terrible mess very > quickly and I had no chance to understand who is doing what or what is > coming from where. > > Please use the Blackfinn repo for Blackfin specific stuff only (at > least the master branch for which you send pull requests in your > position as a custodian). np -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] Freescale NFC NAND driver
Dear John Rigby, In message <1225850561-751-1-git-send-email-jri...@freescale.com> you wrote: > v3: Fixed problem with CFG vs CONFIG_SYS in board/ads5121/ads5121.c > > v2: Reworked MPC5121 NAND driver. > Attempted to address all the problems listed by Scott Wood. > Driver is now board independent. Will still need more > work to be SOC independent. > > Driver for the NAND controller on MPC5121. I am still waiting for some pull request (including this patch and the other 512x specific updates). Could you please comment ? 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: w...@denx.de Forty two. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Added a do_div() wrapper macro, lldiv().
Dear Sergei Poselenov, In message <20081104125118.20e90702...@pollux.denx.de> you wrote: > Hello all, > Modified the previous version, as suggested by Wolfgang. > > Regards, > Sergei > > Description: > > Added a do_div() wrapper, lldiv(). The new inline function doesn't modify > the dividend and returns the result of division, so it is useful > in complex expressions, i.e. "return(a/b)" -> "return(lldiv(a,b))" > > Signed-off-by: Sergei Poselenov Applied, thanks. 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: w...@denx.de The games have always strengthened us. Death becomes a familiar pattern. We don't fear it as you do. -- Proconsul Marcus Claudius, "Bread and Circuses", stardate 4041.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 0/6] i.MX31: Add NAND support and new PDK board.
Dear Jean-Christophe, in message <1219998982-21289-1-git-send-email-lilja.mag...@gmail.com> Magnus Lilja you wrote: > > This series of patches adds support for the NAND flash controller in the > i.MX31 device and also introduces the Freescale i.MX31 PDK board. As far as I can see these patches have never been applied. Will you please have a look? Thanks. 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: w...@denx.de O Staat! Wie tief dir alle Besten fluchen! Du bist kein Ziel. Der Mensch muß weiter suchen. - Christian Morgenstern ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-blackfin.git
Dear Mike Frysinger, In message <200901231708.18378.vap...@gentoo.org> you wrote: > > > Please clean up your repo, and focus on Blackfin specific stuff in > > the future. Thanks. > > they are patches by me that people have either acked or they're the latest > and > no one has responded with any problems. since you have yet to apply them, i > figured it would be easier for you to pull rather than me constantly pinging > the same e-mail over and over since they are not in any code location that is > "owned" by any other tree. i'm not trying to "sneak" anything in. after > all, > it's kind of hard when it's all pretty damn clear what the changes are in the > summary. If you are trying to help, there are other, better ways: - You can post Acked-by: or even better Tested-by: messages (now *that* would be really helpful!) - You can apply such patches to a *separate branch* in your repo (or somewhere else), and then post a summary Acked-by: or Tested-by: message I would really appreciate such help. But applying unrelated patches to your Blackfin repo is not helpful. If every custodian was doing this, we would have a terrible mess very quickly and I had no chance to understand who is doing what or what is coming from where. Please use the Blackfinn repo for Blackfin specific stuff only (at least the master branch for which you send pull requests in your position as a custodian). Thanks. 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: w...@denx.de Our business is run on trust. We trust you will pay in advance. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
--- On Fri, 1/23/09, Kim Phillips wrote: > > > > > > > +ENTRY(_start) > > > > +ASSERT(_end <= 0xfff01000, "NAND > bootstrap > > > too big"); > > > > > > Ron, the above gets asserted when building for > large page > > > nand with a > > > gcc 4.1.2 based toolchain: > > > > Please forgive my ignorance, but how can I go about > fixing this? How do I > > determine my toolchain and how can I use the same one > you are referring to? > > Are there any documents that can point me in the right > direction? > > I'm just using what Fedora brought to me on my G5 box > (native > compiler). I still use it because it's close to what > the ELDK version > is (or used to be - I can't immediately tell which > version the ELDK is > using right now). Where/when did you get your toolchain? I am using the one that came with FC4. I'm guessing that I should go ahead an update my gcc. I'm in the middle of doing that. I'll get back to you if I discover anything and then of course I'll resubmit. > > > Also, this seems strange that they should have > different sizes when being > > built as they have always been identical sizes for my > builds. But I'll > > determine the reason for this soon. > > this is true; if it helps, I tried playing with the > LP's PAD_TO value > to no avail... Thanks for the info. Ron ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Coldfire: Compiler warnings when building M5271EVB
Tsi-Chung:
Sorry for the delay. I've posted the M5271 patches to the mailing list just now.
Also, I have a question about the compiler warning I see when building the
M5271EVB:
cpu_init.c:57:2: warning: #warning "Chip Select 0 are not initialized/used"
cpu_init.c: In function 'init_fbcs':
cpu_init.c:49: warning: unused variable 'fbcs'
The line numbers are AFTER my patches, so they may not match yours precisely.
Is the correct answer to add CONFIG_M5271 to the this #ifndef ?
- #ifndef CONFIG_M5272
+ #if !(defined CONFIG_M5272) && !(defined CONFIG_M5271)
/* Only 5272 Flexbus chipselect is different from the rest */
void init_fbcs(void)
{
I think that will remove the warnings for M5271, but I may be missing the
context here :)
what is the flexBus by the way?
Thanks for the time
- Richard Retanubun
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 07/07] Coldfire: mcfmii: Allow non-autonegotiating PHYs to use mii command.
Modified mii_init to support boards with PHYs that are not set to
autonegotiate, but still want to use u-boot's mii commands to probe
the smi bus. Such PHYs will not set the Autonegotiate-done bit.
---
drivers/net/mcfmii.c | 27 +++
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 2b733c6..4f1c0a0 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -226,7 +226,8 @@ void __mii_init(void)
volatile FEC_T *fecp;
struct eth_device *dev;
int miispd = 0, i = 0;
- u16 autoneg = 0;
+ u16 status = 0;
+ u16 linkgood = 0;
/* retrieve from register structure */
dev = eth_get_dev();
@@ -250,22 +251,32 @@ void __mii_init(void)
info->phy_addr = mii_discover_phy(dev);
-#define AUTONEGLINK(PHY_BMSR_AUTN_COMP | PHY_BMSR_LS)
while (i < MCFFEC_TOUT_LOOP) {
- autoneg = 0;
- miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &autoneg);
+ status = 0;
i++;
-
- if ((autoneg & AUTONEGLINK) == AUTONEGLINK)
+ /* Read PHY control register */
+ miiphy_read(dev->name, info->phy_addr, PHY_BMCR, &status);
+
+ /* If phy set to autonegotiate, wait for autonegotiation done,
+* if phy is not autonegotiating, just wait for link up.
+*/
+ if ((status & PHY_BMCR_AUTON) == PHY_BMCR_AUTON) {
+ linkgood = (PHY_BMSR_AUTN_COMP | PHY_BMSR_LS);
+ } else {
+ linkgood = PHY_BMSR_LS;
+ }
+ /* Read PHY status register */
+ miiphy_read(dev->name, info->phy_addr, PHY_BMSR, &status);
+ if ((status & linkgood) == linkgood)
break;
udelay(500);
}
if (i >= MCFFEC_TOUT_LOOP) {
- printf("Auto Negotiation not complete\n");
+ printf("Link UP timeout\n");
}
- /* adapt to the half/full speed settings */
+ /* adapt to the duplex and speed settings of the phy */
info->dup_spd = miiphy_duplex(dev->name, info->phy_addr) << 16;
info->dup_spd |= miiphy_speed(dev->name, info->phy_addr);
}
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 06/07] Coldfire: Applied baudrate formula of serial_init to serial_setbrg
Applied the patch for baudrate divider value truncation for serial_init to serial_setbrg as well. Signed-off-by: Richard Retanubun --- drivers/serial/mcfuart.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index e04fc29..0b53140 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -115,8 +115,9 @@ void serial_setbrg(void) volatile uart_t *uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE); u32 counter; - counter = ((gd->bus_clk / gd->baudrate)) >> 5; - counter++; + /* Setting up BaudRate */ + counter = (u32) ((gd->bus_clk / 32) + (gd->baudrate / 2)); + counter = counter / gd->baudrate; /* write to CTUR: divide counter upper byte */ uart->ubg1 = ((counter & 0xff00) >> 8); -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 05/07] Coldfire: M5271EVB: Board header update (has dependencies)
Cleanup for M5271EVB:
Added clarification on the use of CONFIG_SYS_CLOCK.
Modified to use u-boot's HUSH parser.
Cleanup on environment settings.
Dependencies:
Added the use of CONFIG_SYS_MCF_SYNCR for clock multiplier.
This depends on a patch to include/asm-m68k/m5271.h
that defines the multiplier and divider ratios.
Removed the definition of CONFIG_SYS_FECI2C.
This depends on a patch that removes the use of it in
cpu/mcf52x2/cpu_init.c
Signed-off-by: Richard Retanubun
---
This patch depends on:
Added the use of CONFIG_SYS_MCF_SYNCR for clock multiplier.
This depends on a patch to include/asm-m68k/m5271.h
that defines the multiplier and divider ratios.
Removed the definition of CONFIG_SYS_FECI2C.
This depends on a patch that removes the use of it in
cpu/mcf52x2/cpu_init.c
include/configs/M5271EVB.h | 35 +++
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 7ddeb55..b8eb156 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -82,11 +82,14 @@
#define CONFIG_CMD_MISC
#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_LOADB
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMDLINE_EDITING 1 /* enables command line history */
+#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
-# define CONFIG_NET_MULTI 1
+# define CONFIG_NET_MULTI 0
# define CONFIG_MII 1
# define CONFIG_MII_INIT 1
# define CONFIG_SYS_DISCOVER_PHY
@@ -116,7 +119,7 @@
#define CONFIG_SYS_I2C_OFFSET 0x0300
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
-#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
+#define CONFIG_BOOTDELAY 1 /* autoboot after 1 seconds */
#define CONFIG_BOOTFILE "u-boot.bin"
#ifdef CONFIG_MCFFEC
# define CONFIG_NET_RETRY_COUNT 5
@@ -128,16 +131,16 @@
# define CONFIG_OVERWRITE_ETHADDR_ONCE
#endif/* FEC_ENET */
-#define CONFIG_HOSTNAMEM5235EVB
+#define CONFIG_HOSTNAMEM5271EVB
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=1\0" \
- "u-boot=u-boot.bin\0" \
- "load=tftp ${loadaddr) ${u-boot}\0" \
+ "uboot=u-boot.bin\0"\
+ "load=tftp $loadaddr $uboot\0" \
"upd=run load; run prog\0" \
- "prog=prot off ffe0 ffe2;" \
- "era ffe0 ffe2;"\
- "cp.b ${loadaddr} 0 ${filesize};" \
+ "prog=prot off ffe0 ffe3;" \
+ "era ffe0 ffe3;"\
+ "cp.b $loadaddr ffe0 $filesize;"\
"save\0"\
""
@@ -159,7 +162,18 @@
#define CONFIG_SYS_MEMTEST_END0x38
#define CONFIG_SYS_HZ 100
+
+/* Clock configuration
+ * The external oscillator is a 25.000 MHz
+ * CONFIG_SYS_CLK for ColdFire V2 sets cpu_clk (not bus_clk)
+ * bus_clk = (cpu_clk/2) (fixed ratio)
+ *
+ * If CONFIG_SYS_CLK is changed. the CONFIG_SYS_MCF_SYNCR must be updated to
+ * match the new clock speed. Max cpu_clk is 150 MHz.
+ */
#define CONFIG_SYS_CLK1
+#define CONFIG_SYS_MCF_SYNCR (CONFIG_SYS_MCF_SYNCR_MFD_4X | \
+ CONFIG_SYS_MCF_SYNCR_RFD_DIV1)
/*
* Low Level Configuration Settings
@@ -216,7 +230,4 @@
/* Cache Configuration */
#define CONFIG_SYS_CACHELINE_SIZE 16
-/* Port configuration */
-#define CONFIG_SYS_FECI2C 0xF0
-
#endif/* _M5271EVB_H */
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-blackfin.git
On Friday 23 January 2009 17:01:13 Wolfgang Denk wrote: > Dear Mike Frysinger, > > In message <1232732395-27229-1-git-send-email-vap...@gentoo.org> you wrote: > > The following changes since commit > > 4d0b54685c5c656023b826089ef8cc0ea1c5cd9e: Haavard Skinnemoen (1): > > Merge branch 'fixes' > > > > are available in the git repository at: > > > > git://www.denx.de/git/u-boot-blackfin.git master > > > > Brad Bozarth (1): > > spi flash: fix crash due to spi flash miscommunication > > > > Bryan Wu (1): > > fat: fix unaligned errors > > > > Mike Frysinger (2): > > easylogo: add optional gzip support > > Blackfin: use common strmhz() in system output > > > > common/cmd_bdinfo.c | 10 +++-- > > drivers/mtd/spi/atmel.c |3 +- > > drivers/mtd/spi/stmicro.c |3 +- > > fs/fat/fat.c |8 ++- > > lib_blackfin/board.c |6 ++- > > tools/easylogo/easylogo.c | 98 > > ++--- 6 files changed, 111 > > insertions(+), 17 deletions(-) > > I will not pull from that tree. It contains patches that are not in > your bailiwick. > > The following patches have nothing to do with Blackfin specific code, > and you are not supposed to sneak in such stuff through your tree: > > easylogo: add optional gzip support > spi flash: fix crash due to spi flash miscommunication > fat: fix unaligned errors > > I cherry-picked the only Blackfin patch in your repo. > > Please clean up your repo, and focus on Blackfin specific stuff in > the future. Thanks. they are patches by me that people have either acked or they're the latest and no one has responded with any problems. since you have yet to apply them, i figured it would be easier for you to pull rather than me constantly pinging the same e-mail over and over since they are not in any code location that is "owned" by any other tree. i'm not trying to "sneak" anything in. after all, it's kind of hard when it's all pretty damn clear what the changes are in the summary. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 04/07] Coldfire: M5271: Allow board header file to specify clock multiplier
M5271 dynamic clock multiplier. It is currently fixed at 100MHz. Allow the board header file to set their own multiplier and divider. Added the #define for the multiplier and divider to the cpu header file. Signed-off-by: Richard Retanubun --- cpu/mcf52x2/cpu_init.c |7 +- include/asm-m68k/m5271.h | 53 - 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c index 66f9164..02f37ae 100644 --- a/cpu/mcf52x2/cpu_init.c +++ b/cpu/mcf52x2/cpu_init.c @@ -181,9 +181,14 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs(); +#ifdef CONFIG_SYS_MCF_SYNCR + /* Set clockspeed according to board header file */ + mbar_writeLong(MCF_FMPLL_SYNCR, CONFIG_SYS_MCF_SYNCR); +#else /* Set clockspeed to 100MHz */ - mbar_writeShort(MCF_FMPLL_SYNCR, + mbar_writeLong(MCF_FMPLL_SYNCR, MCF_FMPLL_SYNCR_MFD(0) | MCF_FMPLL_SYNCR_RFD(0)); +#endif while (!mbar_readByte(MCF_FMPLL_SYNSR) & MCF_FMPLL_SYNSR_LOCK) ; } diff --git a/include/asm-m68k/m5271.h b/include/asm-m68k/m5271.h index 7877616..1c38b32 100644 --- a/include/asm-m68k/m5271.h +++ b/include/asm-m68k/m5271.h @@ -37,8 +37,27 @@ #define MCF_FMPLL_SYNCR 0x12 #define MCF_FMPLL_SYNSR 0x120004 + #define MCF_FMPLL_SYNCR_MFD(x)((x&0x7)<<24) +#define CONFIG_SYS_MCF_SYNCR_MFD_4X0x +#define CONFIG_SYS_MCF_SYNCR_MFD_6X0x0100 +#define CONFIG_SYS_MCF_SYNCR_MFD_8X0x0200 +#define CONFIG_SYS_MCF_SYNCR_MFD_10X 0x0300 +#define CONFIG_SYS_MCF_SYNCR_MFD_12X 0x0400 +#define CONFIG_SYS_MCF_SYNCR_MFD_14X 0x0500 +#define CONFIG_SYS_MCF_SYNCR_MFD_16X 0x0600 +#define CONFIG_SYS_MCF_SYNCR_MFD_18X 0x0700 + #define MCF_FMPLL_SYNCR_RFD(x)((x&0x7)<<19) +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV1 0x +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV2 0x0008 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV4 0x0010 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV8 0x0018 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV16 0x0020 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV32 0x0028 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV64 0x0030 +#define CONFIG_SYS_MCF_SYNCR_RFD_DIV1280x0038 + #define MCF_FMPLL_SYNSR_LOCK 0x8 #define MCF_WTM_WCR 0x14 @@ -50,17 +69,47 @@ #define MCF_RCM_RCR_FRCRSTOUT 0x40 #define MCF_RCM_RCR_SOFTRST 0x80 +#define MCF_GPIO_PODR_ADDR 0x10 +#define MCF_GPIO_PODR_DATAH0x11 +#define MCF_GPIO_PODR_DATAL0x12 +#define MCF_GPIO_PODR_BUSCTL 0x13 +#define MCF_GPIO_PODR_BS 0x14 +#define MCF_GPIO_PODR_CS 0x15 +#define MCF_GPIO_PODR_SDRAM0x16 +#define MCF_GPIO_PODR_FECI2C 0x17 +#define MCF_GPIO_PODR_UARTH0x18 +#define MCF_GPIO_PODR_UARTL0x19 +#define MCF_GPIO_PODR_QSPI 0x1A +#define MCF_GPIO_PODR_TIMER0x1B + +#define MCF_GPIO_PDDR_ADDR 0x100010 +#define MCF_GPIO_PDDR_DATAH0x100011 +#define MCF_GPIO_PDDR_DATAL0x100012 +#define MCF_GPIO_PDDR_BUSCTL 0x100013 +#define MCF_GPIO_PDDR_BS 0x100014 +#define MCF_GPIO_PDDR_CS 0x100015 +#define MCF_GPIO_PDDR_SDRAM0x100016 +#define MCF_GPIO_PDDR_FECI2C 0x100017 +#define MCF_GPIO_PDDR_UARTH0x100018 +#define MCF_GPIO_PDDR_UARTL0x100019 +#define MCF_GPIO_PDDR_QSPI 0x10001A +#define MCF_GPIO_PDDR_TIMER0x10001B + #define MCF_GPIO_PAR_AD 0x100040 +#define MCF_GPIO_PAR_BUSCTL0x100042 +#define MCF_GPIO_PAR_BS0x100044 #define MCF_GPIO_PAR_CS 0x100045 #define MCF_GPIO_PAR_SDRAM0x100046 #define MCF_GPIO_PAR_FECI2C 0x100047 #define MCF_GPIO_PAR_UART 0x100048 +#define MCF_GPIO_PAR_QSPI 0x10004A +#define MCF_GPIO_PAR_TIMER 0x10004C #define MCF_CCM_CIR 0x11000A #define MCF_CCM_CIR_PRN_MASK 0x3F #define MCF_CCM_CIR_PIN_LEN 6 -#define MCF_CCM_CIR_PIN_MCF52700x2e -#define MCF_CCM_CIR_PIN_MCF52710x80 +#define MCF_CCM_CIR_PIN_MCF52700x
[U-Boot] [PATCH 03/07] Coldfire: M5271EVB: Remove usage of CONFIG_SYS_FECI2C
Discontinue the use of CONFIG_SYS_FECI2C (only used by M5271EVB).
Use read-modify-write to activate the FEC pins without disabling I2C.
Signed-off-by: Richard Retanubun
---
cpu/mcf52x2/cpu_init.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c
index 66f9164..d88acc5 100644
--- a/cpu/mcf52x2/cpu_init.c
+++ b/cpu/mcf52x2/cpu_init.c
@@ -219,7 +219,8 @@ int fecpin_setclear(struct eth_device *dev, int setclear)
{
if (setclear) {
/* Enable Ethernet pins */
- mbar_writeByte(MCF_GPIO_PAR_FECI2C, CONFIG_SYS_FECI2C);
+ mbar_writeByte(MCF_GPIO_PAR_FECI2C,
+ (mbar_readByte(MCF_GPIO_PAR_FECI2C) | 0xF0));
} else {
}
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 02/07] Coldfire: cmd_bdinfo cleanup
CONFIG_M68K bdinfo cleanup:
Fixed compiler warning about baudrate printing.
format '%d' expects type 'int', but argument 2 has type 'long unsigned int'.
Added printing of "cpufreq"
Signed-off-by: Richard Retanubun
---
common/cmd_bdinfo.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 6675241..d12a9b1 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -283,6 +283,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
#if defined(CONFIG_SYS_MBAR)
print_num ("mbar", bd->bi_mbar_base);
#endif
+ print_str ("cpufreq", strmhz(buf, bd->bi_intfreq));
print_str ("busfreq", strmhz(buf, bd->bi_busfreq));
#ifdef CONFIG_PCI
print_str ("pcifreq", strmhz(buf, bd->bi_pcifreq));
@@ -322,7 +323,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
puts ("\nip_addr = ");
print_IPaddr (bd->bi_ip_addr);
#endif
- printf ("\nbaudrate= %d bps\n", bd->bi_baudrate);
+ printf ("\nbaudrate= %ld bps\n", bd->bi_baudrate);
return 0;
}
--
1.5.6.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request u-boot-blackfin.git
Dear Mike Frysinger, In message <1232732395-27229-1-git-send-email-vap...@gentoo.org> you wrote: > The following changes since commit 4d0b54685c5c656023b826089ef8cc0ea1c5cd9e: > Haavard Skinnemoen (1): > Merge branch 'fixes' > > are available in the git repository at: > > git://www.denx.de/git/u-boot-blackfin.git master > > Brad Bozarth (1): > spi flash: fix crash due to spi flash miscommunication > > Bryan Wu (1): > fat: fix unaligned errors > > Mike Frysinger (2): > easylogo: add optional gzip support > Blackfin: use common strmhz() in system output > > common/cmd_bdinfo.c | 10 +++-- > drivers/mtd/spi/atmel.c |3 +- > drivers/mtd/spi/stmicro.c |3 +- > fs/fat/fat.c |8 ++- > lib_blackfin/board.c |6 ++- > tools/easylogo/easylogo.c | 98 > ++--- > 6 files changed, 111 insertions(+), 17 deletions(-) I will not pull from that tree. It contains patches that are not in your bailiwick. The following patches have nothing to do with Blackfin specific code, and you are not supposed to sneak in such stuff through your tree: easylogo: add optional gzip support spi flash: fix crash due to spi flash miscommunication fat: fix unaligned errors I cherry-picked the only Blackfin patch in your repo. Please clean up your repo, and focus on Blackfin specific stuff in the future. Thanks. 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: w...@denx.de "Where shall I begin, please your Majesty?" he asked. "Begin at the beginning," the King said, gravely, "and go on till you come to the end: then stop."- Alice's Adventures in Wonderland, Lewis Carroll ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/07] Coldfire: Fix half-baud UART by adding M5271 to Coldfire v2 core list.
Added the CONFIG_M5271 to the list of Coldfire V2 processor. This was causing the bus clock (not CPU clock) to be declared twice as fast as it actually is. This causes UARTS to operate at half the specified baudrate. Signed-off-by: Richard Retanubun --- cpu/mcf52x2/speed.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cpu/mcf52x2/speed.c b/cpu/mcf52x2/speed.c index fe51fb4..c93a518 100644 --- a/cpu/mcf52x2/speed.c +++ b/cpu/mcf52x2/speed.c @@ -77,7 +77,8 @@ int get_clocks (void) #endif gd->cpu_clk = CONFIG_SYS_CLK; -#if defined(CONFIG_M5249) || defined(CONFIG_M5253) || defined(CONFIG_M5275) +#if defined(CONFIG_M5249) || defined(CONFIG_M5253) || \ +defined(CONFIG_M5271) || defined(CONFIG_M5275) gd->bus_clk = gd->cpu_clk / 2; #else gd->bus_clk = gd->cpu_clk; -- 1.5.6.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: nand flash
Dear Scott Wood, In message <20090123170833.ga12...@ld0162-tx32.am.freescale.net> you wrote: > The following changes since commit 4d0b54685c5c656023b826089ef8cc0ea1c5cd9e: > Haavard Skinnemoen (1): > Merge branch 'fixes' > > are available in the git repository at: > > git://git.denx.de/u-boot-nand-flash.git master > > Dave Liu (2): > mpc83xx: enable eLBC NAND support for MPC8315ERDB board > NAND: Fix cache and memory inconsistency issue > > Kyungmin Park (2): > Sync with 2.6.27 > Add markbad function > > Mike Frysinger (2): > NAND: move board_nand_init to nand.h > nand: fixup printf modifiers to match types used > > Nishanth Menon (1): > NAND: Enable nand lock, unlock feature > > Schlaegl Manfred jun (1): > nand read.jffs2 (nand_legacy) in common/cmd_nand.c > > Stefan Roese (4): > OneNAND: Fix compiler warnings > OneNAND: Save version_id in onenand_chip struct > OneNAND: Bad block aware read/write command support > OneNAND: Additional sync with 2.6.27 > > Wolfgang Grandegger (1): > NAND: rename NAND_MAX_CHIPS to CONFIG_SYS_NAND_MAX_CHIPS > > common/cmd_nand.c | 107 ++-- > common/cmd_onenand.c | 530 - > doc/README.nand |2 +- > drivers/mtd/nand/nand.c |2 - > drivers/mtd/nand/nand_base.c |2 +- > drivers/mtd/nand/nand_util.c | 91 ++-- > drivers/mtd/nand_legacy/nand_legacy.c |2 +- > drivers/mtd/onenand/onenand_base.c| 640 > +++-- > drivers/mtd/onenand/onenand_bbt.c |8 +- > drivers/mtd/onenand/onenand_uboot.c | 10 +- > include/configs/ASH405.h |1 - > include/configs/CATcenter.h |1 - > include/configs/CMS700.h |1 - > include/configs/DU440.h |1 - > include/configs/G2000.h |1 - > include/configs/HH405.h |1 - > include/configs/HUB405.h |1 - > include/configs/IDS8247.h |1 - > include/configs/M5329EVB.h|1 - > include/configs/M5373EVB.h|1 - > include/configs/MPC8313ERDB.h |1 - > include/configs/MPC8315ERDB.h | 11 +- > include/configs/MPC8360ERDK.h |1 - > include/configs/MPC837XEMDS.h |1 - > include/configs/MPC8536DS.h |1 - > include/configs/MPC8572DS.h |1 - > include/configs/NC650.h |1 - > include/configs/NETPHONE.h|1 - > include/configs/NETTA.h |1 - > include/configs/NETTA2.h |1 - > include/configs/NETVIA.h |1 - > include/configs/PLU405.h |1 - > include/configs/PMC440.h |1 - > include/configs/PPChameleonEVB.h |2 - > include/configs/SXNI855T.h|1 - > include/configs/TQM8272.h |1 - > include/configs/TQM85xx.h |1 - > include/configs/VCMA9.h |1 - > include/configs/VOH405.h |1 - > include/configs/WUH405.h |1 - > include/configs/acadia.h |1 - > include/configs/afeb9260.h|1 - > include/configs/alpr.h|1 - > include/configs/at91cap9adk.h |1 - > include/configs/at91rm9200dk.h|1 - > include/configs/at91sam9260ek.h |1 - > include/configs/at91sam9261ek.h |1 - > include/configs/at91sam9263ek.h |1 - > include/configs/at91sam9rlek.h|1 - > include/configs/bamboo.h |1 - > include/configs/bf537-stamp.h |1 - > include/configs/canyonlands.h |1 - > include/configs/csb637.h |1 - > include/configs/davinci_dvevm.h |1 - > include/configs/davinci_schmoogie.h |1 - > include/configs/davinci_sffsdr.h |1 - > include/configs/davinci_sonata.h |1 - > include/configs/delta.h |1 - > include/configs/kilauea.h |1 - > include/configs/netstar.h |1 - > include/configs/omap2420h4.h |1 - > include/configs/pdnb3.h |1 - > include/configs/quad100hd.h |1 - > include/configs/sbc2410x.h|1 - > include/configs/sc3.h |1 - > include/co
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
On Fri, 23 Jan 2009 13:29:03 -0800 (PST) Ron Madrid wrote: > --- On Fri, 1/23/09, Kim Phillips wrote: > > > From: Kim Phillips > > Subject: Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313 > > To: "Ron Madrid" > > Cc: u-boot@lists.denx.de > > Date: Friday, January 23, 2009, 12:36 PM > > On Thu, 22 Jan 2009 15:05:24 -0800 > > Ron Madrid wrote: > > > > > +ENTRY(_start) > > > +ASSERT(_end <= 0xfff01000, "NAND bootstrap > > too big"); > > > > Ron, the above gets asserted when building for large page > > nand with a > > gcc 4.1.2 based toolchain: > > Please forgive my ignorance, but how can I go about fixing this? How do I > determine my toolchain and how can I use the same one you are referring to? > Are there any documents that can point me in the right direction? I'm just using what Fedora brought to me on my G5 box (native compiler). I still use it because it's close to what the ELDK version is (or used to be - I can't immediately tell which version the ELDK is using right now). Where/when did you get your toolchain? > Also, this seems strange that they should have different sizes when being > built as they have always been identical sizes for my builds. But I'll > determine the reason for this soon. this is true; if it helps, I tried playing with the LP's PAD_TO value to no avail... Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Microblaze pull request
Dear Michal Simek, In message <497997b7.9030...@monstr.eu> you wrote: > > Please pull u-boot-microblaze master branch. > > The following changes since commit 72d15e705bc3983884105cb7755c7ba80e74a0a5: > Wolfgang Denk (1): > Prepare v2009.01 > > are available in the git repository at: > > git://www.denx.de/git/u-boot-microblaze.git master > > Michal Simek (5): > microblaze: Rename ml401 to microblaze-generic > microblaze: Change microblaze-generic config file > microblaze: Add bootup messages to board.c > microblaze: Add cache flush > microblaze: Use cache functions (especially cache status) Done, thanks. 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: w...@denx.de Of all the things I've lost, I miss my mind the most. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
--- On Fri, 1/23/09, Kim Phillips wrote: > From: Kim Phillips > Subject: Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313 > To: "Ron Madrid" > Cc: u-boot@lists.denx.de > Date: Friday, January 23, 2009, 12:36 PM > On Thu, 22 Jan 2009 15:05:24 -0800 > Ron Madrid wrote: > > > +ENTRY(_start) > > +ASSERT(_end <= 0xfff01000, "NAND bootstrap > too big"); > > Ron, the above gets asserted when building for large page > nand with a > gcc 4.1.2 based toolchain: Please forgive my ignorance, but how can I go about fixing this? How do I determine my toolchain and how can I use the same one you are referring to? Are there any documents that can point me in the right direction? Also, this seems strange that they should have different sizes when being built as they have always been identical sizes for my builds. But I'll determine the reason for this soon. Ron ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] pci: Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY for clarity
The PCI_REGION_MEMORY and PCI_REGION_MEM are a bit to similar and can be confusing when reading the code. Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY to clarify its used for system memory mapping purposes. Signed-off-by: Kumar Gala --- board/MAI/AmigaOneG3SE/articiaS_pci.c |2 +- board/ads5121/pci.c |2 +- board/amirix/ap1000/pci.c |2 +- board/dave/common/pci.c |2 +- board/eltec/bab7xx/pci.c |2 +- board/eltec/elppc/pci.c |2 +- board/esd/common/pci.c|2 +- board/freescale/mpc832xemds/pci.c |2 +- board/freescale/mpc8349itx/pci.c |4 ++-- board/freescale/mpc8360emds/pci.c |2 +- board/integratorap/integratorap.c |2 +- board/pcippc2/cpc710_pci.c|4 ++-- board/ppmc7xx/pci.c |2 +- board/sbc8349/pci.c |4 ++-- board/sbc8548/sbc8548.c |2 +- board/tb0229/vr4131-pci.c |2 +- board/tqc/tqm834x/pci.c |2 +- common/fdt_support.c |4 ++-- cpu/i386/sc520.c |2 +- cpu/ixp/pci.c |2 +- cpu/mcf5445x/pci.c|2 +- cpu/mcf547x_8x/pci.c |2 +- cpu/mpc5xxx/pci_mpc5200.c |2 +- cpu/mpc8220/pci.c |2 +- cpu/mpc824x/pci.c |2 +- cpu/mpc8260/pci.c |4 ++-- cpu/mpc83xx/pci.c |2 +- cpu/ppc4xx/4xx_pci.c |4 ++-- drivers/pci/fsl_pci_init.c| 10 +- drivers/pci/tsi108_pci.c |2 +- include/pci.h |2 +- 31 files changed, 41 insertions(+), 41 deletions(-) diff --git a/board/MAI/AmigaOneG3SE/articiaS_pci.c b/board/MAI/AmigaOneG3SE/articiaS_pci.c index 45b8195..371f67f 100644 --- a/board/MAI/AmigaOneG3SE/articiaS_pci.c +++ b/board/MAI/AmigaOneG3SE/articiaS_pci.c @@ -313,7 +313,7 @@ void articiaS_pci_init (void) ARTICIAS_SYS_BUS, ARTICIAS_SYS_PHYS, ARTICIAS_SYS_MAXSIZE, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); /* PCI memory space */ pci_set_region(articiaS_hose.regions + 1, diff --git a/board/ads5121/pci.c b/board/ads5121/pci.c index b747e81..806c428 100644 --- a/board/ads5121/pci.c +++ b/board/ads5121/pci.c @@ -153,7 +153,7 @@ pci_init_board(void) CONFIG_PCI_SYS_MEM_BUS, CONFIG_PCI_SYS_MEM_PHYS, gd->ram_size, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); hose->region_count = 4; diff --git a/board/amirix/ap1000/pci.c b/board/amirix/ap1000/pci.c index a9b3fd8..5fbcd37 100644 --- a/board/amirix/ap1000/pci.c +++ b/board/amirix/ap1000/pci.c @@ -294,7 +294,7 @@ void pci_init_board (void) pci_set_region (hose->regions + 0, AP1000_SYS_MEM_START, AP1000_SYS_MEM_START, AP1000_SYS_MEM_SIZE, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); /* PCI Memory space */ pci_set_region (hose->regions + 1, diff --git a/board/dave/common/pci.c b/board/dave/common/pci.c index ec0d761..ddfbea9 100644 --- a/board/dave/common/pci.c +++ b/board/dave/common/pci.c @@ -179,7 +179,7 @@ void pci_init(void) /* System memory space */ pci_set_region(hose->regions + 0, 0x, 0x, 0x0100, -PCI_REGION_MEM | PCI_REGION_MEMORY); +PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); /* PCI Memory space */ pci_set_region(hose->regions + 1, diff --git a/board/eltec/bab7xx/pci.c b/board/eltec/bab7xx/pci.c index 46e5a8b..38dd498 100644 --- a/board/eltec/bab7xx/pci.c +++ b/board/eltec/bab7xx/pci.c @@ -50,7 +50,7 @@ void pci_init_board(void) * so we need (CONFIG_SYS_PCI_MEMORY_SIZE-1) */ CONFIG_SYS_PCI_MEMORY_SIZE-1, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); /* PCI memory space */ pci_set_region(hose->regions + 1, diff --git a/board/eltec/elppc/pci.c b/board/eltec/elppc/pci.c index bf133b7..2948531 100644 --- a/board/eltec/elppc/pci.c +++ b/board/eltec/elppc/pci.c @@ -45,7 +45,7 @@ void pci_init_board(void) CONFIG_SYS_PCI_MEMORY_BUS, CONFIG_SYS_PCI_MEMORY_PHYS, CONFIG_SYS_PCI_MEMORY_SIZE, - PCI_REGION_MEM | PCI_REGION_MEMORY); + PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); /* PCI memory space */ pci_set_region(hose->regions + 1, diff --git a/board/esd/common/pci.c b/board/esd/common/pci.c index dcb764c..83f8103 100644 --- a/board/esd/common/pci.c +++ b/board/esd/commo
Re: [U-Boot] Antw: U-Boot 2009.01 Release
Dear Mark, In message <4979f037.4070...@mimc.co.uk> you wrote: > > > > What makes you think so? > > Because the link in [1] above is missing the "-" character in the first UBoot > http://www.denx.de/wiki/UBoot/UbootStat_2009_01 > versus > http://www.denx.de/wiki/U-Boot/UbootStat_2009_01 Yes, of course you are right. We discovered this just after I posted the initial message. Sorry. 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: w...@denx.de Real programmers can write assembly code in any language. :-) - Larry Wall in <8...@jpl-devvax.jpl.nasa.gov> ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Antw: U-Boot 2009.01 Release
I wrote: > > > [1] See http://www.denx.de/wiki/UBoot/UbootStat_2009_01 for full > > > statistics, and http://www.denx.de/wiki/UBoot/ReleaseCycle > > > for links to statistics for earlier releases. > > Checking: > > http://www.denx.de/wiki/U-Boot/UbootStat_2009_01 > > works. > > http://www.denx.de/wiki/U-Boot/ReleaseCycle > > works, too. > > > Your links are not correct. You were right. The '-' was missing in "U-Boot". Sorry. > > http://www.denx.de/wiki/view/U-Boot/UbootStat_2009_01 > > http://www.denx.de/wiki/view/U-Boot/ReleaseCycle The "view/" part is definitely not necessary. 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: w...@denx.de Good morning. This is the telephone company. Due to repairs, we're giving you advance notice that your service will be cut off indefi- nitely at ten o'clock. That's two minutes from now. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] 85xx: Add a 36-bit physical configuration for MPC8572DS
On Jan 23, 2009, at 2:22 PM, Kumar Gala wrote: > We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary > to allow for larger memory sizes. > > Signed-off-by: Kumar Gala > --- > MAKEALL |1 + > Makefile|8 ++- > include/configs/MPC8572DS.h | 47 ++ > - > 3 files changed, 54 insertions(+), 2 deletions(-) This requires Becky CFI and PCI patches related to address size to function properly. However there is no harm beyond that in applying this right now. - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5] mpc83xx: New board support for SIMPC8313
On Thu, 22 Jan 2009 15:05:24 -0800 Ron Madrid wrote: > +ENTRY(_start) > +ASSERT(_end <= 0xfff01000, "NAND bootstrap too big"); Ron, the above gets asserted when building for large page nand with a gcc 4.1.2 based toolchain: [...@beaut u-boot (next)]$ ./MAKEALL SIMPC8313_SP ...Small Page NAND...Configuring for SIMPC8313 board... textdata bss dec hex filename 250704 20964 28472 300140 4946c ./u-boot [...@beaut u-boot (next)]$ ./MAKEALL SIMPC8313_LP ...Large Page NAND...Configuring for SIMPC8313 board... ld: NAND bootstrap too big ld: NAND bootstrap too big make[1]: *** [/home/kim/git/u-boot/nand_spl/u-boot-spl] Error 1 make: *** [nand_spl] Error 2 make: *** Waiting for unfinished jobs size: './u-boot': No such file Kim ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/3] 85xx: Add a 36-bit physical configuration for MPC8572DS
We move all IO addressed (CCSR, localbus, PCI) above the 4G boundary
to allow for larger memory sizes.
Signed-off-by: Kumar Gala
---
MAKEALL |1 +
Makefile|8 ++-
include/configs/MPC8572DS.h | 47 ++-
3 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index 5ce3f31..ba83b7c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -372,6 +372,7 @@ LIST_85xx=" \
MPC8560ADS \
MPC8568MDS \
MPC8572DS \
+ MPC8572DS_36BIT \
PM854 \
PM856 \
sbc8540 \
diff --git a/Makefile b/Makefile
index d533564..6d5f400 100644
--- a/Makefile
+++ b/Makefile
@@ -2398,8 +2398,14 @@ MPC8555CDS_config: unconfig
MPC8568MDS_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
+MPC8572DS_36BIT_config \
MPC8572DS_config: unconfig
- @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8572ds freescale
+ @mkdir -p $(obj)include
+ @if [ "$(findstring _36BIT_,$@)" ] ; then \
+ echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
+ $(XECHO) "... enabling 36-bit physical addressing." ; \
+ fi
+ @$(MKCONFIG) -a MPC8572DS ppc mpc85xx mpc8572ds freescale
PM854_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b060d6e..39455eb 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -75,6 +75,11 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_ENABLE_36BIT_PHYS 1
+#ifdef CONFIG_PHYS_64BIT
+#define CONFIG_ADDR_MAP1
+#define CONFIG_SYS_NUM_ADDR_MAP16 /* number of TLB1
entries */
+#endif
+
#define CONFIG_SYS_MEMTEST_START 0x /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0x7fff
#define CONFIG_PANIC_HANG /* do not reset board on panic */
@@ -85,7 +90,11 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_SYS_CCSRBAR_DEFAULT 0xff70 /* CCSRBAR Default */
#define CONFIG_SYS_CCSRBAR 0xffe0 /* relocated CCSRBAR */
+#ifdef CONFIG_PHYS_64BIT
+#define CONFIG_SYS_CCSRBAR_PHYS0xfffe0ull /* physical
addr of CCSRBAR */
+#else
#define CONFIG_SYS_CCSRBAR_PHYSCONFIG_SYS_CCSRBAR /* physical
addr of CCSRBAR */
+#endif
#define CONFIG_SYS_IMMRCONFIG_SYS_CCSRBAR /* PQII uses
CONFIG_SYS_IMMR */
#define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_CCSRBAR+0x8000)
@@ -170,7 +179,11 @@ extern unsigned long get_board_ddr_clk(unsigned long
dummy);
* Local Bus Definitions
*/
#define CONFIG_SYS_FLASH_BASE 0xe000 /* start of FLASH 128M
*/
+#ifdef CONFIG_PHYS_64BIT
+#define CONFIG_SYS_FLASH_BASE_PHYS 0xfe000ull
+#else
#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE
+#endif
#define CONFIG_SYS_BR0_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_FLASH_BASE_PHYS +
0x800)) | BR_PS_16 | BR_V)
#define CONFIG_SYS_OR0_PRELIM 0xf8000ff7
@@ -178,7 +191,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define CONFIG_SYS_BR1_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) |
BR_PS_16 | BR_V)
#define CONFIG_SYS_OR1_PRELIM 0xf8000ff7
-#define CONFIG_SYS_FLASH_BANKS_LIST{CONFIG_SYS_FLASH_BASE + 0x800,
CONFIG_SYS_FLASH_BASE}
+#define CONFIG_SYS_FLASH_BANKS_LIST{CONFIG_SYS_FLASH_BASE_PHYS +
0x800, CONFIG_SYS_FLASH_BASE_PHYS}
#define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
@@ -199,7 +212,11 @@ extern unsigned long get_board_ddr_clk(unsigned long
dummy);
#define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */
#define PIXIS_BASE 0xffdf /* PIXIS registers */
+#ifdef CONFIG_PHYS_64BIT
+#define PIXIS_BASE_PHYS0xfffdfull
+#else
#define PIXIS_BASE_PHYSPIXIS_BASE
+#endif
#define CONFIG_SYS_BR3_PRELIM (BR_PHYS_ADDR(PIXIS_BASE_PHYS) | BR_PS_8 | BR_V)
#define CONFIG_SYS_OR3_PRELIM 0xeff7 /* 32KB but only 4k
mapped */
@@ -264,7 +281,11 @@ extern unsigned long get_board_ddr_clk(unsigned long
dummy);
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc
*/
#define CONFIG_SYS_NAND_BASE 0xffa0
+#ifdef CONFIG_PHYS_64BIT
+#define CONFIG_SYS_NAND_BASE_PHYS 0xfffa0ull
+#else
#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE
+#endif
#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE,\
CONFIG_SYS_NAND_BASE + 0x4, \
CONFIG_SYS_NAND_BASE + 0x8,\
@@ -384,31 +405,55 @@ extern unsigned long get_board_ddr_clk(unsigned long
dummy);
/* controller 3, direct to uli,
[U-Boot] [PATCH 2/3] 85xx: Handle eLBC difference w/36-bit physical
The eLBC only handles 32-bit physical address in systems with 36-bit physical. The previos generation of LBC handled 34-bit physical address in 36-bit systems. Added a new CONFIG option to convey the difference between the LBC and eLBC. Also added defines for XAM bits used in LBC for the extended 34-bit support. Signed-off-by: Kumar Gala --- include/asm-ppc/fsl_lbc.h |8 +++- include/configs/MPC8536DS.h |1 + include/configs/MPC8572DS.h |1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/include/asm-ppc/fsl_lbc.h b/include/asm-ppc/fsl_lbc.h index e492c62..9fa0b65 100644 --- a/include/asm-ppc/fsl_lbc.h +++ b/include/asm-ppc/fsl_lbc.h @@ -28,6 +28,8 @@ #define BR_BA 0x8000 #define BR_BA_SHIFT15 +#define BR_XBA 0x6000 +#define BR_XBA_SHIFT 13 #define BR_PS 0x1800 #define BR_PS_SHIFT11 #define BR_PS_80x0800 /* Port Size 8 bit */ @@ -70,7 +72,7 @@ #endif /* Convert an address into the right format for the BR registers */ -#ifdef CONFIG_PHYS_64BIT +#if defined(CONFIG_PHYS_64BIT) && !defined(CONFIG_FSL_ELBC) #define BR_PHYS_ADDR(x)((unsigned long)((x & 0x08000ULL) | \ ((x & 0x3ULL) >> 19))) #else @@ -90,6 +92,8 @@ #define OR_GPCM_AM 0x8000 #define OR_GPCM_AM_SHIFT 15 +#define OR_GPCM_XAM0x6000 +#define OR_GPCM_XAM_SHIFT 13 #define OR_GPCM_BCTLD 0x1000 #define OR_GPCM_BCTLD_SHIFT12 #define OR_GPCM_CSNT 0x0800 @@ -132,6 +136,8 @@ #define OR_FCM_AM 0x8000 #define OR_FCM_AM_SHIFT15 +#define OR_FCM_XAM 0x6000 +#define OR_FCM_XAM_SHIFT 13 #define OR_FCM_BCTLD 0x1000 #define OR_FCM_BCTLD_SHIFT 12 #define OR_FCM_PGS 0x0400 diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 1209a05..93b7587 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -34,6 +34,7 @@ #define CONFIG_MPC8536 1 #define CONFIG_MPC8536DS 1 +#define CONFIG_FSL_ELBC1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI11 /* Enable PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 8e4eb10..b060d6e 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -36,6 +36,7 @@ #define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_NUM_CPUS2 /* Number of CPUs in the system */ +#define CONFIG_FSL_ELBC1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ #define CONFIG_PCIE2 1 /* PCIE controler 2 (slot 2) */ -- 1.5.6.6 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/3] 85xx: Use BR_ADDR macro for NAND chipselects
Use the new BR_ADDR macro to properly setup the address field of the localbus chipselects used by NAND. This allows us to deal with 36-bit phys on these boards in the future. Signed-off-by: Kumar Gala --- include/configs/MPC8536DS.h |8 include/configs/MPC8572DS.h |8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 48a8cf2..1209a05 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -257,7 +257,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) /* NAND flash config */ -#define CONFIG_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE_PHYS \ +#define CONFIG_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2
[U-Boot] [PATCH] disable imls command if no flash is defined
Default CONFIG_CMD_IMLS must be disabled when CONFIG_SYS_NO_FLASH is defined Signed-off-by: Valeriy Glushkov --- include/config_cmd_default.h |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/config_cmd_default.h b/include/config_cmd_default.h index b556706..4ad8f36 100644 --- a/include/config_cmd_default.h +++ b/include/config_cmd_default.h @@ -25,7 +25,9 @@ #define CONFIG_CMD_FLASH /* flinfo, erase, protect */ #define CONFIG_CMD_FPGA/* FPGA configuration Support */ #define CONFIG_CMD_IMI /* iminfo */ +#ifndef CONFIG_SYS_NO_FLASH #define CONFIG_CMD_IMLS/* List all found images*/ +#endif #define CONFIG_CMD_ITEST /* Integer (and string) test*/ #define CONFIG_CMD_LOADB /* loadb*/ #define CONFIG_CMD_LOADS /* loads*/ -- 1.5.2.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 40/40] Blackfin: fixup misc warnings such as printf's and missing casts
Signed-off-by: Mike Frysinger
---
board/bf533-ezkit/flash.c |6 +++---
board/bf537-stamp/spi_flash.c |4 ++--
common/cmd_bootldr.c |4 +---
common/cmd_cplbinfo.c |4 ++--
common/cmd_otp.c |6 +++---
cpu/blackfin/traps.c | 21 +++--
lib_blackfin/boot.c |2 +-
7 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/board/bf533-ezkit/flash.c b/board/bf533-ezkit/flash.c
index 539c00d..ab808d8 100644
--- a/board/bf533-ezkit/flash.c
+++ b/board/bf533-ezkit/flash.c
@@ -127,7 +127,7 @@ void flash_print_info(flash_info_t * info)
printf("ST Microelectronics ");
break;
default:
- printf("Unknown Vendor: (0x%08X) ", info->flash_id);
+ printf("Unknown Vendor: (0x%08lX) ", info->flash_id);
break;
}
for (i = 0; i < info->sector_count; ++i) {
@@ -215,7 +215,7 @@ int write_data(long lStart, long lCount, uchar * pnData)
read_flash(ulOffset, &d);
if (d != 0x) {
printf
- ("Flash not erased at offset 0x%x Please erase to
reprogram \n",
+ ("Flash not erased at offset 0x%lx Please erase to
reprogram\n",
ulOffset);
return FLASH_FAIL;
}
@@ -234,7 +234,7 @@ int write_data(long lStart, long lCount, uchar * pnData)
read_flash(ulOffset, &d);
if (d != 0x) {
printf
- ("Flash not erased at offset 0x%x Please erase to
reprogram \n",
+ ("Flash not erased at offset 0x%lx Please erase to
reprogram\n",
ulOffset);
return FLASH_FAIL;
}
diff --git a/board/bf537-stamp/spi_flash.c b/board/bf537-stamp/spi_flash.c
index a99c3fa..99caa96 100644
--- a/board/bf537-stamp/spi_flash.c
+++ b/board/bf537-stamp/spi_flash.c
@@ -797,8 +797,8 @@ int eeprom_info(void)
ret = 1;
else
printf("SPI Device: %s 0x%02X (%s) 0x%02X 0x%02X\n"
- "Parameters: num sectors = %i, sector size = %i, write
size = %i\n"
- "Flash Size: %i mbit (%i mbyte)\n"
+ "Parameters: num sectors = %lu, sector size = %lu,
write size = %i\n"
+ "Flash Size: %lu mbit (%lu mbyte)\n"
"Status: 0x%02X\n",
flash.flash->name, flash.manufacturer_id,
flash.manufacturer->name,
flash.device_id1, flash.device_id2, flash.num_sectors,
diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c
index a969242..f8db0bc 100644
--- a/common/cmd_bootldr.c
+++ b/common/cmd_bootldr.c
@@ -64,8 +64,6 @@ static void ldr_load(uint8_t *base_addr)
/*defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)
||*/\
defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
- void *ret;
-
uint32_t addr;
uint32_t count;
uint16_t flags;
@@ -126,7 +124,7 @@ static void ldr_exec(void *addr)
#elif defined(__ADSPBF531__) || defined(__ADSPBF532__) ||
defined(__ADSPBF533__) || \
defined(__ADSPBF538__) || defined(__ADSPBF539__) ||
defined(__ADSPBF561__)
- void (*ldr_entry)(void) = bfin_read_EVT1();
+ void (*ldr_entry)(void) = (void *)bfin_read_EVT1();
ldr_entry();
#else
diff --git a/common/cmd_cplbinfo.c b/common/cmd_cplbinfo.c
index b2bbec1..eae1f53 100644
--- a/common/cmd_cplbinfo.c
+++ b/common/cmd_cplbinfo.c
@@ -26,11 +26,11 @@ static const char *cplb_page_size(uint32_t data)
*/
static void show_cplb_table(uint32_t *addr, uint32_t *data)
{
- size_t i;
+ int i;
printf(" Address Data Size Valid Locked\n");
for (i = 1; i <= 16; ++i) {
printf(" %2i 0x%p 0x%05X %s %c %c\n",
- i, *addr, *data,
+ i, (void *)*addr, *data,
cplb_page_size(*data),
(*data & CPLB_VALID ? 'Y' : 'N'),
(*data & CPLB_LOCK ? 'Y' : 'N'));
diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index ce8c63b..08d7b7e 100644
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -149,8 +149,8 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
"Writing one time programmable memory\n"
"Make sure your operating voltages and temperature are
within spec\n"
" source address: 0x%p\n"
- " OTP destination: %s page 0x%03X - %s page 0x%03X\n"
- " number to write: %ld halfpages\n"
+ " OTP destination: %s page 0x%03X - %s page 0x%03lX\n"
+ " number to write: %lu
[U-Boot] [PATCH 39/40] Blackfin: convert old boards to use COBJS-y Makefile style
Signed-off-by: Mike Frysinger --- board/bf533-ezkit/Makefile |8 board/bf533-stamp/Makefile |7 --- board/bf537-stamp/Makefile | 10 ++ board/bf537-stamp/nand.c |3 --- board/bf561-ezkit/Makefile |8 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/board/bf533-ezkit/Makefile b/board/bf533-ezkit/Makefile index 6a45b7c..1260277 100644 --- a/board/bf533-ezkit/Makefile +++ b/board/bf533-ezkit/Makefile @@ -29,11 +29,11 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a -COBJS := $(BOARD).o flash.o +COBJS-y:= $(BOARD).o flash.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) $(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) diff --git a/board/bf533-stamp/Makefile b/board/bf533-stamp/Makefile index 5b5e199..a03fe89 100644 --- a/board/bf533-stamp/Makefile +++ b/board/bf533-stamp/Makefile @@ -29,12 +29,13 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a -COBJS-y := $(BOARD).o spi_flash.o +COBJS-y:= $(BOARD).o +COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o COBJS-$(CONFIG_VIDEO) += video.o -SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) -SOBJS := $(addprefix $(obj),$(SOBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) $(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) diff --git a/board/bf537-stamp/Makefile b/board/bf537-stamp/Makefile index e5ef9af..cb38b96 100644 --- a/board/bf537-stamp/Makefile +++ b/board/bf537-stamp/Makefile @@ -29,11 +29,13 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a -COBJS := $(BOARD).o post-memory.o spi_flash.o cmd_bf537led.o nand.o +COBJS-y:= $(BOARD).o post-memory.o cmd_bf537led.o +COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o +COBJS-$(CONFIG_CMD_NAND) += nand.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) $(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c index 2866834..181e83d 100644 --- a/board/bf537-stamp/nand.c +++ b/board/bf537-stamp/nand.c @@ -23,8 +23,6 @@ #include #include -#if defined(CONFIG_CMD_NAND) - #include #define CONCAT(a,b,c,d) a ## b ## c ## d @@ -100,4 +98,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif diff --git a/board/bf561-ezkit/Makefile b/board/bf561-ezkit/Makefile index e7ee243..daebb74 100644 --- a/board/bf561-ezkit/Makefile +++ b/board/bf561-ezkit/Makefile @@ -29,11 +29,11 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(BOARD).a -COBJS := $(BOARD).o +COBJS-y:= $(BOARD).o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) +SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS-y)) $(LIB):$(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) -- 1.6.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 38/40] Blackfin: bf533-stamp: rewrite resource swap logic
The old swap function tended to clobber unrelated pins and screw up masks.
Rewrite the thing from scratch so it only uses the resources it needs.
Signed-off-by: Mike Frysinger
---
board/bf533-stamp/bf533-stamp.c | 39 +++
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/board/bf533-stamp/bf533-stamp.c b/board/bf533-stamp/bf533-stamp.c
index 1a073a6..44ebc93 100644
--- a/board/bf533-stamp/bf533-stamp.c
+++ b/board/bf533-stamp/bf533-stamp.c
@@ -54,29 +54,23 @@ phys_size_t initdram(int board_type)
return gd->bd->bi_memsize;
}
+/* PF0 and PF1 are used to switch between the ethernet and flash:
+ * PF0 PF1
+ * flash: 00
+ * ether: 10
+ */
void swap_to(int device_id)
{
-
- if (device_id == ETHERNET) {
- *pFIO_DIR = PF0;
- SSYNC();
- *pFIO_FLAG_S = PF0;
- SSYNC();
- } else if (device_id == FLASH) {
- *pFIO_DIR = (PF4 | PF3 | PF2 | PF1 | PF0);
- *pFIO_FLAG_S = (PF4 | PF3 | PF2);
- *pFIO_MASKA_D = (PF8 | PF6 | PF5);
- *pFIO_MASKB_D = (PF7);
- *pFIO_POLAR = (PF8 | PF6 | PF5);
- *pFIO_EDGE = (PF8 | PF7 | PF6 | PF5);
- *pFIO_INEN = (PF8 | PF7 | PF6 | PF5);
- *pFIO_FLAG_D = (PF4 | PF3 | PF2);
- SSYNC();
- } else {
- printf("Unknown bank to switch\n");
- }
-
- return;
+ bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF1 | PF0);
+ SSYNC();
+ bfin_write_FIO_FLAG_C(PF1);
+ if (device_id == ETHERNET)
+ bfin_write_FIO_FLAG_S(PF0);
+ else if (device_id == FLASH)
+ bfin_write_FIO_FLAG_C(PF0);
+ else
+ printf("Unknown device to switch\n");
+ SSYNC();
}
#if defined(CONFIG_MISC_INIT_R)
@@ -104,9 +98,6 @@ int misc_init_r(void)
if (cf_stat) {
printf("Booting from COMPACT flash\n");
- /* Set cycle time for CF */
- *(volatile unsigned long *)ambctl1 = CF_AMBCTL1VAL;
-
for (i = 0; i < 0x1000; i++)
asm("nop;");
for (i = 0; i < 0x1000; i++)
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 37/40] smc91111_eeprom: move board-specific init into SMC91111_EEPROM_INIT()
Rather than sticking Blackfin-specific stuff into the eeprom example, use
an indirect macro so that any board can override it with their own magic
sauce in their board config file.
Also fix some spurious semi-colons in defines while I'm at it ...
Signed-off-by: Mike Frysinger
---
examples/smc9_eeprom.c | 15 ++-
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/examples/smc9_eeprom.c b/examples/smc9_eeprom.c
index 62347c7..39e5306 100644
--- a/examples/smc9_eeprom.c
+++ b/examples/smc9_eeprom.c
@@ -33,15 +33,14 @@
#ifdef CONFIG_DRIVER_SMC9
-#ifdef pFIO0_DIR
-# define pFIO_DIRpFIO0_DIR
-# define pFIO_FLAG_S pFIO0_FLAG_S
+#ifndef SMC9_EEPROM_INIT
+# define SMC9_EEPROM_INIT()
#endif
#define SMC_BASE_ADDRESS CONFIG_SMC9_BASE
-#define EEPROM 0x1;
-#define MAC0x2;
-#defineUNKNOWN 0x4;
+#define EEPROM 0x1
+#define MAC0x2
+#define UNKNOWN0x4
void dump_reg (void);
void dump_eeprom (void);
@@ -66,9 +65,7 @@ int smc9_eeprom (int argc, char *argv[])
return (0);
}
- *pFIO_DIR = 0x01;
- *pFIO_FLAG_S = 0x01;
- SSYNC();
+ SMC9_EEPROM_INIT();
if ((SMC_inw (BANK_SELECT) & 0xFF00) != 0x3300) {
printf ("Can't find SMSC9\n");
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 36/40] Blackfin: bootldr: implement BF53x/BF56x LDR loader
The BF53x/BF56x parts do not have an on-chip ROM to boot LDRs out of
arbitrary memory locations, so implement a basic one in software.
Signed-off-by: Mike Frysinger
---
common/cmd_bootldr.c | 137 +-
1 files changed, 124 insertions(+), 13 deletions(-)
diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c
index e6474aa..a969242 100644
--- a/common/cmd_bootldr.c
+++ b/common/cmd_bootldr.c
@@ -16,6 +16,127 @@
#include
#include
+/* Simple sanity check on the specified address to make sure it contains
+ * an LDR image of some sort.
+ */
+static bool ldr_valid_signature(uint8_t *data)
+{
+#if defined(__ADSPBF561__)
+
+ /* BF56x has a 4 byte global header */
+ if (data[3] == 0xA0)
+ return true;
+
+#elif defined(__ADSPBF531__) || defined(__ADSPBF532__) ||
defined(__ADSPBF533__) || \
+ defined(__ADSPBF534__) || defined(__ADSPBF536__) ||
defined(__ADSPBF537__) || \
+ defined(__ADSPBF538__) || defined(__ADSPBF539__)
+
+ /* all the BF53x should start at this address mask */
+ uint32_t addr;
+ memmove(&addr, data, sizeof(addr));
+ if ((addr & 0xFF0FFF0F) == 0xFF00)
+ return true;
+#else
+
+ /* everything newer has a magic byte */
+ uint32_t count;
+ memmove(&count, data + 8, sizeof(count));
+ if (data[3] == 0xAD && count == 0)
+ return true;
+
+#endif
+
+ return false;
+}
+
+/* If the Blackfin is new enough, the Blackfin on-chip ROM supports loading
+ * LDRs from random memory addresses. So whenever possible, use that. In
+ * the older cases (BF53x/BF561), parse the LDR format ourselves.
+ */
+#define ZEROFILL 0x0001
+#define RESVECT 0x0002
+#define INIT 0x0008
+#define IGNORE0x0010
+#define FINAL 0x8000
+static void ldr_load(uint8_t *base_addr)
+{
+#if defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__)
|| \
+ /*defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)
||*/\
+defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
+
+ void *ret;
+
+ uint32_t addr;
+ uint32_t count;
+ uint16_t flags;
+
+ /* the bf56x has a 4 byte global header ... but it is useless to
+* us when booting an LDR from a memory address, so skip it
+*/
+# ifdef __ADSPBF561__
+ base_addr += 4;
+# endif
+
+ memmove(&flags, base_addr + 8, sizeof(flags));
+ bfin_write_EVT1(flags & RESVECT ? 0xFFA0 : 0xFFA08000);
+
+ do {
+ /* block header may not be aligned */
+ memmove(&addr, base_addr, sizeof(addr));
+ memmove(&count, base_addr+4, sizeof(count));
+ memmove(&flags, base_addr+8, sizeof(flags));
+ base_addr += sizeof(addr) + sizeof(count) + sizeof(flags);
+
+ printf("loading to 0x%08x (0x%x bytes) flags: 0x%04x\n",
+ addr, count, flags);
+
+ if (!(flags & IGNORE)) {
+ if (flags & ZEROFILL)
+ memset((void *)addr, 0x00, count);
+ else
+ memcpy((void *)addr, base_addr, count);
+
+ if (flags & INIT) {
+ void (*init)(void) = (void *)addr;
+ init();
+ }
+ }
+
+ if (!(flags & ZEROFILL))
+ base_addr += count;
+ } while (!(flags & FINAL));
+
+#endif
+}
+
+/* For BF537, we use the _BOOTROM_BOOT_DXE_FLASH funky ROM function.
+ * For all other BF53x/BF56x, we just call the entry point.
+ * For everything else (newer), we use _BOOTROM_MEMBOOT ROM function.
+ */
+static void ldr_exec(void *addr)
+{
+#if defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__)
+
+ /* restore EVT1 to reset value as this is what the bootrom uses as
+* the default entry point when booting the final block of LDRs
+*/
+ bfin_write_EVT1(L1_INST_SRAM);
+ __asm__("call (%0);" : : "a"(_BOOTROM_MEMBOOT), "q7"(addr) : "RETS",
"memory");
+
+#elif defined(__ADSPBF531__) || defined(__ADSPBF532__) ||
defined(__ADSPBF533__) || \
+ defined(__ADSPBF538__) || defined(__ADSPBF539__) ||
defined(__ADSPBF561__)
+
+ void (*ldr_entry)(void) = bfin_read_EVT1();
+ ldr_entry();
+
+#else
+
+ int32_t (*BOOTROM_MEM)(void *, int32_t, int32_t, void *) = (void
*)_BOOTROM_MEMBOOT;
+ BOOTROM_MEM(addr, 0, 0, NULL);
+
+#endif
+}
+
/*
* the bootldr command loads an address, checks to see if there
* is a Boot stream that the on-chip BOOTROM can understand,
@@ -23,11 +144,9 @@
* to also add booting from SPI, or TWI, but this function does
* not currently support that.
*/
-
int do_bootldr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
void *addr;
- uint32_t *data;
/* Get
[U-Boot] [PATCH 31/40] Blackfin: handle new anomalies with reset
Workaround fun new anomalies related to software reset of the processor.
Signed-off-by: Mike Frysinger
---
cpu/blackfin/reset.c | 20 +++-
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/cpu/blackfin/reset.c b/cpu/blackfin/reset.c
index d1e34b3..284cea5 100644
--- a/cpu/blackfin/reset.c
+++ b/cpu/blackfin/reset.c
@@ -29,26 +29,35 @@ void bfin_reset(void)
*/
__builtin_bfin_ssync();
- while (1) {
+ /* The bootrom checks to see how it was reset and will
+* automatically perform a software reset for us when
+* it starts executing after the core reset.
+*/
+ if (ANOMALY_05000353 || ANOMALY_05000386) {
/* Initiate System software reset. */
bfin_write_SWRST(0x7);
/* Due to the way reset is handled in the hardware, we need
-* to delay for 7 SCLKS. The only reliable way to do this is
-* to calculate the CCLK/SCLK ratio and multiply 7. For now,
+* to delay for 10 SCLKS. The only reliable way to do this is
+* to calculate the CCLK/SCLK ratio and multiply 10. For now,
* we'll assume worse case which is a 1:15 ratio.
*/
asm(
"LSETUP (1f, 1f) LC0 = %0\n"
"1: nop;"
:
- : "a" (15 * 7)
+ : "a" (15 * 10)
: "LC0", "LB0", "LT0"
);
/* Clear System software reset */
bfin_write_SWRST(0);
+ /* The BF526 ROM will crash during reset */
+#if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__)
+ bfin_read_SWRST();
+#endif
+
/* Wait for the SWRST write to complete. Cannot rely on SSYNC
* though as the System state is all reset now.
*/
@@ -59,10 +68,11 @@ void bfin_reset(void)
: "a" (15 * 1)
: "LC1", "LB1", "LT1"
);
+ }
+ while (1)
/* Issue core reset */
asm("raise 1");
- }
}
/* We need to trampoline ourselves up into L1 since our linker
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 35/40] Blackfin: implement real write support for OTP
Now that real documentation has been released for the OTP interface and
the on-chip ROM wrt writing/timings, implement support for reading/writing
as well as dumping/locking.
Signed-off-by: Mike Frysinger
---
common/cmd_otp.c | 157 +++--
1 files changed, 115 insertions(+), 42 deletions(-)
diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 825fa34..ce8c63b 100644
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -6,7 +6,7 @@
* Licensed under the GPL-2 or later.
*/
-/* There are 512 128-bit "pages" (0x000 to 0x1FF).
+/* There are 512 128-bit "pages" (0x000 through 0x1FF).
* The pages are accessable as 64-bit "halfpages" (an upper and lower half).
* The pages are not part of the memory map. There is an OTP controller which
* handles scanning in/out of bits. While access is done through OTP MMRs,
@@ -17,8 +17,6 @@
#include
#include
-#ifdef CONFIG_CMD_OTP
-
#include
#include
@@ -40,30 +38,87 @@ static const char *otp_strerror(uint32_t err)
#define lowup(x) ((x) % 2 ? "upper" : "lower")
-int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int check_voltage(void)
+{
+ /* Make sure voltage limits are within datasheet spec */
+ uint16_t vr_ctl = bfin_read_VR_CTL();
+
+#ifdef __ADSPBF54x__
+ /* 0.9V <= VDDINT <= 1.1V */
+ if ((vr_ctl & 0xc) && (vr_ctl & 0xc0) == 0xc0)
+ return 1;
+#else
+ /* for the parts w/out qualification yet */
+ (void)vr_ctl;
+#endif
+
+ return 0;
+}
+
+static void set_otp_timing(bool write)
{
- bool force = false;
- if (!strcmp(argv[1], "--force")) {
- force = true;
- argv[1] = argv[0];
- argv++;
- --argc;
+ static uint32_t timing;
+ if (!timing) {
+ uint32_t tp1, tp2, tp3;
+ /* OTP_TP1 = 1000 / sclk_period (in nanoseconds)
+* OTP_TP1 = 1000 / (1 / get_sclk() * 10^9)
+* OTP_TP1 = (1000 * get_sclk()) / 10^9
+* OTP_TP1 = get_sclk() / 10^6
+*/
+ tp1 = get_sclk() / 100;
+ /* OTP_TP2 = 400 / (2 * sclk_period)
+* OTP_TP2 = 400 / (2 * 1 / get_sclk() * 10^9)
+* OTP_TP2 = (400 * get_sclk()) / (2 * 10^9)
+* OTP_TP2 = (2 * get_sclk()) / 10^7
+*/
+ tp2 = (2 * get_sclk() / 1000) << 8;
+ /* OTP_TP3 = magic constant */
+ tp3 = (0x1401) << 15;
+ timing = tp1 | tp2 | tp3;
}
+ bfrom_OtpCommand(OTP_INIT, write ? timing : timing & ~(-1 << 15));
+}
+
+int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+ uint32_t ret, base_flags;
+ bool prompt_user, force_read;
uint32_t (*otp_func)(uint32_t page, uint32_t flags, uint64_t
*page_content);
- if (!strcmp(argv[1], "read"))
- otp_func = otp_read;
- else if (!strcmp(argv[1], "write"))
- otp_func = otp_write;
- else {
+
+ if (argc < 4) {
usage:
printf("Usage:\n%s\n", cmdtp->usage);
return 1;
}
+ prompt_user = false;
+ base_flags = 0;
+ if (!strcmp(argv[1], "read"))
+ otp_func = bfrom_OtpRead;
+ else if (!strcmp(argv[1], "dump")) {
+ otp_func = bfrom_OtpRead;
+ force_read = true;
+ } else if (!strcmp(argv[1], "write")) {
+ otp_func = bfrom_OtpWrite;
+ base_flags = OTP_CHECK_FOR_PREV_WRITE;
+ if (!strcmp(argv[2], "--force")) {
+ argv[2] = argv[1];
+ argv++;
+ --argc;
+ } else
+ prompt_user = false;
+ } else if (!strcmp(argv[1], "lock")) {
+ if (argc != 4)
+ goto usage;
+ otp_func = bfrom_OtpWrite;
+ base_flags = OTP_LOCK;
+ } else
+ goto usage;
+
uint64_t *addr = (uint64_t *)simple_strtoul(argv[2], NULL, 16);
uint32_t page = simple_strtoul(argv[3], NULL, 16);
- uint32_t flags, ret;
+ uint32_t flags;
size_t i, count;
ulong half;
@@ -81,8 +136,15 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
} else
half = 0;
+ /* "otp lock" has slightly different semantics */
+ if (base_flags & OTP_LOCK) {
+ count = page;
+ page = (uint32_t)addr;
+ addr = NULL;
+ }
+
/* do to the nature of OTP, make sure users are sure */
- if (!force && otp_func == otp_write) {
+ if (prompt_user) {
printf(
"Writing one time programmable memory\n"
"Make sure your operating voltages and temperature are
within spec\n"
@@ -111,30 +173,42 @@ int do_otp(
[U-Boot] [PATCH 34/40] Blackfin: update on-chip ROM API
This brings the API for the on-chip ROM in line with the toolchain and
hardware documentation.
Signed-off-by: Mike Frysinger
---
include/asm-blackfin/mach-common/bits/bootrom.h | 63 --
include/asm-blackfin/mach-common/bits/otp.h | 21
2 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/include/asm-blackfin/mach-common/bits/bootrom.h
b/include/asm-blackfin/mach-common/bits/bootrom.h
index bf661f0..fb97ff8 100644
--- a/include/asm-blackfin/mach-common/bits/bootrom.h
+++ b/include/asm-blackfin/mach-common/bits/bootrom.h
@@ -92,14 +92,6 @@
#define BOOTROM_CAPS_ADI_BOOT_STRUCTS 1
-/* Not available on initial BF54x or BF52x */
-#if (defined(__ADSPBF54x__) && __SILICON_REVISION__ < 1) || \
-(defined(__ADSPBF52x__) && __SILICON_REVISION__ < 2)
-#define BOOTROM_CAPS_SYSCONTROL 0
-#else
-#define BOOTROM_CAPS_SYSCONTROL 1
-#endif
-
#endif
#ifndef BOOTROM_FOLLOWS_C_ABI
@@ -108,9 +100,21 @@
#ifndef BOOTROM_CAPS_ADI_BOOT_STRUCTS
#define BOOTROM_CAPS_ADI_BOOT_STRUCTS 0
#endif
-#ifndef BOOTROM_CAPS_SYSCONTROL
-#define BOOTROM_CAPS_SYSCONTROL 0
-#endif
+
+/* Possible syscontrol action flags */
+#define SYSCTRL_READ0x/* read registers */
+#define SYSCTRL_WRITE 0x0001/* write registers */
+#define SYSCTRL_SYSRESET0x0002/* perform system reset */
+#define SYSCTRL_CORERESET 0x0004/* perform core reset */
+#define SYSCTRL_SOFTRESET 0x0006/* perform core and system reset */
+#define SYSCTRL_VRCTL 0x0010/* read/write VR_CTL register */
+#define SYSCTRL_EXTVOLTAGE 0x0020/* VDDINT supplied externally */
+#define SYSCTRL_INTVOLTAGE 0x/* VDDINT generated by on-chip
regulator */
+#define SYSCTRL_OTPVOLTAGE 0x0040/* For Factory Purposes Only */
+#define SYSCTRL_PLLCTL 0x0100/* read/write PLL_CTL register */
+#define SYSCTRL_PLLDIV 0x0200/* read/write PLL_DIV register */
+#define SYSCTRL_LOCKCNT 0x0400/* read/write PLL_LOCKCNT register */
+#define SYSCTRL_PLLSTAT 0x0800/* read/write PLL_STAT register */
#ifndef __ASSEMBLY__
@@ -132,25 +136,26 @@ typedef struct ADI_SYSCTRL_VALUES {
#ifndef _BOOTROM_SYSCONTROL
#define _BOOTROM_SYSCONTROL 0
#endif
-static uint32_t (* const syscontrol)(uint32_t action_flags, ADI_SYSCTRL_VALUES
*power_settings, void *reserved) = (void *)_BOOTROM_SYSCONTROL;
+static uint32_t (* const bfrom_SysControl)(uint32_t action_flags,
ADI_SYSCTRL_VALUES *power_settings, void *reserved) = (void
*)_BOOTROM_SYSCONTROL;
-#endif /* __ASSEMBLY__ */
-
-/* Possible syscontrol action flags */
-#define SYSCTRL_READ0x/* read registers */
-#define SYSCTRL_WRITE 0x0001/* write registers */
-#define SYSCTRL_SYSRESET0x0002/* perform system reset */
-#define SYSCTRL_SOFTRESET 0x0004/* perform core and system reset */
-#define SYSCTRL_VRCTL 0x0010/* read/write VR_CTL register */
-#define SYSCTRL_EXTVOLTAGE 0x0020/* VDDINT supplied externally */
-#define SYSCTRL_INTVOLTAGE 0x/* VDDINT generated by on-chip
regulator */
-#define SYSCTRL_OTPVOLTAGE 0x0040/* For Factory Purposes Only */
-#define SYSCTRL_PLLCTL 0x0100/* read/write PLL_CTL register */
-#define SYSCTRL_PLLDIV 0x0200/* read/write PLL_DIV register */
-#define SYSCTRL_LOCKCNT 0x0400/* read/write PLL_LOCKCNT register */
-#define SYSCTRL_PLLSTAT 0x0800/* read/write PLL_STAT register */
-
-#ifndef __ASSEMBLY__
+/* We need a dedicated function since we need to screw with the stack pointer
+ * when resetting. The on-chip ROM will save/restore registers on the stack
+ * when doing a system reset, so the stack cannot be outside of the chip.
+ */
+__attribute__((__noreturn__))
+static inline void bfrom_SoftReset(void *new_stack)
+{
+ while (1)
+ __asm__ __volatile__(
+ "sp = %[stack];"
+ "jump (%[bfrom_syscontrol]);"
+ : : [bfrom_syscontrol] "p"(bfrom_SysControl),
+ "q0"(SYSCTRL_SOFTRESET),
+ "q1"(0),
+ "q2"(NULL),
+ [stack] "p"(new_stack)
+ );
+}
/* Structures for working with LDRs and boot rom callbacks */
typedef struct ADI_BOOT_HEADER {
diff --git a/include/asm-blackfin/mach-common/bits/otp.h
b/include/asm-blackfin/mach-common/bits/otp.h
index d529a0a..4e3f1af 100644
--- a/include/asm-blackfin/mach-common/bits/otp.h
+++ b/include/asm-blackfin/mach-common/bits/otp.h
@@ -9,23 +9,22 @@
#include "bootrom.h"
-static uint32_t (* const otp_command)(uint32_t command, uint32_t value) =
(void *)_BOOTROM_OTP_COMMAND;
-static uint32_t (* const otp_read)(uint32_t page, uint32_t flags, uint64_t
*page_content) = (void *)_BOOTROM_OTP_READ;
-static uint32_t (* const otp_write)(uint3
[U-Boot] [PATCH 33/40] Blackfin: allow serial console to be disabled
Some devices have no UART device pulled out, so allow people to disable the driver completely in favor of other methods (like JTAG-console). Signed-off-by: Mike Frysinger --- cpu/blackfin/serial.c |4 cpu/blackfin/serial.h |4 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/cpu/blackfin/serial.c b/cpu/blackfin/serial.c index 0d6f377..42534bd 100644 --- a/cpu/blackfin/serial.c +++ b/cpu/blackfin/serial.c @@ -29,6 +29,8 @@ #include #include +#ifdef CONFIG_UART_CONSOLE + #if defined(UART_LSR) && (CONFIG_UART_CONSOLE != 0) # error CONFIG_UART_CONSOLE must be 0 on parts with only one UART #endif @@ -170,3 +172,5 @@ void serial_puts(const char *s) while (*s) serial_putc(*s++); } + +#endif diff --git a/cpu/blackfin/serial.h b/cpu/blackfin/serial.h index 90fceec..f671096 100644 --- a/cpu/blackfin/serial.h +++ b/cpu/blackfin/serial.h @@ -14,6 +14,10 @@ #include #include +#ifndef CONFIG_UART_CONSOLE +# define CONFIG_UART_CONSOLE 0 +#endif + #ifdef CONFIG_DEBUG_EARLY_SERIAL # define BFIN_DEBUG_EARLY_SERIAL 1 #else -- 1.6.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 32/40] Blackfin: support console-over-JTAG
The Blackfin JTAG has the ability to pass data via a back-channel without
halting the processor. Utilize that channel to emulate a console.
Signed-off-by: Mike Frysinger
---
common/devices.c|3 +
cpu/blackfin/Makefile |9 ++--
cpu/blackfin/jtag-console.c | 125 +++
include/devices.h |3 +
4 files changed, 136 insertions(+), 4 deletions(-)
create mode 100644 cpu/blackfin/jtag-console.c
diff --git a/common/devices.c b/common/devices.c
index ce3b7a0..38f1bbc 100644
--- a/common/devices.c
+++ b/common/devices.c
@@ -240,6 +240,9 @@ int devices_init (void)
#ifdef CONFIG_NETCONSOLE
drv_nc_init ();
#endif
+#ifdef CONFIG_JTAG_CONSOLE
+ drv_jtag_console_init ();
+#endif
return (0);
}
diff --git a/cpu/blackfin/Makefile b/cpu/blackfin/Makefile
index b90fb48..b4049ff 100644
--- a/cpu/blackfin/Makefile
+++ b/cpu/blackfin/Makefile
@@ -17,14 +17,15 @@ EXTRA:=
CEXTRA := initcode.o
SEXTRA := start.o
SOBJS:= interrupt.o cache.o
-COBJS:= cpu.o traps.o interrupts.o reset.o serial.o watchdog.o
+COBJS-y := cpu.o traps.o interrupts.o reset.o serial.o watchdog.o
+COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
ifeq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
-COBJS+= initcode.o
+COBJS-y += initcode.o
endif
-SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS))
EXTRA:= $(addprefix $(obj),$(EXTRA))
CEXTRA := $(addprefix $(obj),$(CEXTRA))
SEXTRA := $(addprefix $(obj),$(SEXTRA))
diff --git a/cpu/blackfin/jtag-console.c b/cpu/blackfin/jtag-console.c
new file mode 100644
index 000..44c0a83
--- /dev/null
+++ b/cpu/blackfin/jtag-console.c
@@ -0,0 +1,125 @@
+/*
+ * jtag-console.c - console driver over Blackfin JTAG
+ *
+ * Copyright (c) 2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include
+#include
+#include
+
+#ifndef CONFIG_JTAG_CONSOLE_TIMEOUT
+# define CONFIG_JTAG_CONSOLE_TIMEOUT 100
+#endif
+
+/* The Blackfin tends to be much much faster than the JTAG hardware. */
+static void jtag_write_emudat(uint32_t emudat)
+{
+ static bool overflowed = false;
+ ulong timeout = get_timer(0) + CONFIG_JTAG_CONSOLE_TIMEOUT;
+ while (bfin_read_DBGSTAT() & 0x1) {
+ if (overflowed)
+ return;
+ if (timeout < get_timer(0))
+ overflowed = true;
+ }
+ overflowed = false;
+ __asm__ __volatile__("emudat = %0;" : : "d"(emudat));
+}
+/* Transmit a buffer. The format is:
+ * [32bit length][actual data]
+ */
+static void jtag_send(const char *c, uint32_t len)
+{
+ uint32_t i;
+
+ if (len == 0)
+ return;
+
+ /* First send the length */
+ jtag_write_emudat(len);
+
+ /* Then send the data */
+ for (i = 0; i < len; i += 4)
+ jtag_write_emudat((c[i] << 0) | (c[i+1] << 8) | (c[i+2] << 16)
| (c[i+3] << 24));
+}
+static void jtag_putc(const char c)
+{
+ jtag_send(&c, 1);
+}
+static void jtag_puts(const char *s)
+{
+ jtag_send(s, strlen(s));
+}
+
+static int jtag_tstc(void)
+{
+ return (bfin_read_DBGSTAT() & 0x2);
+}
+
+/* Receive a buffer. The format is:
+ * [32bit length][actual data]
+ */
+static size_t inbound_len;
+static int leftovers_len;
+static uint32_t leftovers;
+static int jtag_getc(void)
+{
+ int ret;
+ uint32_t emudat;
+
+ /* see if any data is left over */
+ if (leftovers_len) {
+ --leftovers_len;
+ ret = leftovers & 0xff;
+ leftovers >>= 8;
+ return ret;
+ }
+
+ /* wait for new data ! */
+ while (!jtag_tstc())
+ continue;
+ __asm__("%0 = emudat;" : "=d"(emudat));
+
+ if (inbound_len == 0) {
+ /* grab the length */
+ inbound_len = emudat;
+ } else {
+ /* store the bytes */
+ leftovers_len = min(4, inbound_len);
+ inbound_len -= leftovers_len;
+ leftovers = emudat;
+ }
+
+ return jtag_getc();
+}
+
+int drv_jtag_console_init(void)
+{
+ device_t dev;
+ int ret;
+
+ memset(&dev, 0x00, sizeof(dev));
+ strcpy(dev.name, "jtag");
+ dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+ dev.putc = jtag_putc;
+ dev.puts = jtag_puts;
+ dev.tstc = jtag_tstc;
+ dev.getc = jtag_getc;
+
+ ret = device_register(&dev);
+ return (ret == 0 ? 1 : ret);
+}
+
+#ifdef CONFIG_UART_CONSOLE_IS_JTAG
+/* Since the JTAG is always available (at power on), allow it to fake a UART */
+void serial_set_baud(uint32_t baud) {}
+void serial_setbrg(void){}
+int serial_init(void) { return 0; }
+void serial_putc(const char c)
[U-Boot] [PATCH 28/40] Blackfin: just set SP register directly during init
No need to set the SP register indirectly to the configured value when it can be set directly. Signed-off-by: Mike Frysinger --- cpu/blackfin/start.S |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S index 6c5fef7..8617c98 100644 --- a/cpu/blackfin/start.S +++ b/cpu/blackfin/start.S @@ -163,9 +163,8 @@ ENTRY(_start) .Lnorelocate: /* Setup the actual stack in external memory */ - r0.h = HI(CONFIG_STACKBASE); - r0.l = LO(CONFIG_STACKBASE); - sp = r0; + sp.h = HI(CONFIG_STACKBASE); + sp.l = LO(CONFIG_STACKBASE); fp = sp; /* Now lower ourselves from the highest interrupt level to -- 1.6.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 30/40] Blackfin: pass RETX to Linux
Make sure we save the value of RETX at power on and then pass it on to the
kernel so that it can nicely debug a "double-fault-caused-a-reset" crash.
Signed-off-by: Mike Frysinger
---
cpu/blackfin/cpu.c |6 ++
lib_blackfin/boot.c |9 -
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/cpu/blackfin/cpu.c b/cpu/blackfin/cpu.c
index 9efd88e..30c214b 100644
--- a/cpu/blackfin/cpu.c
+++ b/cpu/blackfin/cpu.c
@@ -14,11 +14,14 @@
#include
#include
#include
+#include
#include
#include "cpu.h"
#include "serial.h"
+ulong bfin_poweron_retx;
+
__attribute__ ((__noreturn__))
void cpu_init_f(ulong bootflag, ulong loaded_from_ldr)
{
@@ -48,6 +51,9 @@ void cpu_init_f(ulong bootflag, ulong loaded_from_ldr)
bfin_write_EBIU_AMGCTL(CONFIG_EBIU_AMGCTL_VAL);
#endif
+ /* Save RETX so we can pass it while booting Linux */
+ bfin_poweron_retx = bootflag;
+
#ifdef CONFIG_DEBUG_DUMP
/* Turn on hardware trace buffer */
bfin_write_TBUFCTL(TBUFPWR | TBUFEN);
diff --git a/lib_blackfin/boot.c b/lib_blackfin/boot.c
index 47e27de..537be2b 100644
--- a/lib_blackfin/boot.c
+++ b/lib_blackfin/boot.c
@@ -31,6 +31,8 @@ static char *make_command_line(void)
return dest;
}
+extern ulong bfin_poweron_retx;
+
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{
int (*appl) (char *cmdline);
@@ -49,7 +51,12 @@ int do_bootm_linux(int flag, int argc, char *argv[],
bootm_headers_t *images)
cmdline = make_command_line();
icache_disable();
dcache_disable();
- (*appl) (cmdline);
+ asm __volatile__(
+ "RETX = %[retx];"
+ "CALL (%0);"
+ :
+ : "p"(appl), "q0"(cmdline), [retx] "d"(bfin_poweron_retx)
+ );
/* does not return */
return 1;
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 29/40] Blackfin: clarify relocation comment during init
People often ask questions about the init process and when things go
from flash to relocated base, so clarify the comments a bit.
Signed-off-by: Mike Frysinger
---
cpu/blackfin/start.S | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S
index 8617c98..6c8def4 100644
--- a/cpu/blackfin/start.S
+++ b/cpu/blackfin/start.S
@@ -125,9 +125,11 @@ ENTRY(_start)
*/
r6 = 1 (x);
- /* Relocate from wherever are (FLASH/RAM/etc...) to the hardcoded
+ /* Relocate from wherever we are (FLASH/RAM/etc...) to the hardcoded
* monitor location in the end of RAM. We know that memcpy() only
-* uses registers, so it is safe to call here.
+* uses registers, so it is safe to call here. Note that this only
+* copies to external memory ... we do not start executing out of
+* it yet (see "lower to 15" below).
*/
serial_early_puts("Relocate");
call _get_pc;
@@ -172,7 +174,9 @@ ENTRY(_start)
* setting the 15 handler to ".Lenable_nested", raising the 15
* interrupt, and then returning from the highest interrupt
* level to the dummy "jump" until the interrupt controller
-* services the pending 15 interrupt.
+* services the pending 15 interrupt. If executing out of
+* flash, these steps also changes the code flow from flash
+* to external memory.
*/
serial_early_puts("Lower to 15");
r0 = r7;
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 25/40] Blackfin: use common memcpy routine during init
Rather than using a local custom memcpy function, just call the existing
optimized Blackfin version.
Signed-off-by: Mike Frysinger
---
cpu/blackfin/start.S | 32 +++-
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S
index 9975a0c..6c5fef7 100644
--- a/cpu/blackfin/start.S
+++ b/cpu/blackfin/start.S
@@ -125,8 +125,9 @@ ENTRY(_start)
*/
r6 = 1 (x);
- /* Relocate from wherever are (FLASH/RAM/etc...) to the
-* hardcoded monitor location in the end of RAM.
+ /* Relocate from wherever are (FLASH/RAM/etc...) to the hardcoded
+* monitor location in the end of RAM. We know that memcpy() only
+* uses registers, so it is safe to call here.
*/
serial_early_puts("Relocate");
call _get_pc;
@@ -135,27 +136,16 @@ ENTRY(_start)
r2.h = .Loffset;
r3.l = _start;
r3.h = _start;
- r1 = r2 - r3;
-
- r0 = r0 - r1;
-
- cc = r0 == r3;
+ r2 = r2 - r3;
+ r1 = r0 - r2;
+ cc = r1 == r3;
if cc jump .Lnorelocate;
-
r6 = 0 (x);
- p1 = r0;
-
- p2.l = LO(CONFIG_SYS_MONITOR_BASE);
- p2.h = HI(CONFIG_SYS_MONITOR_BASE);
-
- p3 = 0x04;
- p4.l = LO(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN);
- p4.h = HI(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN);
-.Lloop1:
- r1 = [p1 ++ p3];
- [p2 ++ p3] = r1;
- cc=p2==p4;
- if !cc jump .Lloop1;
+
+ r0 = r3;
+ r2.l = LO(CONFIG_SYS_MONITOR_LEN);
+ r2.h = HI(CONFIG_SYS_MONITOR_LEN);
+ call _memcpy_ASM;
/* Initialize BSS section ... we know that memset() does not
* use the BSS, so it is safe to call here. The bootrom LDR
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 27/40] Blackfin: add portmuxing for UARTs on the BF51x
Signed-off-by: Mike Frysinger
---
cpu/blackfin/serial.h | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/cpu/blackfin/serial.h b/cpu/blackfin/serial.h
index ec40c26..90fceec 100644
--- a/cpu/blackfin/serial.h
+++ b/cpu/blackfin/serial.h
@@ -95,7 +95,16 @@
__attribute__((always_inline))
static inline void serial_do_portmux(void)
{
-#ifdef __ADSPBF52x__
+#if defined(__ADSPBF51x__)
+# define DO_MUX(port, mux_tx, mux_rx, tx, rx) \
+ bfin_write_PORT##port##_MUX((bfin_read_PORT##port##_MUX() &
~(PORT_x_MUX_##mux_tx##_MASK | PORT_x_MUX_##mux_rx##_MASK)) |
PORT_x_MUX_##mux_tx##_FUNC_2 | PORT_x_MUX_##mux_rx##_FUNC_2); \
+ bfin_write_PORT##port##_FER(bfin_read_PORT##port##_FER() | P##port##tx
| P##port##rx);
+ switch (CONFIG_UART_CONSOLE) {
+ case 0: DO_MUX(G, 5, 5, 9, 10); break; /* Port G; mux 5; PG9 and PG10
*/
+ case 1: DO_MUX(F, 2, 3, 14, 15); break; /* Port H; mux 2/3; PH14 and
PH15 */
+ }
+ SSYNC();
+#elif defined(__ADSPBF52x__)
# define DO_MUX(port, mux, tx, rx) \
bfin_write_PORT##port##_MUX((bfin_read_PORT##port##_MUX() &
~PORT_x_MUX_##mux##_MASK) | PORT_x_MUX_##mux##_FUNC_3); \
bfin_write_PORT##port##_FER(bfin_read_PORT##port##_FER() | P##port##tx
| P##port##rx);
--
1.6.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
