]> git.dujemihanovic.xyz Git - u-boot.git/log
u-boot.git
15 years agompc8349itx: allow SATA boot from the onboard SIL1334
Valeriy Glushkov [Thu, 5 Feb 2009 12:35:21 +0000 (14:35 +0200)]
mpc8349itx: allow SATA boot from the onboard SIL1334

This patch allows using of SATA devices connected
to the onboard PCI SIL1334 SATA controller.

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years ago83xx: Add eSDHC support on 8379 EMDS board
Andy Fleming [Thu, 30 Oct 2008 21:50:14 +0000 (16:50 -0500)]
83xx: Add eSDHC support on 8379 EMDS board

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years ago85xx: Add eSDHC support for 8536 DS
Andy Fleming [Thu, 30 Oct 2008 21:51:33 +0000 (16:51 -0500)]
85xx: Add eSDHC support for 8536 DS

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoAdd support for the Freescale eSDHC found on 8379 and 8536 SoCs
Andy Fleming [Thu, 30 Oct 2008 21:47:16 +0000 (16:47 -0500)]
Add support for the Freescale eSDHC found on 8379 and 8536 SoCs

This uses the new MMC framework

Some contributions by Dave Liu <daveliu@freescale.com>

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoAdd MMC Framework
Andy Fleming [Thu, 30 Oct 2008 21:41:01 +0000 (16:41 -0500)]
Add MMC Framework

Here's a new framework (based roughly off the linux one) for managing
MMC controllers.  It handles all of the standard SD/MMC transactions,
leaving the host drivers to implement only what is necessary to
deal with their specific hardware.

This also hooks the infrastructure into the PowerPC board code
(similar to how the ethernet infrastructure now hooks in)

Some of this code was contributed by Dave Liu <daveliu@freescale.com>

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoEliminated arch-specific mmc header requirement
Andy Fleming [Thu, 30 Oct 2008 21:31:39 +0000 (16:31 -0500)]
Eliminated arch-specific mmc header requirement

The current MMC infrastructure relies on the existence of an
arch-specific header file.  This isn't necessary, and a couple
drivers were forced to implement dummy files to meet this requirement.
Instead, we move the stuff in those header files into a more appropriate
place, and eliminate the stubs and the #include of asm/arch/mmc.h

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoConvert mmc_init to mmc_legacy_init
Andy Fleming [Thu, 30 Oct 2008 21:21:00 +0000 (16:21 -0500)]
Convert mmc_init to mmc_legacy_init

This is to get it out of the way of incoming MMC framework

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoEliminate support for using MMC as memory
Andy Fleming [Thu, 30 Oct 2008 21:19:25 +0000 (16:19 -0500)]
Eliminate support for using MMC as memory

MMC cards are not memory, so we stop treating them that way.

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years ago32bit BUg fix for DDR2 on 8572
Poonam_Aggrwal-b10812 [Sun, 4 Jan 2009 03:16:38 +0000 (08:46 +0530)]
32bit BUg fix for DDR2 on 8572

This errata fix is required for 32 bit DDR2 controller on 8572.
May  also be required for P10XX20XX platforms

Signed-off-by: Poonam_Agarwal-b10812 <b10812@lc1106.zin33.ap.freescale.net>
15 years agoTQM85xx: Fix a couple warnings in TQM8548 build
Andy Fleming [Mon, 16 Feb 2009 15:40:20 +0000 (09:40 -0600)]
TQM85xx: Fix a couple warnings in TQM8548 build

The ecm variable in sdram.c was being declared for all 8548, but only
used by specific 8548 boards, so we make that variable require those
specific boards, too

The nand code was using an index "i" into a table, and then re-using "i"
to set addresses for each upm.  However, then it relied on the old value
of i still being there to enable things.  Changed the second "i" to "j"

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoMPC85xx: TQM8548: workaround for erratum DDR 19 and 20
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:26 +0000 (18:38 +0100)]
MPC85xx: TQM8548: workaround for erratum DDR 19 and 20

This patch adds the workaround for erratum DDR20 according to MPC8548
Device Errata document, Rev. 1: "CKE signal may not function correctly
after assertion of HRESET". Furthermore, the bug DDR19 is fixed in
processor version 2.1 and the work-around must be removed.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM8548: use cache for AG and BE variants
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:25 +0000 (18:38 +0100)]
MPC85xx: TQM8548: use cache for AG and BE variants

This patch makes accesses to the system memory cachable by removing the
caching-inhibited and guarded flags from the relevant TLB entries for
the TQM8548_BE and TQM8548_AG modules. FYI, the Freescale MPC85* boards
are configured similarly.

This results in a big averall performace improvement. TFTP downloads,
NAND Flash accesses, kernel boots, etc. are much faster.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM8548_AG: add 1 GiB DDR2-SDRAM configuration
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:24 +0000 (18:38 +0100)]
MPC85xx: TQM8548_AG: add 1 GiB DDR2-SDRAM configuration

