summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tegra: Compulab TrimSlice board supportStephen Warren2012-07-076-0/+270
| | | | | Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: add SDMMC1 on SDIO1 funcmux entryStephen Warren2012-07-072-0/+8
| | | | | | | This will be used on TrimSlice. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: add SDIO1 funcmux entry for UARTALucas Stach2012-07-073-0/+8
| | | | | | | | | | | | | | | This is based on top of: tegra: add alternate UART1 funcmux entry tegra: add UART1 on GPU funcmux entry v2: remove enum change Signed-off-by: Lucas Stach <dev@lynxeye.de> Acked-by: Stephen Warren <swarren@wwwdotorg.org> CC: Stephen Warren <swarren@wwwdotorg.org> CC: Tom Warren <twarren@nvidia.com> CC: Marek Vasut <marex@denx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: sync SDIO1 pingroup enum name with TRMLucas Stach2012-07-072-4/+4
| | | | | | Signed-off-by: Lucas Stach <dev@lynxeye.de> CC: Tom Warren <twarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: add UART1 on GPU funcmux entryStephen Warren2012-07-073-1/+9
| | | | | | | TrimSlice uses UART1 on the GPU pingroup. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: seaboard: add support for USB networkingStephen Warren2012-07-071-0/+9
| | | | | Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: whistler: reduce and comment network cfg optionsStephen Warren2012-07-071-6/+4
| | | | | | | | | CONFIG_CMD_PING/NFS aren't required for Whistler to boot. Add some comments. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: flesh out bootcmdStephen Warren2012-07-079-3/+135
| | | | | | | | | | | | | | | | | | | | | | | | | This implements a useful bootcmd for Tegra. The boot order is: * If USB enabled, USB storage * Internal MMC (SD card or eMMC) * If networking is enabled, BOOTP/TFTP When booting from USB or MMC, the boot script is assumed to be in partition 1 (although this may be overridden via the rootpart variable), both ext2 and FAT filesystems are supported, the boot script may exist in either / or /boot, and the boot script may be named boot.scr.uimg or boot.scr. When booting over the network, it is assumed that boot.scr.uimg exists on the TFTP server. There is less flexibility here since those setting up network booting are expected to need less hand-holding. In all cases, it is expected that the initial file loaded is a U-Boot image containing a script that will load the kernel, load any required initrd, load any required DTB, and finally bootm the kernel. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGSStephen Warren2012-07-078-10/+0
| | | | | | | | | | | | | | | | console isn't used by anything, and the kernel should be set appropriately by whatever script is booting the kernel, not imposed by the bootloader. mem might be useful, but the current value is pretty bogus, since it includes nvmem options that make no sense for an upstream kernel, and equally should not be required for any downstream kernel. Either way, this is also best left to the kernel boot script. smpflag isn't used by anything, and again was probably intended to be a kernel command-line option better set by the kernel boot script. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: Whistler board supportStephen Warren2012-07-076-0/+323
| | | | | | | | | | | | | | | | | | | Whistler is a highly configurable Tegra evaluation and development board. This change adds support for the following specific configuration: E1120 motherboard E1108 CPU board E1116 PMU board The motherboard configuration switches are set as follows: SW1=0 SW2=0 SW3=5 S1/S2/S3/S4 all on, except S3 7/8 are off. Other combinations of daugher boards may work to varying degrees, but will likely require some SW adjustment. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: add alternate UART1 funcmux entryStephen Warren2012-07-073-2/+26
| | | | | | | | (In at least some configurations) Whistler uses UART1 on pingroups UAA, UAB. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* tegra: paz00: fix typo in SD slot CD detect GPIOStephen Warren2012-07-071-3/+3
| | | | | Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* spi: Tegra2: Seaboard: enable SPI/UART corruption fixTom Warren2012-07-071-0/+9
| | | | Signed-off-by: Tom Warren <twarren@nvidia.com>
* spi: Tegra2: Seaboard: fix UART corruption during SPI transactionsTom Warren2012-07-073-23/+21
| | | | | | | | | | | Simon Glass's proposal to fix this on Seaboard was NAK'd, so I removed his NS16550 references and added a small delay before SPI/UART muxing. Tested on my Seaboard with large SPI reads/writes and saw no corruption (crc's matched) and no spurious comm chars. Signed-off-by: Tom Warren <twarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Jimmy Zhang <jimmzhang@nvidia.com>
* tools/mkenvimage.c: fix basename(3) usageAndreas Bießmann2012-07-021-0/+1
| | | | | | | | | | | | | | | | | | | Use the POSIX variant of basename due to BSD systems (e.g. OS X) do not provide GNU version of basename(3). It is save to use the POSIX variant here cause we do never use argv[0] later on which may be modified by the basename(3) POSIX variant. On systems providing GNU variant the GNU variant should be used since string.h is included before libgen.h. Therefore let the _GNU_SOURCE as is. This patch fixes following warning (on OS X): ---8<--- mkenvimage.c: In function ‘main’: mkenvimage.c:105: warning: implicit declaration of function ‘basename’ mkenvimage.c:105: warning: assignment makes pointer from integer without a cast --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> cc: Keith Mok <ek9852@gmail.com>
* sh: ap_sh4a_4a: Fix wrong register initialization valueNobuhiro Iwamatsu2012-06-281-2/+2
| | | | | | | | The value of ET0_ERXD6 and GPSR1_INIT was wrong. This fixes them. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ext2load: increase read speedu-boot@lakedaemon.net2012-06-211-2/+24
| | | | | | | | | | | | | | | | This patch dramatically drops the amount of time u-boot needs to read a file from an ext2 partition. On a typical 2 to 5 MB file (kernels and initrds) it goes from tens of seconds to a couple seconds. All we are doing here is grouping contiguous blocks into one read. Boot tested on Globalscale Technologies Dreamplug (Kirkwood ARM SoC) with three different files. sha1sums were calculated in Linux userspace, and then confirmed after ext2load. Signed-off-by: Jason Cooper <u-boot@lakedaemon.net> Tested-by: Eric Nelson <eric.nelson@boundarydevices.com> Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
* pxe: add support for parsing local syslinux filesRob Herring2012-06-212-8/+139
| | | | | | | | Add a new command "sysboot" which parses syslinux menu files and boots using kernel and initrd specified by menu files. The operation is similar to "pxe boot" except local files on ext2 or fat filesystem are parsed. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* pxe: parse initrd file from append stringRob Herring2012-06-212-4/+14
| | | | | | | | For syslinux, the initrd can be set in the append string as "initrd=<file>", so try to find it there if we haven't already set the initrd. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* pxe: support absolute pathsRob Herring2012-06-211-11/+12
| | | | | | | | If the file path starts with a '/', then don't pre-pend the bootfile path. This fixes a problem with running 'pxe boot' multiple times where the bootfile path gets pre-pended to itself each time. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* pxe: support linux entries for labelsRob Herring2012-06-211-0/+3
| | | | | | | | Kernels can be specified using "linux" or "kernel" entry. The difference is kernel is supposed to detect the type of file, but for u-boot both are treated the same. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* pxe: add support for label menu textRob Herring2012-06-211-4/+9
| | | | | | Use a menu string if present, otherwise use the kernel string. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* pxe: support include files at top-levelRob Herring2012-06-211-0/+5
| | | | | | Include files outside of a menu were not getting included and parsed. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* menu: only timeout when menu is displayedRob Herring2012-06-211-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the menu timeout apply only when prompt flag is set and after the menu is displayed. This allows auto boot to work no matter whether prompt is set or cleared. Use the default selection if the menu times out. This also fixes the timeout value given to readline_into_buffer to be seconds instead of 10th of seconds. Old behavior: if prompt display menu and wait for choice else wait for timeout if key pressed display menu and wait for choice else exit command New behavior: if prompt display menu if key pressed wait for choice else boot default entry on timeout else boot default entry Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* checkpatch: add check for whitespace before semicolon at end-of-lineEric Nelson2012-06-211-0/+6
| | | | | | | | This tests for a bad habits of mine like this: return 0 ; Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
* Block: Remove MG DISK supportMarek Vasut2012-06-2118-1050/+1
| | | | | | | | This driver is unused and obsolete. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: unsik Kim <donari75@gmail.com>
* Strip fw_printenv like the other toolsLoïc Minier2012-06-211-0/+1
| | | | Signed-off-by: Loïc Minier <lool@debian.org>
* hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.cTom Rini2012-06-20265-450/+3
| | | | | | | | | | Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value different than "> " which is vision2. I have Cc'd the maintainer here as I strongly suspect this is a bug rather than intentional behavior. Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
* CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place thereTom Rini2012-06-20242-405/+17
| | | | | | | | | We provide a default table of { 9600, 19200, 38400, 57600, 115200 } in <config_fallbacks.h> which mkconfig places after <configs/...h> in the generated config file. This is used when a board has not set its own table. Signed-off-by: Tom Rini <trini@ti.com>
* patman: Handle creation of patman config fileVikram Narayanan2012-06-193-3/+55
| | | | | | | | | | | | | patman shouts when it couldn't find a $(HOME)/.patman file. Handle it in a sane way by creating a new one for the user. It looks for a user.name and user.email in the global .gitconfig file, waits for the user input if it can't find there. Update the same in the README Signed-off-by: Vikram Narayanan <vikram186@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Cc: Simon Glass <sjg@chromium.org> Cc: Wolfgang Denk <wd@denx.de>
* patman: Change the location of patman config fileVikram Narayanan2012-06-192-2/+2
| | | | | | | | | | Move the config file from ~/.config/patman to ~/.patman as it is more appropriate to have it there. Update the same in the README. Signed-off-by: Vikram Narayanan <vikram186@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Wolfgang Denk <wd@denx.de> Acked-by: Simon Glass <sjg@chromium.org>
* lmb: do not export anything without CONFIG_LMBMike Frysinger2012-06-191-0/+2
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* easylogo: add lzma supportMike Frysinger2012-06-191-29/+56
| | | | | | | | | | Compressing the logos with lzma rather than gzip saves ~9kb with the Blackfin 24bit images and ~3kb with the 16bit images. Add a new -l option to easylogo so people can pick lzma as their decompression routine. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* cmd_mem: cmp: convert while() to for() loopMike Frysinger2012-06-191-5/+2
| | | | | | | | Simplify the code slightly by using a for() loop since this is basically what we're already doing -- incrementing "ngood" to the value in "count". Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* cmd_mem: cmp: unify size code pathsMike Frysinger2012-06-191-33/+19
| | | | | | | | | | | | | | | | Not only does the source code get simpler, but it also shrinks the compiled object code too. While we're here, tweak the summary message to avoid the plural issue. It isn't that big of a deal, and it's currently wrong anyways in the single (1 byte) case: Total of 1 byte were the same Grammar wise, that should be "was" rather than "were". The new output people should be able to easily figure out: Total of 1 byte(s) were the same Total of 10 byte(s) were the same Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* cmd_mem: replace custom PRINTF() with debug()Mike Frysinger2012-06-191-9/+3
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2012-06-1915-323/+461
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mpc83xx: km/common: check test_bank and testpin for testboot powerpc/83xx/km: readout dip_switch on kmcoge5ne powerpc/83xx: configure CONFIG_POST for kmcoge5ne powerpc/83xx/km: added missing enable of application buffer km/common: increase bootlimit to 3 km/common: fixed error in ethaddr (1-byte-shift) MAINTAINERS: cleanup for keymile boards powerpc/83xx: add kmcoge5ne board support km/common: add support for second flash powerpc83xx/km: remove unneeded CONFIG_PCI for kmeter1 powerpc83xx/km: lock the window size to 2GiB befor fixing sdram size powerpc/83xx/km: use tuxx1.h for kmsupx5 target powerpc/83xx: increment malloc heap size for the MPC832x MDS boards Signed-off-by: Wolfgang Denk <wd@denx.de>
| * km/common: check test_bank and testpin for testbootThomas Herzmann2012-06-152-1/+39
| | | | | | | | | | | | | | | | | | | | If the testpin is asserted, first check if a test_bank variable is defined before trying to boot this test_bank. Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx/km: readout dip_switch on kmcoge5neThomas Herzmann2012-06-151-0/+11
| | | | | | | | | | | | | | | | | | | | On kmcoge5ne we have a dip switch present. If this switch was switched on the actual_bank is set to 0 and this SW will be booted. Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx: configure CONFIG_POST for kmcoge5neThomas Herzmann2012-06-153-1/+50
| | | | | | | | | | | | | | | | | | | | kmcoge5ne starts the post tests if the testpin on the board was enabled. Currently it does simply a memory test. Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx/km: added missing enable of application bufferStefan Bigler2012-06-152-0/+4
| | | | | | | | | | | | | | | | Enabled application buffers in uboot to allow application chipselect access in uboot. Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * km/common: increase bootlimit to 3Holger Brunck2012-06-151-1/+1
| | | | | | | | | | | | | | | | Increase bootlimit to 3 to be more tolerant during the boot process before switching to the backup application. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * km/common: fixed error in ethaddr (1-byte-shift)Thomas Herzmann2012-06-151-1/+1
| | | | | | | | | | | | | | | | The MAC address begins at offset 1. Signed-off-by: Thomas Herzmann <thomas.herzmann@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * MAINTAINERS: cleanup for keymile boardsHolger Brunck2012-06-151-5/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx: add kmcoge5ne board supportHolger Brunck2012-06-156-174/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board is a MPC8360 board. Two flashes are present a NOR flash were u-boot and the u-boot environment is stored and a NAND flash for the application code. This board has 512MB SDRAM. Additionaly we introduce a common km8360.h file and convert kmeter1 to use this. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Christian Herzig <christian.herzig@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * km/common: add support for second flashAndreas Huber2012-06-154-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for a second flash. By default, a single flash chip is set up: - called 'boot' - mtd name for ubi 'ubi0' MTDIDS and MTDPARTS may be overwritten to add a second flash. The 'ubiattach' command is featured in two versions: - if CONFIG_KM_UBI_PARTITION_NAME_APP is not defined: this is the version as up to now - if CONFIG_KM_UBI_PARTITION_NAME_APP is defined: a check on 'actual_bank' will be done to determine the flash to boot from. Use CONFIG_KM_UBI_PARTITION_NAME_BOOT and CONFIG_KM_UBI_PARTITION_NAME_APP to define where to put the bootloader and the applications. Example: In the board config do: ... snip ... "boot:" \ "768k(u-boot)," \ "128k(env)," \ "128k(envred)," \ "-(" CONFIG_KM_UBI_PARTITION_NAME_BOOT ");" \ "app:" \ "-(" CONFIG_KM_UBI_PARTITION_NAME_APP ");" ... snap ... You may also need to enable the second flash: ... snip ... /* additional featured for COGE5 */ ... snap ... Signed-off-by: Andreas Huber <andreas.huber@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc83xx/km: remove unneeded CONFIG_PCI for kmeter1Holger Brunck2012-06-151-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | We don't use PCI on kmeter1 and never will be, so remove some unneeded code. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc83xx/km: lock the window size to 2GiB befor fixing sdram sizeChristian Herzig2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | If the ram size isn't locked to 2GiB, the get_ram_size() may hang up. Signed-off-by: Christian Herzig <christian.herzig@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx/km: use tuxx1.h for kmsupx5 targetHolger Brunck2012-06-153-104/+17
| | | | | | | | | | | | | | | | | | | | | | | | This additional header is unneeded, we can use the tuxx1.h for this target. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * powerpc/83xx: increment malloc heap size for the MPC832x MDS boardsTimur Tabi2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The malloc buffer is not large enough to hold a flash sector (0x20000 bytes) in addition to whatever else it normally holds, so double its size. This fixes a failure trying to save the environment: => save Saving Environment to Flash... Unable to save the rest of sector (122880) . done Protected 1 sectors This problem probably surfaced from some other change that significantly increased the normal memory usage, thereby not leaving enough room for the saveenv command. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
OpenPOWER on IntegriCloud