summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-19common/cmd_nvedit.c: Fix size calculation in do_env_import()Horst Kronstorfer
do_env_import() missed the final '\0' terminator when calculating the size of an environment data block. This led to an erroneous 'bad CRC, import failed' message for a checksum protected environment (-c.) Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
2011-12-19x86: Add support for specifying an initrd with the zboot commandGabe Black
This change finishes plumbing the initrd support built into the zboot mechanism out to the command interface. It also fixes a bug in the command declaration where the kernel size could be passed as an optional second parameter but not enough arguments were allowed. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Refactor the zboot innards so they can be reused with a vboot imageGabe Black
If vboot successfully verifies a kernel, it will leave it in place and basically ready to boot. The zeropage table which is part of the x86 boot protocol is at the end of the kernel, though, instead of the beginning, and because the image is already in place there's no need to copy it around. This change refactors the code which implements the zboot command so that the configuration of the zeropage table and loading the pieces of the kernel into memory are done separately. Also, because the command line goes before the zeropage table in vboot which is somewhat incompatible with the normal protocol, where to put the command line is a now a parameter instead of being hard coded. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Add infrastructure to extract an e820 table from the coreboot tablesGabe Black
Also approximate the size of RAM using the largest RAM address available in the tables. There may be areas which are marked as reserved which are actually at the end of RAM. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Add support for booting Linux using the 32 bit boot protocolGabe Black
This change conditionally modifies the zboot command so that it can use the 32 bit boot protocol. This is necessary because the 16 bit realmode entry point assumes that it can call BIOS services which neither coreboot nor u-boot provide. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Clean up the x86 zimage code in preparation to extend itGabe Black
This change cleans up some formatting issues in the zimage handling code, and converts it from using offsets added to a base pointer to using the available structure definitions which were already being included. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Import code from coreboot's libpayload to parse the coreboot tableGabe Black
This change also forces the lib_sysinfo structure to be in the .data section. Otherwise it ends up in the .bss section. U-boot assumes that it doesn't need to copy it over during relocation, and instead fills that whole section with zeroes. If we really were booting from ROM that would be appropriate, but we need some information from the coreboot tables (memory size) before then and have to fill that structure before relocation. We skirt u-boot's assumption by putting this in .data where it assumes there is still read only but non-zero data. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-19x86: Initial commit for running as a coreboot payloadGabe Black
Add a target for running u-boot as a coreboot payload in boards.cfg, a board, CPU and a config. This is a skeleton implementation which always reports the size of memory as 64 MB. Signed-off-by: Gabe Black <gabeblack@chromium.org>
2011-12-17CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Stefan Roese <sr@denx.de>
2011-12-17CHECKPATCH: ./board/esd/hh405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/pci405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/tasreg/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/apc405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/voh405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/ash405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/dasa_sim/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/ar405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/plu405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/wuh405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/canbt/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/du405/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/esd/cpciiser4/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.cMarek Vasut
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
2011-12-17avr32:mmu.c: fix printf() length modifierAndreas Bießmann
avr32 uses unsigned long addresses, fix the printf() length modifier for that fact. Before this patch following warning occours: ---8<--- mmu.c: In function 'mmu_init_r': mmu.c:25: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'uintptr_t' --->8--- Signed-off-by: Andreas Bießmann <biessmann@corscience.de> cc: Mike Frysinger <vapier@gentoo.org> cc: Thomas Chou <thomas@wytron.com.tw> cc: Reinhard Meyer <u-boot@emk-elektronik.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-12-17fat.c: fix printf() length modifierAndreas Bießmann
The DIRENTSPERBLOCK utilizes sizeof() which will return a size_t which has no fixed size. Therefor use correct length modifer for printf() statement to prevent compiler warnings. This patch fixes following warning: ---8<--- fat.c: In function 'do_fat_read': fat.c:879: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' --->8--- Signed-off-by: Andreas Bießmann <biessmann@corscience.de> cc: Mike Frysinger <vapier@gentoo.org> cc: Thomas Chou <thomas@wytron.com.tw> cc: rjones@nexus-tech.net cc: kharris@nexus-tech.net Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-12-17cmd_sf.c: fix printf() length modifierAndreas Bießmann
size_t is not always 'unsigned int', use corret length modifer. This patch fixes following warning: ---8<--- cmd_sf.c: In function 'spi_flash_update_block': cmd_sf.c:130: warning: format '%#x' expects type 'unsigend int', but argument 4 has type 'size_t' cmd_sf.c:135: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'size_t' --->8--- Signed-off-by: Andreas Bießmann <biessmann@corscience.de> cc: Mike Frysinger <vapier@gentoo.org> cc: Thomas Chou <thomas@wytron.com.tw> Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-12-17Make printf and vprintf safe from buffer overrunsSonny Rao
From: Sonny Rao <sonnyrao@chromium.org> utilize the added vscnprintf functions to avoid buffer overruns The implementation is fairly dumb in that it doesn't detect that the buffer is too small, but at least will not cause crashes. Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
2011-12-17vsprintf: Move function documentation into header fileSimon Glass
Now that this is not in common.h, perhaps it is acceptable to move this documentation into the header file. Signed-off-by: Simon Glass <sjg@chromium.org>
2011-12-17Add safe vsnprintf and snprintf library functionsSonny Rao
From: Sonny Rao <sonnyrao@chromium.org> These functions are useful in U-Boot because they allow a graceful failure rather than an unpredictable stack overflow when printf() buffers are exceeded. Mostly copied from the Linux kernel. I copied vscnprintf and scnprintf so we can change printf and vprintf to use the safe implementation but still return the correct values. (Simon Glass <sjg@chromium.org> modified this commit a little) Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
2011-12-17Move vsprintf functions into their own headerSimon Glass
common.h is very large, so before changing the vsprintf functions, move the prototypes into their own header file. Signed-off-by: Simon Glass <sjg@chromium.org>
2011-12-17tools/setlocalversion: Update from the Linux KernelKyle Moffett
Several bugfixes have occurred upstream since this script was imported into U-Boot. In particular, the script currently in U-Boot does not describe commit f8bbb4dad0e9d91b7a51d6cc54dcf66d142f50fe correctly, resulting in a version of "2011.09" instead of "2011.09-01460-gf8bbb4d". With that commit checked out, the command "git name-rev --tags HEAD" gives this result: HEAD tags/v2011.12-rc1~30^2 Then the "changes" regex does not match because of the trailing '^2': grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' The new version of tools/setlocalversion in the kernel correctly handles those situations by using different plumbing commands. The version from the kernel is not directly usable as it does not append the full GIT version that U-Boot expects unless the right config options are set (CONFIG_LOCALVERSION_AUTO=y). Other than a few minor changes for Kconfig, the imported version is very similar to Linux v3.2-rc4. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-12-17Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk
* 'master' of git://git.denx.de/u-boot-usb: USB: Use (get|put)_unaligned for accessing wMaxPacketSize usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal) README: add documentation for CONFIG_USB_ULPI* USB: ULPI: increase error case verbosity USB: ULPI: clean a mixup of return types USB: ULPI: switch argument type from u8 to unsigned
2011-12-16USB: Use (get|put)_unaligned for accessing wMaxPacketSizeTom Rini
In 9792987721c7980453fe6447c3fa6593b44f8458 Stefan describes a usecase where the previous behavior of leaving wMaxPacketSize be unaligned caused fatal problems. The initial fix for this problem was incomplete however as it showed another cases of non-aligned access that previously worked implicitly. This switches to making sure that all access of wMaxPacketSize are done via (get|put)_unaligned. In order to maintain a level of readability to the code in some cases we now use a variable for the value of wMaxPacketSize and in others, a macro. Cc: Minkyu Kang <mk7.kang@samsung.com> Cc: Remy Bohmer <linux@bohmer.net> OpenRISC: Tested-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Beagleboard xM, Pandaboard run-tested, s5p_goni build-tested. Signed-off-by: Tom Rini <trini@ti.com>
2011-12-16usb:gadget:s5p Enable the USB Gadget framework at Exynos4210 (C210 Universal)Lukasz Majewski
This commit enables support for USB Gadgets on the Exynos4210 (C210 Universal) reference target. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Minkyu Kang <mk7.kang@samsung.com> CC: Remy Bohmer <linux@bohmer.net>
2011-12-16README: add documentation for CONFIG_USB_ULPI*Igor Grinberg
Add documentation for CONFIG_USB_ULPI and CONFIG_USB_ULPI_VIEWPORT configuration options. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
2011-12-16USB: ULPI: increase error case verbosityIgor Grinberg
Add the argument value to the error message. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Simon Glass <sjg@chromium.org>
2011-12-16USB: ULPI: clean a mixup of return typesIgor Grinberg
Clean a mixup between u32 and int as a return type for functions returning error values. Use int as it is native (and widely used) return type. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Simon Glass <sjg@chromium.org>
2011-12-16USB: ULPI: switch argument type from u8 to unsignedIgor Grinberg
There is no benefit in using u8, so switch to unsigned to reduce the binary image size (by 20 bytes). Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Simon Glass <sjg@chromium.org>
2011-12-13powerpc/mpc83xx: set TXEQA/TXEQE value for mpc837XE sataJerry Huang
In the current u-boot code, the value of these fields are the reserved value (0b100), through the signal integrity measurement on freescale's board with these reserved setting, the signal eye is out of the recommended spec for non-transition amplitude at 500mV nominal. According to the errata for MPC8379E, we should make a change to the recommended setting from essentially nothing at this time to 0b001 for SATA. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2011-12-12Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-stagingWolfgang Denk
* 'agust@denx.de' of git://git.denx.de/u-boot-staging: pm9g45: init serial console before relocation pm9261: init serial console before relocation pm9263: init serial console before relocation