This patch add support for the 1 GiB DDR2-SDRAM on the TQM8548_AG
module.

Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM8548: fix SDRAM timing for 533 MHz
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:23 +0000 (18:38 +0100)]
MPC85xx: TQM8548: fix SDRAM timing for 533 MHz

According to new TQM8548 timing specification:
Refresh Recovery: 34 -> 53 clocks
CKE pulse width:  1 -> 3 cycles
Window for four activities: 13 -> 14 cycles

Signed-off-by: Jens Gehrlein <sew_s@tqs.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM8548: add support for the TQM8548_AG module
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:22 +0000 (18:38 +0100)]
MPC85xx: TQM8548: add support for the TQM8548_AG module

The TQM8548_AG is a variant of the TQM8548 module with 1 GiB memory,
CAN and without PCI/PCI-X and RTC. U-Boot can be built for this module
with "$ make TQM8548_AG_config".

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM8548: add support for the TQM8548_BE module
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:21 +0000 (18:38 +0100)]
MPC85xx: TQM8548: add support for the TQM8548_BE module

The TQM8548_BE is a variant of the TQM8548 module with NAND and CAN
interface. With NAND support, the image is significantly larger and
TEXT_BASE is adjusted accordingly. U-Boot can be built for this
module with "$ make TQM8548_BE_config".

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM85xx: make standard PCI/PCI-X configurable
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:20 +0000 (18:38 +0100)]
MPC85xx: TQM85xx: make standard PCI/PCI-X configurable

The TQM8548_AG module does not have the standard PCI/PCI-X interface
connected but just the PCI Express interface . So far it was not
possible to disable it without disabling the complete PCI interface
(CONFIG_PCI) including PCI Express.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years agoMPC85xx: TQM85xx: fix flash protection for boot loader
Wolfgang Grandegger [Wed, 11 Feb 2009 17:38:19 +0000 (18:38 +0100)]
MPC85xx: TQM85xx: fix flash protection for boot loader

As the reset vector is located at 0xfffffffc, all flash sectors from the
beginning of the U-Boot binary to 0xffffffff must be protected. On the
TQM8548-AG having small sectors at the end of the flash it happened that
the last two sector were not protected and an "erase all" left an
un-bootable system behind:

Bank # 2: CFI conformant FLASH (32 x 16)  Size: 32 MB in 270 Sectors
  AMD Standard command set, Manufacturer ID: 0xEC, Device ID: 0x257E
  Erase timeout: 8192 ms, write timeout: 1 ms

  FFFA0000 E RO   FFFC0000   RO   FFFE0000   RO   FFFE4000   RO   FFFE8000   RO
  FFFEC000   RO   FFFF0000   RO   FFFF4000   RO   FFFF8000 E      FFFFC000

The same bug seems to be in drivers/mtd/cfi_flash.c:flash_init() and many
board BSPs as well.

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
15 years ago86xx: Update CPU info output on bootup
Peter Tyser [Fri, 6 Feb 2009 20:30:40 +0000 (14:30 -0600)]
86xx: Update CPU info output on bootup

- Update style of 86xx CPU information on boot to more closely
  match 85xx boards
- Fix detection of 8641/8641D
- Use strmhz() to display frequencies
- Display L1 information
- Display L2 cache size
- Fixed CPU/SVR version output

== Before ==
Freescale PowerPC
CPU:
    Core: E600 Core 0, Version: 0.2, (0x80040202)
    System: Unknown, Version: 2.1, (0x80900121)
    Clocks: CPU:1066 MHz, MPX: 533 MHz, DDR: 266 MHz, LBC: 133 MHz
    L2: Enabled
Board: X-ES XPedite5170 3U VPX SBC

== After ==
CPU:   8641D, Version: 2.1, (0x80900121)
Core:  E600 Core 0, Version: 2.2, (0x80040202)
Clock Configuration:
       CPU:1066.667 MHz, MPX:533.333 MHz
       DDR:266.667 MHz (533.333 MT/s data rate), LBC:133.333 MHz
L1:    D-cache 32 KB enabled
       I-cache 32 KB enabled
L2:    512 KB enabled
Board: X-ES XPedite5170 3U VPX SBC

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years ago86xx: Update Global Utilities structure
Peter Tyser [Thu, 5 Feb 2009 17:25:24 +0000 (11:25 -0600)]
86xx: Update Global Utilities structure

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years ago86xx: Reset update
Peter Tyser [Thu, 5 Feb 2009 17:25:25 +0000 (11:25 -0600)]
86xx: Reset update

