[U-Boot] [PATCH] ARM: dockstar: move start of environment area
The default dockstar configuration for U-Boot currently causes it to overrun the environment area, so that a "saveenv" command bricks the device. This patch moves the environment to a higher address to avoid that. Signed-off-by: Eric Cooper <e...@cmu.edu> --- include/configs/dockstar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index b27b202..d0d9d53 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -60,8 +60,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE0x2 /* 128k */ -#define CONFIG_ENV_ADDR0x6 -#define CONFIG_ENV_OFFSET 0x6 /* env starts here */ +#define CONFIG_ENV_ADDR0x8 +#define CONFIG_ENV_OFFSET 0x8 /* env starts here */ /* * Default environment variables -- 2.6.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] dockstar: include headers that were removed from kirkwood.h
Commit a7efd719f415833a833d6a8e46bcd470a0847ecc removed some #includes from kirkwood.h that must now be done in dockstar.c Signed-off-by: Eric Cooper e...@cmu.edu --- board/Seagate/dockstar/dockstar.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index cab3a83..9aab62d 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -27,6 +27,8 @@ #include common.h #include miiphy.h +#include asm/io.h +#include asm/arch/cpu.h #include asm/arch/kirkwood.h #include asm/arch/mpp.h #include dockstar.h -- 1.7.7 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] build fail for config_dockstar
On Sat, Oct 29, 2011 at 06:52:08PM +0200, Roland Kletzing wrote: i`m not 100% sure if this is not my fault (because of build environment), but as this does not happen with u-boot-2011.09.tar.bz2, i`m curious if current dockstar build is brocken in current git. [...] gcc -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x0060 -I/install/uboot-git/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /usr/lib/gcc/arm-linux-gnueabi/4.4.5/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5te -Wall -Wstrict-prototypes -fno-stack-protector -Wno-format-nonliteral -Wno-format-security -o dockstar.o dockstar.c -c dockstar.c: In function 'board_early_init_f': dockstar.c:43: warning: implicit declaration of function 'kw_config_gpio' dockstar.c: In function 'board_init': dockstar.c:113: warning: implicit declaration of function 'kw_sdram_bar' dockstar.c: In function 'set_leds': dockstar.c:161: warning: implicit declaration of function 'readl' dockstar.c:161: error: dereferencing pointer to incomplete type dockstar.c:162: warning: implicit declaration of function 'writel' dockstar.c:162: error: dereferencing pointer to incomplete type dockstar.c:163: error: dereferencing pointer to incomplete type dockstar.c:164: error: dereferencing pointer to incomplete type make[1]: *** [dockstar.o] Error 1 make[1]: Leaving directory `/install/uboot-git/u-boot/board/Seagate/dockstar' make: *** [board/Seagate/dockstar/libdockstar.o] Error 2 root@debian:/install/uboot-git/u-boot[mailto:root@debian:/install/uboot-git/u-boot]# I can confirm this failure. git bisect shows that the build was broken by this commit: a7efd719 ARM: kirkwood: reduce dependence of including platform file which patched a number of board files in the Marvell directory, but not the DockStar. It's a one-line patch, which will follow. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] dockstar: include headers that were removed from kirkwood.h
On Sat, Oct 29, 2011 at 09:41:45PM +0200, Anatolij Gustschin wrote: There is another similar patch also fixing compiler warning for mvgbe.c: http://patchwork.ozlabs.org/patch/122552/ Yes, please go ahead and use yours. I'd suggest moving the #includes in dockstar.c up a few lines, though, so that '#include dockstar.h' is the last one, to be consistent with other board files like sheevaplug.c etc. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] tftp command in default environments
Since tftpsrv is new, wouldn't it make sense to change it to srvtftp or something else that doesn't conflict with a common abbreviation? -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] .gitignore: update list of u-boot.* files and add *.bin
This patch adds additional u-boot.* files mentioned in Makefile, and adds *.bin since these are deleted as part of make clean. Signed-off-by: Eric Cooper e...@cmu.edu --- Changes since v1: Added more general *.bin pattern. .gitignore |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8ec3d06..34a2ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *~ *.swp *.patch +*.bin # # Top-level generic files @@ -23,14 +24,15 @@ /u-boot.hex /u-boot.imx /u-boot.map -/u-boot.bin /u-boot.srec /u-boot.ldr /u-boot.ldr.hex /u-boot.ldr.srec +/u-boot.img +/u-boot.kwb +/u-boot.sha1 +/u-boot.dis /u-boot.lds -/u-boot-onenand.bin -/u-boot-flexonenand.bin # # Generated files -- 1.7.4.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] .gitignore: update list of u-boot.* files
This patch adds additional u-boot.* files mentioned in Makefile, and removes one (u-boot-flexonenand.bin) that I couldn't find anywhere in the current tree. Signed-off-by: Eric Cooper e...@cmu.edu --- .gitignore |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 8ec3d06..b362990 100644 --- a/.gitignore +++ b/.gitignore @@ -28,9 +28,13 @@ /u-boot.ldr /u-boot.ldr.hex /u-boot.ldr.srec +/u-boot.img +/u-boot.kwb +/u-boot.sha1 +/u-boot.dis /u-boot.lds +/u-boot-nand.bin /u-boot-onenand.bin -/u-boot-flexonenand.bin # # Generated files -- 1.7.4.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 02/10] armv7: add miscellaneous utility macros
On Sun, May 15, 2011 at 03:15:46PM -0700, Simon Glass wrote: I believe that this problem is getting worse - e.g. USB on Tegra2 writes various fields of about 20 registers to get things up and running. I find translating SOC datasheet register definitions into C code with shifts and masks to be slow and error-prone work. Also we do need to maintain this code, and it gets reused for new SOC variants, etc. So it is not as if it is written once and then buried and forgotten. There is also a tendency to use 'magic' constants rather than #define values or something with a sensible name, then hopefully add a half-hearted comment. This requires constant return looks at the datasheet to see what bits were chosen. I have nothing against helper functions like this (although I think they should be inline functions, not macros, to guard against bugs due to side-effects in arguments). But wouldn't it be even better to define the registers as C structures containing bitfields, so the C compiler can do the error-prone shifting and masking? Well-commented structure definitions for these registers also eliminate the need to refer back to the datasheet when working on the code. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] understanding mkimage a bit more
On Fri, May 06, 2011 at 11:13:39AM -0700, Charles Krinke wrote: The next issue is the flash file system. Normally, I like to use JFFS2 for reliability as embedded devices frequently have their power switch turned off at any time. I do understand that UBIFS is getting more prevalent lately and I wonder if you or anyone else has a comment on the suitability of UBIFS in an environment where the power will be turned off and on exexpectdly and frequently. In googling UBIFS problems, I do see posts across the internet of UBIFS devices that will not boot after power is turned off and on. My experience with JFFS2 is that it has always recovered during boot with all the designs I have participated in over the last several years. Admiteddly, the act of doing something like scandisk on boot slows the boot down, but does seem to add reliability. It has been very resilient to power failures in my experience -- the Linux ubifs code has always managed to recover, and very quickly. The main pitfall is that U-Boot's support for ubifs is only the read-only subset of Linux's. That means it can read from a consistent ubifs partition, but not from one that needs repair (because that requires writing). So you can't rely on booting your Linux kernel *from a ubifs partition*. But if you have your kernel in a separate, read-only uImage partition you should be fine (it's just more annoying to update kernels). -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] understanding mkimage a bit more
On Fri, May 06, 2011 at 11:45:08AM -0700, Charles Krinke wrote: I understand a bit about setting up JFFS2 and have used drivers/mtd/maps for this purpose. I also understand that in setting up UBIFS, I will enable UBIFS in the linux kernel. But, on the flash, I am a little perplexed as I have not done this before. Can someone give me a few hints and clues about setting up the flash in the manner Eric describes, please? This page may help: https://wiki.xkyle.com/Install_Debian_Lenny_on_a_Seagate_Dockstar It has a description of how to set up a ubifs image (under Generate UBIFS IMage) and how to write a kernel and ubifs image to NAND flash (in step 5 of Get the DockStar Going). This all presumes that you have a partitioning scheme set up on your flash. If you're starting from scratch or completely overwriting someone else's firmware, you can set up whatever you want (you'll want to learn about the mtdparts kernel boot parameter). Otherwise, you can use the existing system to find out what it is (try cat /proc/mtd if it's running an embedded Linux). -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/6] mv-common.h: fix DRAM banks configuration
On Sun, May 01, 2011 at 05:04:02PM +0200, Simon Guinot wrote: --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -113,6 +113,9 @@ #define CONFIG_SYS_RESET_ADDRESS 0x /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +/* Include platform Common Definations */ +#include asm/arch/config.h + /* * DRAM Banks configuration, Custom config can be done in board.h */ @@ -124,9 +127,6 @@ #endif #endif /* CONFIG_NR_DRAM_BANKS */ -/* Include platform Common Definations */ -#include asm/arch/config.h - /* Include driver Common Definations */ /* * Common NAND configuration -- 1.6.3.1 You didn't fix the Definations typos in this one. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] boot-up time optimization. Where to start?
On Wed, Apr 27, 2011 at 03:39:18PM +0200, Simon Schwarz wrote: So here is my question: Where do you see the most potential to optimize u-boot? I already have two bullets on my list (just some ideas - maybe totally unrealistic *g*): - Use Hardware specific copy commands - build the checksum while moving the kernel to RAM This shouldn't be a matter of opinion/guess work. You should instrument U-Boot first and find out where the time is really being spent. Otherwise you run the classic risk of optimizing something that isn't really a problem. Good luck, I look forward to seeing the results of your analysis. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] repurposing uboot's console UART after booting
On Sat, Apr 23, 2011 at 06:03:46PM -0700, CAIannello wrote: After booting, I would like to use this UART for other things besides shells and U-Boot status. I want to attach custom peripherals to it instead. I tried killing the ttymxc0's shell process from my ssh session, but another one pops right up. This has nothing to do with U-Boot. Linux typically uses the file /etc/inittab to specify whether to spawn login processes on serial lines. Look at that, along with the Linux man page for init. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Policy for checkpatch usage?
On Thu, Apr 21, 2011 at 04:29:17PM +0200, Detlev Zundel wrote: What about the problem with checkpatch errors in current code, i.e. the origin of this sentence: Also warnings produced for context lines (i.e. existing code) rather than actual changes can also be ignored. How about replacing it with this: If you encounter warnings for existing code, not modified by your patch, consider submitting a separate, cosmetic-only patch -- clearly described as such -- that *precedes* your substantive patch. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Policy for checkpatch usage?
On Thu, Apr 21, 2011 at 04:56:36PM +0200, Fabian Cenedese wrote: Is that even possible? The cosmetic patch itself will be surrounded by context lines which may fire up a warning. So these lines need to be changed as well to satisy checkpatch. But this new patch will again include several context lines... until you have to fix up the whole file. Or did I misunderstand? What's wrong with (cosmetically) fixing all the files that a patch touches? That way the project gets incremental cleanup of the code base as it evolves. (It would be easy to automate a check for whitespace-only patches to ease the job of the custodians. Line-breaking and other style changes might still require eyeballing.) -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] problem running u-boot from RAM
On Sun, Apr 17, 2011 at 09:42:31AM +0200, Wolfgang Denk wrote: http://www.denx.de/wiki/view/DULG/CanUBootBeConfiguredSuchThatItCanBeStartedInRAM OK, thanks. But I'd still like to figure out why it works fine when loaded into RAM via JTAG, after u-boot has already initialized the machine in the same way. Cheers, Eric -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] problem running u-boot from RAM
I'm encountering a strange problem trying to run recent versions of u-boot from RAM on my DockStar. I have version 2011.03 in NAND flash, and it boots OK and launches Linux OK. But if I use it to load u-boot.bin into RAM (at TEXT_BASE = 0x60) and type go 60, it hangs soon after the relocation step. I've checked using crc32 that the image is correct in RAM, and I've used both tftpboot and fatload, with identical results. But here's the strange part: if I use openocd to load the same image to the same location using JTAG, and do resume 0x60, it works correctly. I'm not sure what the difference could be. Does anyone have any ideas? It's a lot more convenient to use TFTP to test out new images than JTAG, so I'd like to get this working. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: Add comments why -msoft-float is used.
On Sun, Feb 20, 2011 at 11:20:07AM +0100, Wolfgang Denk wrote: [...] or feel free to create a doc/README.toolchain or similar that can then also be used to document things like linker options, information about known issues, etc. +1 for a README.toolchain file. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Using an initramfs in SDRAM
On Thu, Feb 17, 2011 at 09:38:23AM -0500, Boswell, Patrick wrote: What bootargs should I pass to have a JTAG preloaded initramfs in SDRAM be used by a booting Linux (2.6.32) kernel for an Android boot system? Unless I'm misunderstanding your question, you can convert your initramfs image into a uInitrd (with mkimage), use u-boot to load that into memory (from MMC or whatever), and then pass its address as the second argument to bootm. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4] Seagate FreeAgent DockStar support
start with sheevaplug configuration add modifications by Alexander Holler hol...@ahsoftware.de change RAM definitions to one bank (128 MB) change ident string and prompt change environment to 0xA define MTD partitions and default environment variables add support for LEDs Signed-off-by: Eric Cooper e...@cmu.edu --- Changes for v2: - rebased on master, post ARM and kirkwood relocation changes - squashed into single commit Changes for v3: - moved files to board/Seagate/dockstar/ and updated copyright notices - removed dockstar entry from MAKEALL - moved CONFIG_SYS_TEXT_BASE from config.mk to include/configs/dockstar.h - corrected comment in board/Seagate/dockstar/kwbimage.cfg Changes for v4: - moved dockstar entry in boards.cfg to conform to intended sort order (other entries to be re-ordered in a subsequent patch) MAINTAINERS |4 + board/Seagate/dockstar/Makefile | 54 +++ board/Seagate/dockstar/dockstar.c | 181 +++ board/Seagate/dockstar/dockstar.h | 44 + board/Seagate/dockstar/kwbimage.cfg | 165 +++ boards.cfg |1 + include/configs/dockstar.h | 125 7 files changed, 574 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/dockstar/Makefile create mode 100644 board/Seagate/dockstar/dockstar.c create mode 100644 board/Seagate/dockstar/dockstar.h create mode 100644 board/Seagate/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h diff --git a/MAINTAINERS b/MAINTAINERS index 9258cb1..9bf52fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -591,6 +591,10 @@ Po-Yu Chuang ratb...@faraday-tech.com a320evb FA526 (ARM920T-like) (a320 SoC) +Eric Cooper e...@cmu.edu + + dockstarARM926EJS (Kirkwood SoC) + George G. Davis gda...@mvista.com assabet SA1100 diff --git a/board/Seagate/dockstar/Makefile b/board/Seagate/dockstar/Makefile new file mode 100644 index 000..bfcc6d9 --- /dev/null +++ b/board/Seagate/dockstar/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2010 Eric C. Cooper e...@cmu.edu +# +# Based on sheevaplug/Makefile originally written by +# Prafulla Wadaskar prafu...@marvell.com +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS := dockstar.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c new file mode 100644 index 000..cab3a83 --- /dev/null +++ b/board/Seagate/dockstar/dockstar.c @@ -0,0 +1,181 @@ +/* + * Copyright (C) 2010 Eric C. Cooper e...@cmu.edu + * + * Based on sheevaplug.c originally written by + * Prafulla Wadaskar prafu...@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software
[U-Boot] [PATCH v5] Seagate FreeAgent DockStar support
start with sheevaplug configuration add modifications by Alexander Holler hol...@ahsoftware.de change RAM definitions to one bank (128 MB) change ident string and prompt define MTD partitions and default environment variables add support for LEDs Signed-off-by: Eric Cooper e...@cmu.edu --- Changes for v2: - rebased on master, post ARM and kirkwood relocation changes - squashed into single commit Changes for v3: - moved files to board/Seagate/dockstar/ and updated copyright notices - removed dockstar entry from MAKEALL - moved CONFIG_SYS_TEXT_BASE from config.mk to include/configs/dockstar.h - corrected comment in board/Seagate/dockstar/kwbimage.cfg Changes for v4: - moved dockstar entry in boards.cfg to conform to intended sort order (other entries to be re-ordered in a subsequent patch) Changes for v5: - changed environment address to 0x6 MAINTAINERS |4 + board/Seagate/dockstar/Makefile | 54 +++ board/Seagate/dockstar/dockstar.c | 181 +++ board/Seagate/dockstar/dockstar.h | 44 + board/Seagate/dockstar/kwbimage.cfg | 165 +++ boards.cfg |1 + include/configs/dockstar.h | 125 7 files changed, 574 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/dockstar/Makefile create mode 100644 board/Seagate/dockstar/dockstar.c create mode 100644 board/Seagate/dockstar/dockstar.h create mode 100644 board/Seagate/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h diff --git a/MAINTAINERS b/MAINTAINERS index 9258cb1..9bf52fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -591,6 +591,10 @@ Po-Yu Chuang ratb...@faraday-tech.com a320evb FA526 (ARM920T-like) (a320 SoC) +Eric Cooper e...@cmu.edu + + dockstarARM926EJS (Kirkwood SoC) + George G. Davis gda...@mvista.com assabet SA1100 diff --git a/board/Seagate/dockstar/Makefile b/board/Seagate/dockstar/Makefile new file mode 100644 index 000..bfcc6d9 --- /dev/null +++ b/board/Seagate/dockstar/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2010 Eric C. Cooper e...@cmu.edu +# +# Based on sheevaplug/Makefile originally written by +# Prafulla Wadaskar prafu...@marvell.com +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS := dockstar.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c new file mode 100644 index 000..cab3a83 --- /dev/null +++ b/board/Seagate/dockstar/dockstar.c @@ -0,0 +1,181 @@ +/* + * Copyright (C) 2010 Eric C. Cooper e...@cmu.edu + * + * Based on sheevaplug.c originally written by + * Prafulla Wadaskar prafu...@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program
Re: [U-Boot] [PATCH v3] Seagate FreeAgent DockStar support
On Sun, Nov 21, 2010 at 09:37:18PM -0800, Prafulla Wadaskar wrote: diff --git a/board/Seagate/dockstar/kwbimage.cfg b/board/Seagate/dockstar/kwbimage.cfg [...] Are the contents for this file exactly same as sheevaplug/kwbimage.cfg? If yes then you can reuse that file and avoid adding this file here by using configuration in board config file. No, they're different (DockStar has 128M of RAM vs. SheevaPlug's 256M.) diff --git a/boards.cfg b/boards.cfg index 08e531e..50e9d1b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -376,6 +376,7 @@ guruplugarm arm926ejs - Marvell kirkwood mv88f6281gtw_gearm arm926ejs - Marvell kirkwood openrd_basearm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood +dockstar arm arm926ejs - Seagate Kirkwood Please check if you have missed to maintain this in order I couldn't figure out the intended sort order of the current file. The comment at the top (about using a sort command) doesn't seem to match the contents at all, and there are already several arm926ejs and kirkwood boards in various places. I'm happy to move this, but please specify exactly where :-) +#define CONFIG_ENV_SIZE0x2 /* 128k */ +#define CONFIG_ENV_ADDR0xA +#define CONFIG_ENV_OFFSET 0xA /* env starts here */ u-boot.bin is not more than 0x6, its better to use env offset at 0x6 to pack u-boot+env in first 512kb The factory partitioning uses 1M for u-boot, so I wasn't paying attention to saving space. But I'll move it down as you suggest. Thanks for the feedback. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3] Seagate FreeAgent DockStar support
start with sheevaplug configuration add modifications by Alexander Holler hol...@ahsoftware.de change RAM definitions to one bank (128 MB) change ident string and prompt change environment to 0xA define MTD partitions and default environment variables add support for LEDs Signed-off-by: Eric Cooper e...@cmu.edu --- Changes for v2: - rebased on master, post ARM and kirkwood relocation changes - squashed into single commit Changes for v3: - moved files to board/Seagate/dockstar/ and updated copyright notices - removed dockstar entry from MAKEALL - moved CONFIG_SYS_TEXT_BASE from config.mk to include/configs/dockstar.h - corrected comment in board/Seagate/dockstar/kwbimage.cfg MAINTAINERS |4 + board/Seagate/dockstar/Makefile | 54 +++ board/Seagate/dockstar/dockstar.c | 181 +++ board/Seagate/dockstar/dockstar.h | 44 + board/Seagate/dockstar/kwbimage.cfg | 165 +++ boards.cfg |1 + include/configs/dockstar.h | 125 7 files changed, 574 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/dockstar/Makefile create mode 100644 board/Seagate/dockstar/dockstar.c create mode 100644 board/Seagate/dockstar/dockstar.h create mode 100644 board/Seagate/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h diff --git a/MAINTAINERS b/MAINTAINERS index 9258cb1..9bf52fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -591,6 +591,10 @@ Po-Yu Chuang ratb...@faraday-tech.com a320evb FA526 (ARM920T-like) (a320 SoC) +Eric Cooper e...@cmu.edu + + dockstarARM926EJS (Kirkwood SoC) + George G. Davis gda...@mvista.com assabet SA1100 diff --git a/board/Seagate/dockstar/Makefile b/board/Seagate/dockstar/Makefile new file mode 100644 index 000..bfcc6d9 --- /dev/null +++ b/board/Seagate/dockstar/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2010 Eric C. Cooper e...@cmu.edu +# +# Based on sheevaplug/Makefile originally written by +# Prafulla Wadaskar prafu...@marvell.com +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).o + +COBJS := dockstar.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c new file mode 100644 index 000..cab3a83 --- /dev/null +++ b/board/Seagate/dockstar/dockstar.c @@ -0,0 +1,181 @@ +/* + * Copyright (C) 2010 Eric C. Cooper e...@cmu.edu + * + * Based on sheevaplug.c originally written by + * Prafulla Wadaskar prafu...@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor www.marvell.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include common.h +#include miiphy.h +#include asm/arch
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
On Mon, Nov 15, 2010 at 03:15:53PM +0100, Daniel Hobi wrote: Did you locally fix arch/arm/cpu/arm926ejs/kirkwood/timer.c to not access uninitialized data (variables timestamp and lastdec) before relocation? I didn't before, but now I have made that change (moved the static vars in timer.c to global_data and reference them via gd). But I get the same behavior (freezing after printing NAND: ). Then I rebuilt my branch with the partial-linking patch applied, but rebased on today's master, and now that fails in the same way. So there's some low-level thing going on that unrelated changes in the source code or build process seem to trigger. Different link order, code placement, phase of moon, ...? I have a JTAG setup, but so far I've only used it to re-load u-boot to RAM after a flashing a bad image. If anyone can give me a clue how to use it with gdb to debug what's going on, please let me know. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
On Wed, Nov 10, 2010 at 08:53:03AM +0100, Albert ARIBAUD wrote:
Can you make the ELF images available? I'll do the readlf/objdump
analysis and feed back on what I find.
I've uploaded them here:
http://www.cs.cmu.edu/~ecc/u-boot.{good,bad}
Thanks.
--
Eric Cooper e c c @ c m u . e d u
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V4 1/2] arm926ejs: fix linker file for newer ld support
I have been periodically rebasing my patches for the Seagate DockStar on master. But ever since the elf_reloc changes were merged, I have been unable to get a working build. First I saw symptoms similar to what Alexander Holler reported (failing during NAND initialization due to incorrect BSS relocation), but the latest arm926ejs ld script patches did not fix it. The system would hang here: U-Boot 2010.12-rc1 (Nov 09 2010 - 17:52:38) Seagate FreeAgent DockStar SoC: Kirkwood 88F6281_A0 DRAM: 128 MiB NAND: This was built with the CodeSourcery 2010q1 toolchain. I also included Alexander's patch to double-check the relocation, and no error message gets printed. Today, I decided to try out Sebastien Carlier's patch to change to partial linking, and to my surprise it now works. I have the two ELF images in case anyone can suggest what I should look for to see why one is working and the other isn't. But I don't know much about interpreting readelf or objdump output. Also, I'd like to resubmit the latest version of the DockStar patch to the list. Should I base it on the partial-linking patch, or on master (knowing that it may not produce a working build in this case)? -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Most ARM CPU's have buggy clear_bss?
On Wed, Oct 27, 2010 at 10:26:06AM +0300, Darius Augulis wrote: Maybe it could be reason why I'm facing strange problem, when after relocating uboot with nand_spl no one command is not working. I debugged that command table is empty. Maybe this is the same problem I reported here (commands not found): http://lists.denx.de/pipermail/u-boot/2010-October/080198.html -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] kirkwood: commands not found after elf_reloc merge
After rebasing my dockstar patches on master (fff6ec3), none of the top level commands are found: U-Boot 2010.09-dirty (Oct 24 2010 - 21:04:07) Seagate FreeAgent DockStar U-Boot code: 0060 - 00659F44 BSS: - 0069FF20 SoC: Kirkwood 88F6281_A0 monitor len: 0009FF20 ramsize: 0800 TLB table at: 07ff Top of RAM usable for U-Boot at: 07ff Reserving 639k for U-Boot at: 07f5 Reserving 1152k for malloc() at: 07e3 Reserving 48 Bytes for Board Info at: 07e2ffd0 Reserving 92 Bytes for Global Data at: 07e2ff74 New Stack Pointer is: 07e2ff70 RAM Configuration: Bank #0: 128 MiB Bank #1: 0 Bytes Bank #2: 0 Bytes Bank #3: 0 Bytes relocation Offset is: 0795 monitor flash len: 00059F44 Now running in RAM - U-Boot at: 07f5 NAND: 256 MiB In:serial Out: serial Err: serial Net: egiga0 Reset Ethernet PHY 88E1116 Initialized on egiga0 Hit any key to stop autoboot: 3 2 0 DockStar version Unknown command 'version' - try 'help' DockStar help Unknown command 'help' - try 'help' DockStar The previous version, based on 1ba91ba, works fine: U-Boot 2010.09-dirty (Oct 24 2010 - 21:16:34) Seagate FreeAgent DockStar U-Boot code: 0060 - 00658184 BSS: - 0069E000 SoC: Kirkwood 88F6281_A0 monitor len: 0009E000 ramsize: 0800 TLB table at: 07ff Top of RAM usable for U-Boot at: 07ff Reserving 632k for U-Boot at: 07f52000 Reserving 1152k for malloc() at: 07e32000 Reserving 48 Bytes for Board Info at: 07e31fd0 Reserving 92 Bytes for Global Data at: 07e31f74 New Stack Pointer is: 07e31f70 RAM Configuration: Bank #0: 128 MiB Bank #1: 0 Bytes Bank #2: 0 Bytes Bank #3: 0 Bytes relocation Offset is: 07952000 monitor flash len: 00058184 Now running in RAM - U-Boot at: 07f52000 NAND: 256 MiB In:serial Out: serial Err: serial Net: egiga0 Reset Ethernet PHY 88E1116 Initialized on egiga0 Hit any key to stop autoboot: 3 2 0 Marvell version U-Boot 2010.09-dirty (Oct 24 2010 - 21:16:34) Seagate FreeAgent DockStar Marvell I suspect something related to the recent merge with the elf_reloc branch. Does this problem occur on anyone else's kirkwood board since then? -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] Seagate FreeAgent DockStar support
On Wed, Oct 20, 2010 at 09:52:31PM -0700, Prafulla Wadaskar wrote: This is not Marvell owned board, so it must go in board/Seagate or board/dockstar folder board/Seagate/dockstar/ would be my preference, since there are similar products like the Go Flex that might go in board/Seagate/ someday. Any problem with this, given that I am not affiliated with Seagate in any way? -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] retrieve proposed patches from mailing list archives?
I sometimes want to try out a patch that has been proposed on the mailing list. If I no longer have the email in my mailbox, and it hasn't been applied to one of the uboot-*.git trees yet, my only option seems to be to scrape it from the mailman archives, which makes it difficult to use git am ... for example. Is there some other way to get the patches or raw emails that I'm missing? -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] retrieve proposed patches from mailing list archives?
On Thu, Oct 21, 2010 at 06:19:20PM -0400, Mike Frysinger wrote: gmane has a news gateway And right after I posted my question (naturally) I found that the archive at marc.infohttp://marc.info/?l=u-boot offers an option to download raw messages. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Kirkwood: bugfix: broken early console messages
I can confirm that this patch solves the problem on the dockstar hardware. Minor: there was incorrect extra whitespace in this line: #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits*/ Should be: #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */ Thanks. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] Seagate FreeAgent DockStar support
start with sheevaplug configuration add modifications by Alexander Holler hol...@ahsoftware.de change RAM definitions to one bank (128 MB) change ident string change environment to 0xA define MTD partitions and default environment variables add support for LEDs Signed-off-by: Eric Cooper e...@cmu.edu --- Changes for v2: - rebased on master, post ARM and kirkwood relocation changes - squashed into single commit Pending patches that this depends on: Gray Remlin: kirkwood: Fix uninitialised DRAM struct Prafulla Wadaskar: Kirkwood: bugfix: broken early console messages MAINTAINERS |4 + MAKEALL |1 + board/Marvell/dockstar/Makefile | 51 ++ board/Marvell/dockstar/config.mk| 28 ++ board/Marvell/dockstar/dockstar.c | 178 +++ board/Marvell/dockstar/dockstar.h | 41 board/Marvell/dockstar/kwbimage.cfg | 162 +++ boards.cfg |1 + include/configs/dockstar.h | 119 +++ 9 files changed, 585 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/dockstar/Makefile create mode 100644 board/Marvell/dockstar/config.mk create mode 100644 board/Marvell/dockstar/dockstar.c create mode 100644 board/Marvell/dockstar/dockstar.h create mode 100644 board/Marvell/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h diff --git a/MAINTAINERS b/MAINTAINERS index 5108c54..0a25971 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -585,6 +585,10 @@ Po-Yu Chuang ratb...@faraday-tech.com a320evb FA526 (ARM920T-like) (a320 SoC) +Eric Cooper e...@cmu.edu + + dockstarARM926EJS (Kirkwood SoC) + George G. Davis gda...@mvista.com assabet SA1100 diff --git a/MAKEALL b/MAKEALL index c1f3842..83679b4 100755 --- a/MAKEALL +++ b/MAKEALL @@ -327,6 +327,7 @@ LIST_ARM9= \ cp966 \ da830evm\ da850evm\ + dockstar\ edb9301 \ edb9302 \ edb9302a\ diff --git a/board/Marvell/dockstar/Makefile b/board/Marvell/dockstar/Makefile new file mode 100644 index 000..da9d29e --- /dev/null +++ b/board/Marvell/dockstar/Makefile @@ -0,0 +1,51 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# Written-by: Prafulla Wadaskar prafu...@marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS := dockstar.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/Marvell/dockstar/config.mk b/board/Marvell/dockstar/config.mk new file mode 100644 index 000..761c2bb --- /dev/null +++ b/board/Marvell/dockstar/config.mk @@ -0,0 +1,28 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# Written-by: Prafulla Wadaskar prafu...@marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
Maybe, Eric (added to cc: ) should also try to do early things (like kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3? I will try this and let you know. But the most helpful data point for me would be whether display_banner etc. currently works on a SheevaPlug, which is almost identical to the DockStar. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
--- Makefile |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 30a564d..a3136da 100644 --- a/Makefile +++ b/Makefile @@ -341,7 +341,7 @@ $(obj)u-boot.imx: $(obj)u-boot.bin $(obj)u-boot.kwb: $(obj)u-boot.bin $(obj)tools/mkimage -n $(KWD_CONFIG) -T kwbimage \ - -a $(CONFIG_SYS_TEXT_BASE) -e $(TEXT_BASE) -d $ $@ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $ $@ $(obj)u-boot.sha1: $(obj)u-boot.bin $(obj)tools/ubsha1 $(obj)u-boot.bin -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Makefile: rename TEXT_BASE to CONFIG_SYS_TEXT_BASE
Please ignore, the same patch was submitted earlier today by Gray Remlin. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Kirkwood: no console messages from init_sequence?
On Sun, Oct 17, 2010 at 08:40:31PM -0400, Eric Cooper wrote: I no longer see any of the early console messages that should result from display_banner, print_cpuinfo, etc. The first thing I see is the NAND information: [...] But if I load the same u-boot image into memory and execute it with go, I see the entire banner, DRAM message, etc. So the problem only occurs when it is booting from NAND flash. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Kirkwood: no console messages from init_sequence?
I rebased my dockstar patches on master, after the recent ARM relocation support for kirkwood had been merged. I no longer see any of the early console messages that should result from display_banner, print_cpuinfo, etc. The first thing I see is the NAND information: Marvell reset resetting ... NAND: 256 MiB In:serial Out: serial Err: serial Net: egiga0 [...] (I see the same behavior on a cold start, not just a reset.) Can someone with another kirkwood board please check whether they see this behavior also, or did I somehow break something when I rebased? Thanks. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/5] Add support for Seagate FreeAgent DockStar
On Mon, Sep 27, 2010 at 11:07:52AM +0200, Thomas Weber wrote: can you rework your patch set and send v2? Or do you need help? I was going to wait until the sheevaplug or guruplug boards had been modified for the ARM relocation changes and then base my v2 on that. I don't really know enough about the hardware to do it myself, and since I don't have a JTAG environment ready in case I mess it up, I don't really want to experiment :-) -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] request for ubifs recovery support
I've configured my device (a Seagate DockStar) with just two NAND flash partitions -- one for u-boot and one for the Linux rootfs. This has some nice advantages: it maximizes the available flash space, and allows the Linux distribution's own tools to install new kernel and initramfs files without having to know about flash partitions. But I just discovered that it has a fatal disadvantage. My device can't reboot when the ubifs is corrupted, which happened today after a power failure: UBIFS: recovery needed Error reading superblock on volume 'ubi:root'! Ubifs includes recovery code, but since u-boot treats it as a read-only mount, this is never performed. Once I booted Linux, everything was fine. I'd like to request that the read-only flag be removed (at least to allow recovery) so that the ubifs-only scheme can be used reliably. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/5] add DOCKSTAR machine type
Signed-off-by: Eric Cooper e...@cmu.edu --- arch/arm/include/asm/mach-types.h | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index fd28d2b..e0b6090 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -2946,6 +2946,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_NETVIZ 2964 #define MACH_TYPE_FLEXIBITY2965 #define MACH_TYPE_WLAN_COMPUTER2966 +#define MACH_TYPE_DOCKSTAR 2998 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -38155,6 +38156,18 @@ extern unsigned int __machine_arch_type; # define machine_is_wlan_computer()(0) #endif +#ifdef CONFIG_MACH_DOCKSTAR +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type__machine_arch_type +# else +# define machine_arch_typeMACH_TYPE_DOCKSTAR +# endif +# define machine_is_dockstar() (machine_arch_type == MACH_TYPE_DOCKSTAR) +#else +# define machine_is_dockstar() (0) +#endif + /* * These have not yet been registered */ -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/5] Add support for Seagate FreeAgent DockStar
This patch series adds support for the Seagate FreeAgent DockStar. The DockStar is almost identical to the Marvell SheevaPlug, but has 256M of NAND flash, 128M of SDRAM, and different LED pins. A new machine ID (2998) has already been registered for this device. Alexander Holler (2): DockStar: change RAM definitions to one bank (128 MB) DockStar: config Eric Cooper (3): add DOCKSTAR machine type DockStar: board support (derived from sheevaplug) DockStar: LED support arch/arm/include/asm/mach-types.h | 13 ++ board/Marvell/dockstar/Makefile | 51 board/Marvell/dockstar/config.mk| 28 + board/Marvell/dockstar/dockstar.c | 185 + board/Marvell/dockstar/dockstar.h | 41 +++ board/Marvell/dockstar/kwbimage.cfg | 162 ++ boards.cfg |1 + include/configs/dockstar.h | 217 +++ 8 files changed, 698 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/dockstar/Makefile create mode 100644 board/Marvell/dockstar/config.mk create mode 100644 board/Marvell/dockstar/dockstar.c create mode 100644 board/Marvell/dockstar/dockstar.h create mode 100644 board/Marvell/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/5] DockStar: change RAM definitions to one bank (128 MB)
From: Alexander Holler hol...@ahsoftware.de Signed-off-by: Eric Cooper e...@cmu.edu --- board/Marvell/dockstar/kwbimage.cfg | 162 +++ 1 files changed, 162 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/dockstar/kwbimage.cfg diff --git a/board/Marvell/dockstar/kwbimage.cfg b/board/Marvell/dockstar/kwbimage.cfg new file mode 100644 index 000..46d504c --- /dev/null +++ b/board/Marvell/dockstar/kwbimage.cfg @@ -0,0 +1,162 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor www.marvell.com +# Written-by: Prafulla Wadaskar prafu...@marvell.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM nand +NAND_ECC_MODE default +NAND_PAGE_SIZE 0x0800 + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1b1b1b9b + +#Dram initalization for SINGLE x16 CL=5 @ 400MHz +DATA 0xFFD01400 0x43000c30 # DDR Configuration register +# bit13-0: 0xc30 (3120 DDR2 clks refresh rate) +# bit23-14: zero +# bit24: 1= enable exit self refresh mode on DDR access +# bit25: 1 required +# bit29-26: zero +# bit31-30: 01 + +DATA 0xFFD01404 0x37543000 # DDR Controller Control Low +# bit 4:0=addr/cmd in smame cycle +# bit 5:0=clk is driven during self refresh, we don't care for APX +# bit 6:0=use recommended falling edge of clk for addr/cmd +# bit14:0=input buffer always powered up +# bit18:1=cpu lock transaction enabled +# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0 +# bit27-24: 7= CL+2, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM +# bit30-28: 3 required +# bit31:0=no additional STARTBURST delay + +DATA 0xFFD01408 0x22125451 # DDR Timing (Low) (active cycles value +1) +# bit3-0: TRAS lsbs +# bit7-4: TRCD +# bit11- 8: TRP +# bit15-12: TWR +# bit19-16: TWTR +# bit20:TRAS msb +# bit23-21: 0x0 +# bit27-24: TRRD +# bit31-28: TRTP + +DATA 0xFFD0140C 0x0a33 # DDR Timing (High) +# bit6-0: TRFC +# bit8-7: TR2R +# bit10-9: TR2W +# bit12-11: TW2W +# bit31-13: zero required + +DATA 0xFFD01410 0x000d # DDR Address Control +# bit1-0: 00, Cs0width=x8 +# bit3-2: 11, Cs0size=1Gb +# bit5-4: 00, Cs1width=nonexistent +# bit7-6: 00, Cs1size =nonexistent +# bit9-8: 00, Cs2width=nonexistent +# bit11-10: 00, Cs2size =nonexistent +# bit13-12: 00, Cs3width=nonexistent +# bit15-14: 00, Cs3size =nonexistent +# bit16:0, Cs0AddrSel +# bit17:0, Cs1AddrSel +# bit18:0, Cs2AddrSel +# bit19:0, Cs3AddrSel +# bit31-20: 0 required + +DATA 0xFFD01414 0x # DDR Open Pages Control +# bit0:0, OpenPage enabled +# bit31-1: 0 required + +DATA 0xFFD01418 0x # DDR Operation +# bit3-0: 0x0, DDR cmd +# bit31-4: 0 required + +DATA 0xFFD0141C 0x0C52 # DDR Mode +# bit2-0: 2, BurstLen=2 required +# bit3: 0, BurstType=0 required +# bit6-4: 4, CL=5 +# bit7: 0, TestMode=0 normal +# bit8: 0, DLL reset=0 normal +# bit11-9: 6, auto-precharge write recovery +# bit12:0, PD must be zero +# bit31-13: 0 required + +DATA 0xFFD01420 0x0040 # DDR Extended Mode +# bit0:0, DDR DLL enabled +# bit1:0, DDR drive strenght normal +# bit2:0, DDR ODT control lsd (disabled) +# bit5-3: 000, required +# bit6:1, DDR ODT control msb, (disabled) +# bit9-7: 000, required +# bit10: 0, differential DQS enabled +# bit11: 0, required +# bit12: 0, DDR output buffer enabled +# bit31-13: 0 required + +DATA 0xFFD01424 0xF17F # DDR Controller Control High +# bit2-0: 111, required +# bit3 : 1 , MBUS Burst Chop disabled +# bit6-4: 111, required +# bit7 : 0 +# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq = 300MHz +# bit9 : 0 , no half clock cycle addition to dataout +# bit10 : 0 , 1/4 clock cycle skew enabled for addr/ctl signals +# bit11 : 0 , 1/4 clock cycle skew disabled for write mesh +# bit15-12: required +# bit31-16: 0required + +DATA 0xFFD01428
[U-Boot] [PATCH 2/5] DockStar: board support (derived from sheevaplug)
Signed-off-by: Eric Cooper e...@cmu.edu
---
board/Marvell/dockstar/Makefile | 51
board/Marvell/dockstar/config.mk | 28 +++
board/Marvell/dockstar/dockstar.c | 155 +
board/Marvell/dockstar/dockstar.h | 41 ++
boards.cfg|1 +
5 files changed, 276 insertions(+), 0 deletions(-)
create mode 100644 board/Marvell/dockstar/Makefile
create mode 100644 board/Marvell/dockstar/config.mk
create mode 100644 board/Marvell/dockstar/dockstar.c
create mode 100644 board/Marvell/dockstar/dockstar.h
diff --git a/board/Marvell/dockstar/Makefile b/board/Marvell/dockstar/Makefile
new file mode 100644
index 000..da9d29e
--- /dev/null
+++ b/board/Marvell/dockstar/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2009
+# Marvell Semiconductor www.marvell.com
+# Written-by: Prafulla Wadaskar prafu...@marvell.com
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB= $(obj)lib$(BOARD).a
+
+COBJS := dockstar.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):$(obj).depend $(OBJS) $(SOBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend
+
+#
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#
diff --git a/board/Marvell/dockstar/config.mk b/board/Marvell/dockstar/config.mk
new file mode 100644
index 000..2bd9f79
--- /dev/null
+++ b/board/Marvell/dockstar/config.mk
@@ -0,0 +1,28 @@
+#
+# (C) Copyright 2009
+# Marvell Semiconductor www.marvell.com
+# Written-by: Prafulla Wadaskar prafu...@marvell.com
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+TEXT_BASE = 0x0060
+
+# Kirkwood Boot Image configuration file
+KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
diff --git a/board/Marvell/dockstar/dockstar.c
b/board/Marvell/dockstar/dockstar.c
new file mode 100644
index 000..13cd347
--- /dev/null
+++ b/board/Marvell/dockstar/dockstar.c
@@ -0,0 +1,155 @@
+/*
+ * (C) Copyright 2009
+ * Marvell Semiconductor www.marvell.com
+ * Written-by: Prafulla Wadaskar prafu...@marvell.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include common.h
+#include miiphy.h
+#include asm/arch/kirkwood.h
+#include asm/arch/mpp.h
+#include dockstar.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_init(void)
+{
+ /*
+* default gpio configuration
+* There are maximum
[U-Boot] [PATCH 5/5] DockStar: LED support
derived from patches posted by Jeff Doozan
in the uBoot forum at http://forum.doozan.com
Signed-off-by: Eric Cooper e...@cmu.edu
---
board/Marvell/dockstar/dockstar.c | 30 ++
include/configs/dockstar.h|1 -
2 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/board/Marvell/dockstar/dockstar.c
b/board/Marvell/dockstar/dockstar.c
index 13cd347..7788837 100644
--- a/board/Marvell/dockstar/dockstar.c
+++ b/board/Marvell/dockstar/dockstar.c
@@ -153,3 +153,33 @@ void reset_phy(void)
printf(88E1116 Initialized on %s\n, name);
}
#endif /* CONFIG_RESET_PHY_R */
+
+#define GREEN_LED (1 14)
+#define ORANGE_LED (1 15)
+#define BOTH_LEDS (GREEN_LED | ORANGE_LED)
+#define NEITHER_LED0
+
+static void set_leds(u32 leds, u32 blinking)
+{
+ struct kwgpio_registers *r = (struct kwgpio_registers *)KW_GPIO1_BASE;
+ u32 oe = readl(r-oe) | BOTH_LEDS;
+ writel(oe ~leds, r-oe); /* active low */
+ u32 bl = readl(r-blink_en) ~BOTH_LEDS;
+ writel(bl | blinking, r-blink_en);
+}
+
+void show_boot_progress(int val)
+{
+ switch (val) {
+ case 15:/* booting Linux */
+ set_leds(BOTH_LEDS, NEITHER_LED);
+ break;
+ case 64:/* Ethernet initialization */
+ set_leds(GREEN_LED, GREEN_LED);
+ break;
+ default:
+ if (val 0)/* error */
+ set_leds(ORANGE_LED, ORANGE_LED);
+ break;
+ }
+}
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index a1a97a3..ecd5f27 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -181,7 +181,6 @@
#define CONFIG_NET_MULTI /* specify more that one ports available */
#defineCONFIG_MII /* expose smi ove miiphy interface */
#define CONFIG_MVGBE /* Enable Marvell Gbe Controller Driver */
-#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN/* detect link using phy */
#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR0
#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */
--
1.7.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/5] DockStar: config
From: Alexander Holler hol...@ahsoftware.de
Change ident string.
Include long help messages.
Environment is at 0xa.
Define MTD partitions and default environment variables.
Signed-off-by: Eric Cooper e...@cmu.edu
---
include/configs/dockstar.h | 218
1 files changed, 218 insertions(+), 0 deletions(-)
create mode 100644 include/configs/dockstar.h
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
new file mode 100644
index 000..a1a97a3
--- /dev/null
+++ b/include/configs/dockstar.h
@@ -0,0 +1,218 @@
+/*
+ * (C) Copyright 2009
+ * Marvell Semiconductor www.marvell.com
+ * Written-by: Prafulla Wadaskar prafu...@marvell.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef _CONFIG_DOCKSTAR_H
+#define _CONFIG_DOCKSTAR_H
+
+/*
+ * Version number information
+ */
+#define CONFIG_IDENT_STRING\nSeagate FreeAgent DockStar
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_MARVELL 1
+#define CONFIG_ARM926EJS 1 /* Basic Architecture */
+#define CONFIG_FEROCEON_88FR1311 /* CPU Core subversion */
+#define CONFIG_KIRKWOOD1 /* SOC Family Name */
+#define CONFIG_KW88F6281 1 /* SOC Name */
+#define CONFIG_MACH_DOCKSTAR /* Machine type */
+
+#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */
+#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
+#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
+
+/*
+ * CLKs configurations
+ */
+#define CONFIG_SYS_HZ 1000
+
+/*
+ * NS16550 Configuration
+ */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE(-4)
+#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
+#define CONFIG_SYS_NS16550_COM1KW_UART0_BASE
+
+/*
+ * Serial Port configuration
+ * The following definitions let you select what serial you want to use
+ * for your console driver.
+ */
+
+#define CONFIG_CONS_INDEX 1 /*Console on UART0 */
+#define CONFIG_BAUDRATE115200
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \
+ 115200,230400, 460800, 921600 }
+/* auto boot */
+#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
+
+/*
+ * For booting Linux, the board info and command line data
+ * have to be in the first 8 MB of memory, since this is
+ * the maximum mapped by the Linux kernel during initialization.
+ */
+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
+#define CONFIG_INITRD_TAG 1 /* enable INITRD tag */
+#define CONFIG_SETUP_MEMORY_TAGS 1 /* enable memory tag */
+
+#defineCONFIG_SYS_PROMPT Marvell /* Command Prompt */
+#defineCONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */
+#defineCONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
+ +sizeof(CONFIG_SYS_PROMPT) + 16)/* Print Buff */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH/* Declare no flash (NOR/SPI) */
+#include config_cmd_default.h
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_SYS_LONGHELP
+
+/*
+ * NAND configuration
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_NAND_KIRKWOOD
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define NAND_MAX_CHIPS 1
+#define CONFIG_SYS_NAND_BASE 0xD800 /* KW_DEFADR_NANDF */
+#define NAND_ALLOW_ERASE_ALL 1
+#endif
+
+/*
+ * Environment variables configurations
+ */
+#ifdef CONFIG_CMD_NAND
+#define CONFIG_ENV_IS_IN_NAND 1
+#define CONFIG_ENV_SECT_SIZE 0x2 /* 128K */
+#else
+#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
+#endif
+/*
+ * max 4k env size is enough, but in case of nand
+ * it has to be rounded to sector size
+ */
+#define CONFIG_ENV_SIZE0x2 /* 128k
