diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /board/Marvell/common/memory.c | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'board/Marvell/common/memory.c')
| -rw-r--r-- | board/Marvell/common/memory.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/board/Marvell/common/memory.c b/board/Marvell/common/memory.c index 7fd635523..140060414 100644 --- a/board/Marvell/common/memory.c +++ b/board/Marvell/common/memory.c @@ -383,7 +383,7 @@ unsigned int memoryGetDeviceWidth (DEVICE device)  * OUTPUT:  *       None.  * RETURN: -*       False for invalid size, true otherwise. +*       false for invalid size, true otherwise.  *  * CAUTION: PCI_functions must be implemented later To_do !!!!!!!!!!!!!!!!!  * @@ -509,7 +509,7 @@ bool memoryMapBank (MEMORY_BANK bank, unsigned int bankBase,  *       None.  *  * RETURN: -*       False for invalid size, true otherwise. +*       false for invalid size, true otherwise.  *  * CAUTION: PCI_functions must be implemented later To_do !!!!!!!!!!!!!!!!!  * @@ -624,7 +624,7 @@ bool memoryMapDeviceSpace (DEVICE device, unsigned int deviceBase,  *       None.  *  * RETURN: -*       False for invalid size, true otherwise. +*       false for invalid size, true otherwise.  *  *******************************************************************************/  bool memorySetPciWindow (PCI_MEM_WINDOW pciWindow, unsigned int pciWindowBase, @@ -885,7 +885,7 @@ void gtMemorySetInternalSramBaseAddr (unsigned int sramBaseAddress)  *       None.  *  * RETURN: -*       False for invalid size, true otherwise. +*       false for invalid size, true otherwise.  *  *******************************************************************************/  bool memorySetProtectRegion (MEMORY_PROTECT_WINDOW window, @@ -1380,7 +1380,7 @@ void MemoryEnableWindow (MEMORY_WINDOW window)  * OUTPUT:  *       None.  * RETURN: -*       True for a closed window, false otherwise . +*       true for a closed window, false otherwise .  *******************************************************************************/  MEMORY_WINDOW_STATUS MemoryGetMemWindowStatus (MEMORY_WINDOW window)  { |