Update the 86xx reset sequence to try executing a board-specific reset
function.  If the board-specific reset is not implemented or does not
succeed, then assert #HRESET_REQ.  Using #HRESET_REQ is a more standard
reset procedure than the previous method and allows all board
peripherals to be reset if needed.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years agofsl-ddr: Allow system to boot if we have more than 4G of memory
Kumar Gala [Wed, 11 Feb 2009 05:53:40 +0000 (23:53 -0600)]
fsl-ddr: Allow system to boot if we have more than 4G of memory

Previously if we >=4G of memory and !CONFIG_PHYS_64BIT we'd report
an error and hang.  Instead of doing that since DDR is mapped in the
lowest priority LAWs we setup the DDR controller and the max amount
of memory we report back is what we can map (CONFIG_MAX_MEM_MAPPED)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agompc85xx: Add support for the P2020
Srikanth Srinivasan [Wed, 21 Jan 2009 23:17:33 +0000 (17:17 -0600)]
mpc85xx: Add support for the P2020

Added various p2020 processor specific details:
* SVR for p2020, p2020E
* immap updates for LAWs and DDR on p2020
* LAW defines related to p2020

Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Signed-off-by: Travis Wheatley <Travis.Wheatley@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: print boot header info to distinquish 36-bit addr map on MPC8572 DS
Kumar Gala [Tue, 10 Feb 2009 23:36:15 +0000 (17:36 -0600)]
85xx: print boot header info to distinquish 36-bit addr map on MPC8572 DS

Added some info that is printed out when we boot to distiquish if we
built MPC8572DS_config vs MPC8572DS_36BIT_config since they have
different address maps.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoFixup SGMII PHY ids in the device tree
Andy Fleming [Sat, 6 Dec 2008 02:10:22 +0000 (20:10 -0600)]
Fixup SGMII PHY ids in the device tree

The device tree's PHY addresses need to be fixed up if we're using the
SGMII Riser Card.

The 8572, 8536, and 8544 DS boards were modified to call this function.

Code idea taken from Liu Yu <yu.liu@freescale.com>

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoMake some minor whitespace changes to eliminate line-wrapping
Andy Fleming [Wed, 11 Feb 2009 21:10:31 +0000 (15:10 -0600)]
Make some minor whitespace changes to eliminate line-wrapping

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years agoAdd eth_get_dev_by_index
Andy Fleming [Wed, 11 Feb 2009 21:07:24 +0000 (15:07 -0600)]
Add eth_get_dev_by_index

This allows code to iterate through the ethernet devices

Signed-off-by: Andy Fleming <afleming@freescale.com>
15 years ago85xx: Fix bug in device tree setup in 36-bit physical confg
Kumar Gala [Tue, 10 Feb 2009 04:03:04 +0000 (22:03 -0600)]
85xx: Fix bug in device tree setup in 36-bit physical confg

In the 36-bit physical config for MPC8572DS when need the start address
of memory and it size to be kept in phys_*_t instead of a ulong since
we support >4G of memory in the config and ulong cant represent that.
Otherwise we end up seeing the memory node in the device tree reporting
back we have memory starting @ 0 and of size 0.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Fix address map for 36-bit config of MPC8572DS
Kumar Gala [Tue, 10 Feb 2009 04:03:05 +0000 (22:03 -0600)]
85xx: Fix address map for 36-bit config of MPC8572DS

When we introduced the 36-bit config of the MPC8572DS board we had the
wrong PCI MEM bus address map.  Additionally, the change to the address
map exposes a small issue in our dummy read on the ULI bus.  We need
to use the new mapping functions to handle that read properly in the
36-bit config.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Fix how we map DDR memory
Kumar Gala [Fri, 6 Feb 2009 15:56:35 +0000 (09:56 -0600)]
85xx: Fix how we map DDR memory

Previously we only allowed power-of-two memory sizes and didnt
handle >2G of memory.  Now we will map up to CONFIG_MAX_MEM_MAPPED
and should properly handle any size that we can make in the TLBs
we have available to us

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agofsl-ddr: ignore memctl_intlv_ctl setting if only one DDR controller
Kumar Gala [Fri, 6 Feb 2009 15:56:34 +0000 (09:56 -0600)]
fsl-ddr: ignore memctl_intlv_ctl setting if only one DDR controller

If we only have one controller we can completely ignore how
memctl_intlv_ctl is set.  Otherwise other levels of code get confused
and think we have twice as much memory.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years ago85xx: Format cpu freq printing to handle 8 cores
Kumar Gala [Wed, 4 Feb 2009 15:35:57 +0000 (09:35 -0600)]
85xx: Format cpu freq printing to handle 8 cores

