summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-21pxe: add support for parsing local syslinux filesRob Herring
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>
2012-06-21pxe: parse initrd file from append stringRob Herring
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>
2012-06-21pxe: support absolute pathsRob Herring
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>
2012-06-21pxe: support linux entries for labelsRob Herring
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>
2012-06-21pxe: add support for label menu textRob Herring
Use a menu string if present, otherwise use the kernel string. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2012-06-21pxe: support include files at top-levelRob Herring
Include files outside of a menu were not getting included and parsed. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2012-06-21menu: only timeout when menu is displayedRob Herring
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>
2012-06-21checkpatch: add check for whitespace before semicolon at end-of-lineEric Nelson
This tests for a bad habits of mine like this: return 0 ; Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2012-06-21Block: Remove MG DISK supportMarek Vasut
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>
2012-06-21Strip fw_printenv like the other toolsLoïc Minier
Signed-off-by: Loïc Minier <lool@debian.org>
2012-06-20hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.cTom Rini
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>
2012-06-20CONFIG_SYS_BAUDRATE_TABLE: Add <config_fallbacks.h>, place thereTom Rini
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>
2012-06-19patman: Handle creation of patman config fileVikram Narayanan
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>
2012-06-19patman: Change the location of patman config fileVikram Narayanan
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>
2012-06-19lmb: do not export anything without CONFIG_LMBMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-06-19easylogo: add lzma supportMike Frysinger
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>
2012-06-19cmd_mem: cmp: convert while() to for() loopMike Frysinger
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>
2012-06-19cmd_mem: cmp: unify size code pathsMike Frysinger
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>
2012-06-19cmd_mem: replace custom PRINTF() with debug()Mike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-06-19Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk
* '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>
2012-06-15km/common: check test_bank and testpin for testbootThomas Herzmann
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>
2012-06-15powerpc/83xx/km: readout dip_switch on kmcoge5neThomas Herzmann
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>
2012-06-15powerpc/83xx: configure CONFIG_POST for kmcoge5neThomas Herzmann
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>
2012-06-15powerpc/83xx/km: added missing enable of application bufferStefan Bigler
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>
2012-06-15km/common: increase bootlimit to 3Holger Brunck
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>
2012-06-15km/common: fixed error in ethaddr (1-byte-shift)Thomas Herzmann
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>
2012-06-15MAINTAINERS: cleanup for keymile boardsHolger Brunck
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>
2012-06-15powerpc/83xx: add kmcoge5ne board supportHolger Brunck
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>
2012-06-15km/common: add support for second flashAndreas Huber
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>
2012-06-15powerpc83xx/km: remove unneeded CONFIG_PCI for kmeter1Holger Brunck
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>
2012-06-15powerpc83xx/km: lock the window size to 2GiB befor fixing sdram sizeChristian Herzig
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>
2012-06-15powerpc/83xx/km: use tuxx1.h for kmsupx5 targetHolger Brunck
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>
2012-06-15powerpc/83xx: increment malloc heap size for the MPC832x MDS boardsTimur Tabi
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>
2012-06-08cmd_nand: fix crashing bug in nand read/writeSteve Sakoman
Commit 418396e212b59bf907dbccad997ff50f7eb61b16 introduced a bug that causes nand read and nand write to crash in strcmp due to a null pointer. Root cause is that strchr(cmd, '.') returns a null pointer when the input string does not contain a '.' The strcmp function does not check for null pointers, resulting in a crash. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Scott Wood <scott@tyr.buserror.net>
2012-06-07Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk
* 'master' of git://git.denx.de/u-boot-video: video: atmel/lcd: add LCD driver for new Atmel SoC video: cfb_console: flush dcache for frame buffer in DRAM cfb_console: Ignore bell character cfb_console: Add console_clear_line function cfb_console: Fix function console_back omap3_dss: cosmetic changes omap3_dss: add optional framebuffer mx53loco: Add LCD support mx5: Rename mx51_fb_init() mx53: Allow IPUv3 driver to also work on mx53 mx51evk: Add LCD support EXYNOS: display 32bpp bitmap TIZEN logo create lib/tizen directory LCD: display 32bpp decompressed bitmap image common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef common/lcd.c: reduce some CONFIG_LCD_*_LOGO ifdefs common/lcd.c: use ARRAY_SIZE cmd_bmp.c: make bmp_display() usable by drivers or board code LCD: support another s6e8ax0 panel type LCD: change s6e8ax0 panel gamma value include/video.h: drop unused video_printf() Signed-off-by: Wolfgang Denk <wd@denx.de>
2012-06-07Merge branch 'master' of git://git.denx.de/u-boot-avr32Wolfgang Denk
* 'master' of git://git.denx.de/u-boot-avr32: avr32:board.c: fix compile warning avr32:grasshopper: fix PHY initialisation Signed-off-by: Wolfgang Denk <wd@denx.de>
2012-06-07Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk
* 'master' of git://git.denx.de/u-boot-mips: MIPS: board.c: move extern declarations to u-boot-mips.h MIPS: bootm_qemu_mips.c: make checkpatch.pl clean MIPS: bootm.c: make checkpatch.pl clean Signed-off-by: Wolfgang Denk <wd@denx.de>
2012-06-07Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk
* 'master' of git://git.denx.de/u-boot-sh: sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4 sh: Add SH7269 device and RSK2+SH7269 board sh: Set CONFIG_SH_ETHER_PHY_MODE and CONFIG_SH_ETHER_SH7734_MII to boards with sh_eth sh: Add support for AP-SH4A-4A board sh: Add register definition of PFC for SH7734 sh: r0p7734: Add support I2C controller sh: Add bit control functions sh: Add support for r0p7734 board sh: Add support Renesas SH7734 Signed-off-by: Wolfgang Denk <wd@denx.de>
2012-06-07MPC8xxx: Define cache ops for USBMarek Vasut
This patch conditionally defines flush_dcache_range() and invalidate_dcache_range() on MPC8xxx, to avoid EHCI complaining, resulting in the following output: $ ARCH=powerpc CROSS_COMPILE=powerpc-linux-gnu- ./MAKEALL MPC8572DS Configuring for MPC8572DS board... make: *** [u-boot] Error 1 powerpc-linux-gnu-size: './u-boot': No such file e1000.c: In function ‘e1000_initialize’: e1000.c:5264:13: warning: assignment from incompatible pointer type [enabled by default] tsec.c: In function ‘tsec_initialize’: tsec.c:638:12: warning: assignment from incompatible pointer type [enabled by default] drivers/usb/host/libusb_host.o: In function `ehci_td_buffer': /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:186: undefined reference to `flush_dcache_range' drivers/usb/host/libusb_host.o: In function `ehci_submit_async': /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:346: undefined reference to `flush_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:348: undefined reference to `flush_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:349: undefined reference to `flush_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:372: undefined reference to `invalidate_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:374: undefined reference to `invalidate_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:376: undefined reference to `invalidate_dcache_range' /home/marex/U-Boot/u-boot-imx/drivers/usb/host/ehci-hcd.c:386: undefined reference to `invalidate_dcache_range' make: *** [u-boot] Error 1 --------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( MPC8572DS ) ---------------------------------------------------------- Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
2012-06-05video: atmel/lcd: add LCD driver for new Atmel SoCBo Shen
The new Atmel SoC (at91sam9x5 series and at91sam9n12) add a totally different LCD controller. Add this new driver to support it. Using CONFIG_ATMEL_HLCD (distinguish with CONFIG_ATMEL_LCD) to enable this in board configuration file. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2012-06-05video: cfb_console: flush dcache for frame buffer in DRAMAnatolij Gustschin
Data cache flushing is required for frame buffer in RAM to fix the distorted console text output. Currently this text distortion is observed with cfb on beagleboard and N900 when running with data cache enabled. Reported-by: Pali Rohár <pali.rohar@gmail.com> Tested-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2012-06-05cfb_console: Ignore bell characterPali Rohár
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
2012-06-04cfb_console: Add console_clear_line functionPali Rohár
console_clear_line() clears part of specified line or the full line. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2012-06-04cfb_console: Fix function console_backPali Rohár
* Do not disable and enable the cursor again. console_back() is called only from video_putc() which already turns the cursor off at the beginning and turns it on at the end, so there is no need to change the cursor in console_back(). Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2012-06-04avr32:board.c: fix compile warningAndreas Bießmann
This patch fixes following warning: ---8<--- board.c: In function 'board_init_r': board.c:257: warning: unused variable 's' --->8--- Patch de30122bb58fee7b0f94bcfabab595b6ad757336 missed to remove this variable too. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2012-06-04avr32:grasshopper: fix PHY initialisationAndreas Bießmann
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2012-06-03MIPS: board.c: move extern declarations to u-boot-mips.hDaniel Schwierzeck
This fixes some remaining checkpatch.pl warnings. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
2012-06-03MIPS: bootm_qemu_mips.c: make checkpatch.pl cleanDaniel Schwierzeck
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
2012-06-03MIPS: bootm.c: make checkpatch.pl cleanDaniel Schwierzeck
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
2012-05-28sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4Nobuhiro Iwamatsu
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>