Only print 4 cpu freq per line.  This way when we have 8 cores its a
bit more readable.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Sun, 15 Feb 2009 21:55:56 +0000 (22:55 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Sun, 15 Feb 2009 21:21:17 +0000 (22:21 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

15 years agoUSB: Remove LUN number from CDB
Abraham, Thomas [Tue, 28 Oct 2008 11:21:31 +0000 (16:51 +0530)]
USB: Remove LUN number from CDB

The LUN number is not part of the Command Descriptor Block (CDB) for scsi inquiry, request sense, test unit ready, read capacity and read10 commands. This patch removes the LUN number information from the CDB.

Signed-off-by: Thomas Abraham <t-abraham@ti.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agoAdded usbtty_configured() check. Fixed attribute(packed) warnings.
Atin Malaviya [Tue, 3 Feb 2009 20:17:10 +0000 (15:17 -0500)]
Added usbtty_configured() check. Fixed attribute(packed) warnings.

V3: Fixed line-wrap problem due to user error in mail!

Added usb_configured() checks in usbtty_puts() and usbtty_putc() to get around a hang
when usb is not connected and the user has set up multi-io (setenv stdout serial,usbtty etc).
Got rid of redundant __attribute__((packed)) directives that were causing warnings from gcc.

Signed-off-by: Atin Malaviya <atin.malaviya@gmail.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
15 years agoi.MX31: Start the I2C clock on driver initialisation
Guennadi Liakhovetski [Fri, 13 Feb 2009 08:23:36 +0000 (09:23 +0100)]
i.MX31: Start the I2C clock on driver initialisation

i.MX31 powers on with most clocks running, so, after a power on this explicit
clock start up is not required. However, as Linux boots it disables most clocks
to save power. This includes the I2C clock. If we then soft reboot from Linux
the I2C clock stays off. This breaks the phycore, which has its environment in
I2C EEPROM. Fix the problem by explicitly starting the clock in I2C driver
initialisation routine.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Ack-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
15 years agoi2c.h: drop i2c_reg_{read, write} hack for Blackfin parts
Mike Frysinger [Thu, 12 Feb 2009 01:36:14 +0000 (20:36 -0500)]
i2c.h: drop i2c_reg_{read, write} hack for Blackfin parts

The Blackfin i2c driver has been rewritten thus the special ifdefs in the
common code are no longer needed.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Thu, 12 Feb 2009 07:36:52 +0000 (08:36 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

15 years ago82xx, mgcoge: fix compile error
Heiko Schocher [Thu, 12 Feb 2009 07:08:54 +0000 (08:08 +0100)]
82xx, mgcoge: fix compile error

With actual u-boot compiling the mgcoge port fails, because
since commit ba705b5b1a97b47388ed48858bef6bf7b6bfcd56 it is
necessary to define CONFIG_NET_MULTI.

Seems to me the mgcoge port is the only actual existing 8260
port who uses CONFIG_ETHER_ON_SCC, so no other 8260 port needed
to be fixed.

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoppc4xx: Add README entry for CONFIG_PCI_DISABLE_PCIE
Dirk Eibach [Mon, 9 Feb 2009 07:18:34 +0000 (08:18 +0100)]
ppc4xx: Add README entry for CONFIG_PCI_DISABLE_PCIE

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fix initialization of the SDRAM_CODT register
Carolyn Smith [Thu, 12 Feb 2009 05:13:44 +0000 (06:13 +0100)]
ppc4xx: Fix initialization of the SDRAM_CODT register

This fixes the initialization of the SDRAM_CODT register in the ppc4xx DDR2
initialization code. It also removes use of the SDRAM_CODT_FEEDBACK_RCV_SINGLE_END
and SDRAM_CODT_FEEDBACK_DRV_SINGLE_END #define's since they are reserved bits.

Signed-off-by: Carolyn Smith <carolyn.smith@tektronix.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fix problem with board_eth_init() vs cpu_eth_init() on AMCC boards
Stefan Roese [Wed, 11 Feb 2009 08:29:33 +0000 (09:29 +0100)]
ppc4xx: Fix problem with board_eth_init() vs cpu_eth_init() on AMCC boards

Some AMCC eval boards do have a board_eth_init() function calling
pci_eth_init(). These boards need to call cpu_eth_init() explicitly now
with the new eth_init rework.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Autocalibration can set RDCC to over aggressive value.
Adam Graham [Mon, 9 Feb 2009 21:18:12 +0000 (13:18 -0800)]
ppc4xx: Autocalibration can set RDCC to over aggressive value.

The criteria of the AMCC SDRAM Controller DDR autocalibration
U-Boot code is to pick the largest passing write/read/compare
window that also has the smallest SDRAM_RDCC.[RDSS] Read Sample
Cycle Select value.

On some Kilauea boards the DDR autocalibration algorithm can
find a large passing write/read/compare window with a small
SDRAM_RDCC.[RDSS] aggressive value of Read Sample Cycle Select
value "T1 Sample".

This SDRAM_RDCC.[RDSS] Read Sample Cycle Select value of
"T1 Sample" proves to be to aggressive when later on U-Boot
relocates into DDR memory and executes.

The memory traces on the Kilauea board are short so on some
Kilauea boards the SDRAM_RDCC.[RDSS] Read Sample Cycle Select
value of "T1 Sample" shows up as a potentially valid value for
the DDR autocalibratiion algorithm.

The fix is to define a weak default function which provides
the minimum SDRAM_RDCC.[RDSS] Read Sample Cycle Select value
to accept for DDR autocalibration.  The default will be the
"T2 Sample" value.  A board developer who has a well defined
board and chooses to be more aggressive can always provide
their own board specific string function with the more
aggressive "T1 Sample" value or stick with the default
minimum SDRAM_RDCC.[RDSS] value of "T2".

Also put in a autocalibration loop fix for case where current
write/read/compare passing window size is the same as a prior
window size, then in this case choose the write/read/compare
result that has the associated smallest RDCC T-Sample value.

Signed-off-by: Adam Graham <agraham@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Fix problem with CONFIG_MAX_MEM_MAPPED in include/asm-ppc/config.h
Stefan Roese [Wed, 11 Feb 2009 08:37:12 +0000 (09:37 +0100)]
ppc4xx: Fix problem with CONFIG_MAX_MEM_MAPPED in include/asm-ppc/config.h

CONFIG_SDRAM_PPC4xx_IBM_DDR2 is not set when include/asm-ppc/config.h is
included. So for katmai, CONFIG_MAX_MEM_MAPPED will get set to 256MB.

It makes perfect sense to set CONFIG_MAX_MEM_MAPPED to 2GB for all PPC4xx
boards right now.

Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoCoding style cleanup; update CHANGELOG
Wolfgang Denk [Wed, 11 Feb 2009 23:08:39 +0000 (00:08 +0100)]
Coding style cleanup; update CHANGELOG

Signed-off-by: Wolfgang Denk <wd@denx.de>
15 years agoAdd feature-removal-schedule.txt
Peter Tyser [Fri, 30 Jan 2009 22:36:40 +0000 (16:36 -0600)]
Add feature-removal-schedule.txt

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
15 years ago8xx serial, smc: Coding-Style cleanup serial SMC driver
Heiko Schocher [Tue, 10 Feb 2009 08:32:38 +0000 (09:32 +0100)]
8xx serial, smc: Coding-Style cleanup serial SMC driver

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years ago8xx serial, smc: add configurable SMC Rx buffer len
Heiko Schocher [Tue, 10 Feb 2009 08:31:47 +0000 (09:31 +0100)]
8xx serial, smc: add configurable SMC Rx buffer len

This patch adds the configuration option CONFIG_SYS_SMC_RXBUFLEN.
With this option it is possible to allow the receive
buffer for the SMC on 8xx to be greater then 1. In case
CONFIG_SYS_SMC_RXBUFLEN == 1 this driver works as the
old version.

When defining CONFIG_SYS_SMC_RXBUFLEN also
CONFIG_SYS_MAXIDLE must be defined to setup the maximum
idle timeout for the SMC.

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agocommon/{hush, kgdb, serial}.c: build by COBJS-$(...) in Makefile
Mike Frysinger [Fri, 6 Feb 2009 02:04:36 +0000 (21:04 -0500)]
common/{hush, kgdb, serial}.c: build by COBJS-$(...) in Makefile

Move global '#ifdef CONFIG_xxx .... #endif' out of the .c files and into
the COBJS-$(CONFIG_xxx) in the Makefile.  Also delete unused var in kgdb
code in the process.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agobzip2: move ifdef handling to Makefile COBJS-$(...)
Mike Frysinger [Fri, 6 Feb 2009 02:04:50 +0000 (21:04 -0500)]
bzip2: move ifdef handling to Makefile COBJS-$(...)

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoFix whitespace damage: double space changed to a tab
Jerry Van Baren [Fri, 6 Feb 2009 03:18:02 +0000 (22:18 -0500)]
Fix whitespace damage: double space changed to a tab

At some point an intentional double space at the end of the sentence
got changed into a tab in the GPL header line:
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

This patch fixes the damage.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Wed, 11 Feb 2009 21:24:51 +0000 (22:24 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

15 years agocfi: make flash_get_info() non static
Heiko Schocher [Tue, 10 Feb 2009 08:53:29 +0000 (09:53 +0100)]
cfi: make flash_get_info() non static

If on your board is more than one flash, you must know
the size of every single flash, for example, for updating
the DTS before booting Linux. So make this function
flash_get_info() extern, and you can have all info
about your flashes.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agonet: removed board-specific CONFIGs from MPC5xxx FEC driver
Ben Warren [Fri, 6 Feb 2009 07:58:25 +0000 (23:58 -0800)]
net: removed board-specific CONFIGs from MPC5xxx FEC driver

Added new CONFIG options for the three type of MAC-PHY interconnect and
applied them all relevant board config files

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agonet/sntp.c: move ifdef into Makefile COBJS-$(...)
Mike Frysinger [Fri, 6 Feb 2009 02:04:47 +0000 (21:04 -0500)]
net/sntp.c: move ifdef into Makefile COBJS-$(...)

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agotsec: Fix a bug in soft-resetting
Andy Fleming [Wed, 4 Feb 2009 00:26:41 +0000 (18:26 -0600)]
tsec: Fix a bug in soft-resetting

SOFT_RESET must be asserted for at least 3 TX clocks.  Usually, that's about 30
clock cycles, so it's been mostly working.  But we had no guarantee, and at
slower bitrates, it's just over a microsecond (over 1000 clock cycles).  This
enforces a 2 microsecond gap between assertion and deassertion.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoFix 100Mbs ethernet operation on sh7763 based boards
Simon Munton [Mon, 2 Feb 2009 09:44:08 +0000 (09:44 +0000)]
Fix 100Mbs ethernet operation on sh7763 based boards

100Mbs ethernet does not work on sh7763 chips due to the wrong value being
used in the GECMR register. Following diff fixes the problem

Signed-off-by: Simon Munton <simon@nidoran.m5data.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years agoFix MPC8260 with ethernet on SCC
ksi@koi8.net [Sat, 7 Feb 2009 00:27:55 +0000 (16:27 -0800)]
Fix MPC8260 with ethernet on SCC

This fixes MPC8260 compilation with ethernet on SCC. Probably was a
typo or something...

Signed-off-by: Sergey Kubushyn <ksi@koi8.net>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
15 years ago82xx serial, smc: Coding-Style cleanup serial SMC driver
Heiko Schocher [Fri, 30 Jan 2009 11:56:15 +0000 (12:56 +0100)]
82xx serial, smc: Coding-Style cleanup serial SMC driver

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years ago82xx serial, smc: add configurable SMC Rx buffer len
Heiko Schocher [Fri, 30 Jan 2009 11:55:38 +0000 (12:55 +0100)]
82xx serial, smc: add configurable SMC Rx buffer len

This patch adds the configuration option CONFIG_SYS_SMC_RXBUFLEN.
With this option it is possible to allow the receive
buffer for the SMC on 82xx to be greater then 1. In case
CONFIG_SYS_SMC_RXBUFLEN == 1 this driver works as the
old version.

When defining CONFIG_SYS_SMC_RXBUFLEN also
CONFIG_SYS_MAXIDLE must be defined to setup the maximum
idle timeout for the SMC.

Signed-off-by: Heiko Schocher <hs@denx.de>
15 years agoppc: Fix roll over bug in flush_cache()
Kumar Gala [Fri, 6 Feb 2009 14:08:06 +0000 (08:08 -0600)]
ppc: Fix roll over bug in flush_cache()

If we call flush_cache(0xfffff000, 0x1000) it would never
terminate the loop since end = 0xffffffff and we'd roll over
our counter from 0xfffffe0 to 0 (assuming a 32-byte cache line)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agoppc: Move CONFIG_MAX_MEM_MAPPED to common config.h
Kumar Gala [Fri, 6 Feb 2009 02:40:58 +0000 (20:40 -0600)]
ppc: Move CONFIG_MAX_MEM_MAPPED to common config.h

Moved CONFIG_MAX_MEM_MAPPED to the asm/config.h so its kept consistent
between the two current users (lib_ppc/board.c, 44x SPD DDR2).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
15 years agoAdd an architecture specific config.h for common defines
Kumar Gala [Fri, 6 Feb 2009 02:40:57 +0000 (20:40 -0600)]
Add an architecture specific config.h for common defines

We have common defines that we duplicate in various ways.  Having an
arch specific config.h gives us a common location for those defines.

Eventually we should be able to replace this when we have proper
Kconfig support.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agompc8641hpcn: Change PCI MEM pci bus address
Becky Bruce [Wed, 4 Feb 2009 00:10:56 +0000 (18:10 -0600)]
mpc8641hpcn: Change PCI MEM pci bus address

Now that the rest of u-boot can support it, change the PCI bus
address of the PCI MEM regions from 0x80000000 to 0xc0000000,
and use the same bus address for both PCI1 and PCI2.  This will
maximize the amount of PCI address space left over to map RAM
on systems with large amounts of memory.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agodrivers/block/ahci: Fix pci mapping bug
Becky Bruce [Wed, 4 Feb 2009 00:10:55 +0000 (18:10 -0600)]
drivers/block/ahci: Fix pci mapping bug

The code assumes that the pci bus address and the virtual
address used to access a region are the same, but they might
not be.  Fix this assumption.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agoMPC8641HPCN: Enable CONFIG_ADDR_MAP
Becky Bruce [Wed, 4 Feb 2009 00:10:54 +0000 (18:10 -0600)]
MPC8641HPCN: Enable CONFIG_ADDR_MAP

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agompc8641hpcn: Clean up PCI mapping concepts
Becky Bruce [Wed, 4 Feb 2009 00:10:53 +0000 (18:10 -0600)]
mpc8641hpcn: Clean up PCI mapping concepts

Clean up PCI mapping concepts in the 8641 config - rename _BASE
to _BUS, as it's actually a PCI bus address, separate virtual
and physical addresses into _VIRT and _PHYS, and use each
appopriately.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agompc86xx: Add support to populate addr map based on BATs
Becky Bruce [Wed, 4 Feb 2009 00:10:52 +0000 (18:10 -0600)]
mpc86xx: Add support to populate addr map based on BATs

If CONFIG_ADDR_MAP is enabled, update the address map
whenever we write a bat.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agopowerpc: Move duplicated BAT defines to mmu.h
Becky Bruce [Wed, 4 Feb 2009 00:10:51 +0000 (18:10 -0600)]
powerpc: Move duplicated BAT defines to mmu.h

The BAT fields are architected; there's no need for these to be in
cpu-specific files.  Drop the duplication and move these to
include/asm-ppc/mmu.h.  Also, remove the BL_xxx defines that were only
used by the alaska board, and switch to using the BATU_BL_xxx defines
used by all the other boards.  The BL_ defines previously in use
had to be shifted into the proper position for use, which was inefficient.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agodrivers/pci: Create pci_map_bar function
Becky Bruce [Wed, 4 Feb 2009 00:10:50 +0000 (18:10 -0600)]
drivers/pci: Create pci_map_bar function

It is no longer always true that the pci bus address can be
used as the virtual address for pci accesses.  pci_map_bar()
is created to return the virtual address for a pci region.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agompc8641hpcn: Set up outbound pci windows before inbound
Becky Bruce [Wed, 4 Feb 2009 00:10:49 +0000 (18:10 -0600)]
mpc8641hpcn: Set up outbound pci windows before inbound

Because the inbound pci windows are mapped generously, set up
the more specific outbound windows first.  This way, when we
search the pci regions for something, we will hit on the more
specific region.  This can actually be a problem on systems
with large amounts of RAM.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agompc8641hpcn: Use physical address in flash banks defintion
Becky Bruce [Mon, 2 Feb 2009 22:34:52 +0000 (16:34 -0600)]
mpc8641hpcn: Use physical address in flash banks defintion

If the VA and PA of the flash aren't the same, the banks list
should be initialized to hold the physical address.  Correct this.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
15 years agoMerge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Wolfgang Denk [Sat, 7 Feb 2009 22:51:52 +0000 (23:51 +0100)]
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

15 years agopci: give preference to non-PCI_REGION_SYS_MEMORY regions when matching
Kumar Gala [Fri, 6 Feb 2009 15:49:32 +0000 (09:49 -0600)]
pci: give preference to non-PCI_REGION_SYS_MEMORY regions when matching

When we search for an address match in pci_hose_{phys_to_bus,bus_to_phys}
we should give preference to memory regions that aren't system memory.

Its possible that we have over mapped system memory in the regions and
we want to avoid depending on the order of the regions.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
15 years agopci: Rename PCI_REGION_MEMORY to PCI_REGION_SYS_MEMORY for clarity
Kumar Gala [Fri, 6 Feb 2009 15:49:31 +0000 (09:49 -0600)]
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 <galak@kernel.crashing.org>
15 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Sat, 7 Feb 2009 22:37:10 +0000 (23:37 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-coldfire
Wolfgang Denk [Sat, 7 Feb 2009 22:24:38 +0000 (23:24 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-coldfire

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Sat, 7 Feb 2009 21:53:45 +0000 (22:53 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-cfi-flash
Wolfgang Denk [Sat, 7 Feb 2009 21:17:44 +0000 (22:17 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sat, 7 Feb 2009 21:17:19 +0000 (22:17 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

15 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Wolfgang Denk [Sat, 7 Feb 2009 21:08:53 +0000 (22:08 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx

15 years agoNAND: Add timeout for reset command
Peter Tyser [Wed, 4 Feb 2009 19:47:22 +0000 (13:47 -0600)]
NAND: Add timeout for reset command

Without the timeout present an infinite loop can occur if the
NAND device is broken or not present.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoNAND: Silence warning when CONFIG_SYS_NAND_QUIET_TEST
Peter Tyser [Wed, 4 Feb 2009 19:39:40 +0000 (13:39 -0600)]
NAND: Silence warning when CONFIG_SYS_NAND_QUIET_TEST

Commit cfa460adfdefcc30d104e1a9ee44994ee349bb7b removed support
for disabling the "No NAND device found!!!" warning when
CONFIG_SYS_NAND_QUIET_TEST was defined.  This re-adds support
for silencing the warning.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoNAND: Fixed invalid pointers to static relocated chip names
Valeriy Glushkov [Mon, 19 Jan 2009 14:32:59 +0000 (16:32 +0200)]
NAND: Fixed invalid pointers to static relocated chip names

Dear Wolfgang,

You are right, the patch was ugly.
The new one seems to be better.

Signed-off-by: Valeriy Glushkov <gvv@lstec.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoenv_nand: fix env memory release
derek@siconix.com [Mon, 26 Jan 2009 21:08:17 +0000 (14:08 -0700)]
env_nand: fix env memory release

This fixes a bug that tmp environment memory not being released.

Signed-off-by: Derek Ou <dou@siconix.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
15 years agoColdfire: M527x: Add missing GPIO register address defines
Richard Retanubun [Thu, 5 Feb 2009 14:33:50 +0000 (09:33 -0500)]
Coldfire: M527x: Add missing GPIO register address defines

Add missing GPIO registers address definition for Coldfire M5271.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: mcfmii: Allow non-autonegotiating PHYs to use mii command
Richard Retanubun [Fri, 23 Jan 2009 19:42:58 +0000 (14:42 -0500)]
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.

Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: Applied baudrate formula of serial_init to serial_setbrg
Richard Retanubun [Fri, 23 Jan 2009 16:44:30 +0000 (11:44 -0500)]
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 <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: M5271EVB: Board header update (dependencies)
Richard Retanubun [Fri, 23 Jan 2009 19:07:05 +0000 (14:07 -0500)]
Coldfire: M5271EVB: Board header update (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.
Removed compiler warning by defining CONFIG_SYS_CS0_*

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 <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: M5271: Allow board header file to specify clock multiplier
Richard Retanubun [Thu, 29 Jan 2009 19:36:06 +0000 (14:36 -0500)]
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 <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: M5271EVB: Remove usage of CONFIG_SYS_FECI2C
Richard Retanubun [Fri, 23 Jan 2009 15:47:13 +0000 (10:47 -0500)]
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 <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: cmd_bdinfo cleanup
Richard Retanubun [Fri, 23 Jan 2009 14:45:34 +0000 (09:45 -0500)]
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 <RichardRetanubun@RuggedCom.com>
15 years agoColdfire: Fix half-baud UART by adding M5271 to Coldfire v2 core list
Richard Retanubun [Fri, 23 Jan 2009 14:27:00 +0000 (09:27 -0500)]
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 <RichardRetanubun@RuggedCom.com>
15 years agoppc4xx: Make PCIE support selectable
Dirk Eibach [Tue, 3 Feb 2009 14:15:21 +0000 (15:15 +0100)]
ppc4xx: Make PCIE support selectable

On some platforms PCIE support is not required, but would be included
because the cpu supports it. To reduce fooprint it is now configurable
via CONFIG_PCI_DISABLE_PCIE.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoppc4xx: Only fixup opb attached UARTs
Matthias Fuchs [Tue, 3 Feb 2009 21:13:16 +0000 (22:13 +0100)]
ppc4xx: Only fixup opb attached UARTs

This patch updates the fdt UART clock fixup code to
only touch CPU internal UARTs on 4xx systems.
Only these UARTs are definitely clocked by gd->uart_clk.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Signed-off-by: Stefan Roese <sr@denx.de>
15 years agoBlackfin: move default boot SPI CS to common code
Mike Frysinger [Tue, 13 Jan 2009 16:00:29 +0000 (11:00 -0500)]
Blackfin: move default boot SPI CS to common code

Move the default SPI CS that we boot from into common code so that it can
be used in other SPI drivers and environment settings.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: dynamically update UART speed when initializing
Mike Frysinger [Wed, 10 Dec 2008 17:33:54 +0000 (12:33 -0500)]
Blackfin: dynamically update UART speed when initializing

Previously, booting over the UART required the baud rate to be known ahead
of time.  Using a bit of tricky simple math, we can calculate the new board
rate based on the old divisors.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
15 years agoBlackfin: add support for fast SPI reads with Boot ROM
Mike Frysinger [Tue, 9 Dec 2008 22:21:08 +0000 (17:21 -0500)]
Blackfin: add support for fast SPI reads with Boot ROM

Newer Blackfin boot roms support using the fast SPI read command rather than
just the slow one.  If the functionality is available, then use it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15 years agoBlackfin: check for reserved settings in DDR MMRs
Mike Frysinger [Sun, 12 Oct 2008 01:46:52 +0000 (21:46 -0400)]
Blackfin: check for reserved settings in DDR MMRs

Some bits of the DDR MMRs should not be set.  If they do, bad things may
happen (like random failures or hardware destruction).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>