summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-08cosmetic: remove empty lines at the top of fileMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-11-08common/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() ↵Miao Yan
functions In commit "5c427e4: use BOOTM_STATE_OS_CMDLINE flag for plain bootm" and "3d187b3: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS", BOOTM_STATE_OS_CMDLINE was added to do_bootm for PowerPC and MIPS. This breaks other OSes (vxworks, netbsd, plan9,...) that don't support subcommand processing, e.g. they all contain the following code in their do_bootm_xxx(): if (flag & BOOTM_STATE_OS_PREP) return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; which will result a "subcommand not supported" error. This patch changes the above logic to: /* if not go command, pretend everything to be OK */ if (flag != BOOTM_STATE_OS_GO) return 0; Signed-off-by: Miao Yan <miao.yan@windriver.com>
2013-11-08Makefile: do not create a symbolic link to arch/${ARCH}/include/asmMasahiro Yamada
In-tree build: - Do not create a symbolic link from include/asm to arch/${ARCH}/include/asm - Add ${SRCTREE}/arch/arm/include into the header search path Out-of-tree build: - Do not create a directory ${OBJTREE}/include2 - Do not create a symbolic link from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm - Add ${SRCTREE}/arch/arm/include into the header search path Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-11-08Add support for SX151x SPI GPIO ExpandersViktar Palstsiuk
Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
2013-11-08boards.cfg: remove git leftoversLuka Perkov
Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0. Signed-off-by: Luka Perkov <luka@openwrt.org>
2013-11-08boards.cfg: remove trailing whitespacePaul Burton
Commit 93e14596 "Coding Style cleanup: replace leading SPACEs by TABs" added trailing whitespace to a single line of boards.cfg. I presume this was unintentional, and it causes the file to change after running it through the reformat.py script. Remove the offending character. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
2013-11-08cmd_nvedit.c: Add env exists commandAndrew Ruder
env exists is a way to test (in hush) if an environment variable exists. A workaround existed using printenv but this new command doesn't require all the stdout/stderr redirection to prevent printing information to the screen. Example: $ set testexists 1 $ env exists testexists && echo "yes" yes $ env exists testexists || echo "no" $ set testexists $ env exists testexists && echo "yes" $ env exists testexists || echo "no" no $ Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
2013-11-08MAKEALL: rename boards_by_* functions to targets_by_*Masahiro Yamada
We expect boards_by_* function to return the 7th filed, 'Target', not the 6th field, 'Board name'. So the function names, boards_by_* are a little misleading, and should be renamed to targets_by_*. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
2013-11-08MAKEALL: fix boards_by_field functionMasahiro Yamada
Commit 27af930e changed the boards.cfg format and it changed boards_by_field() function incorrectly. For tegra cpus it returned Board Name field, not Target field. This commit restores the behavior prior to 27af930e in the right way. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
2013-11-08MAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>Masahiro Yamada
Commit 27af930e changed the boards.cfg format but missed to change get_target_arch() fuction. This commit adjusts it for CROSS_COMPILE_<ARCH> to work correctly. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
2013-11-08MAKEALL: fix awk warning messageMasahiro Yamada
If you do `./MAKEALL -M ` or `./MAKEALL -m` GNU awk would display warnings like follows: awk: warning: escape sequence `\ ' treated as plain ` ' In the first place, we do not explicitly set the field separator. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
2013-11-08sparc: include config.h to start.SMasahiro Yamada
arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES to be defined: #ifndef CONFIG_SYS_SPARC_NWINDOWS #error Must define number of SPARC register windows, default is 8 #endif But it missed to include <config.h>, which always ended up in compile error. This commit fixes this problem. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
2013-11-08EP88x: remove remainders of dead boardMasahiro Yamada
Commit 1b0757e deleted the EP88x entry from boards.cfg file. But it missed to remove include/configs/EP88x.h and board/ep88x/. This commit removes them and adds EP88x to README.scrapyard. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Wolfgang Denk <wd@denx.de>
2013-11-08README.scrapyard: fix broken formatMasahiro Yamada
Some tabs have been replaced with spaces because doc/README.scrapyard is consistently using spaces. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-11-08kup: Delete an unused MakefileMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Klaus Heydeck <heydeck@kieback-peter.de>
2013-11-07Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD
2013-11-06Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireTom Rini
2013-11-06Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblazeTom Rini
2013-11-06ColdFire: fix some typoes for CF platformjason
Signed-off-by: Jason Jin <Jason.Jin@freescale.com>
2013-11-06coldfire: cpu5282: increase malloc space to fix crash on start u-bootJens Scharsig (BuS Elektronik)
The malloc space is to small to boot, the current uboot 2013.10-rcX, This will fix the startup problems by increasing the mallog space to 4MiB. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
2013-11-06Makfile: fix a rule to build u-boot.sbMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-11-06freescale: p1_p2_rdb_pc: rename COBJS-y to obj-yMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2013-11-06arm: zynq : Revert TZ_DDR_RAM to secure.Radhey Shyam Pandey
TZ_DDR_RAM on reset is in secure mode. Since uboot and linux runs in full TZ privilege secure mode, no need to set DDR trustzone to non-secure. Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-06arm: zynq: Do not remap OCM to high addressMichal Simek
In case where ps-ddr is not used, do not remap OCM to high address and keep it from 0x0. Linux SMP requires to have memory at 0x0. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-06fpga: Add support for gzip images with bitstreamsMichal Simek
Here is the set of command which has been performed to proof this feature. gzip < fpga.bin > fpga.bin.gz mkimage -A arm -O u-boot -T firmware -C gzip \ -a 20000000 -n "zc702_fpga_bin" -d fpga.bin.gz fpga.bin.gz.ub tftp 100000 fpga.bin.gz.ub fpga loadmk 0 100000 This flow should speedup loading bitstream data from external memory and save image footprint in non volatile memory. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
2013-11-06fpga: zynqpl: Do not place bitstream below 1MBMichal Simek
DMA doesn't work when src is placed below 1MB limit. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
2013-11-06fpga: zynqpl: Add dcache flush supportJagannadha Sutradharudu Teki
Buffers must be cache and dma aligned. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2013-11-05Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'Albert ARIBAUD
2013-11-04at91: add defines for reset typeRoger Meier
Signed-off-by: Roger Meier <r.meier@siemens.com> Acked-by: Bo Shen <voice.shen@atmel.com> Reviewed-by: Heiko Schocher <hs@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-11-04ARM: ATMEL: eb_cpux9k2: fix TEXT_BASE for ramboot targetJens Scharsig (BuS Elektronik)
Since more functions are enabled, the eb_cpux9k2_ram target does not boot. This patch changed the TEXT_BASE, that the code fits between TEXT_BASE and ram end. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-11-04arm: atmel: get rid of too many ifdefferyBo Shen
Get rid of too many ifdeffery in usb ohci driver Add following two configuration for USB clock selecting - CONFIG_USB_ATMEL_CLK_SEL_PLLB: using PLLB as usb ohci input clock - CONFIG_USB_ATMEL_CLK_SEL_UPLL: using UPLL as usb ohci input clock Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-11-04arm: atmel: at91sam9n12ek: add usb host supportBo Shen
Add usb host support for at91sam9n12ek board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-11-04net: macb: get DMA bus width from design config registerBo Shen
Get DMA bus width from design config register Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
2013-11-04pxe: fix handling of absolute pathsRob Herring
pxelinux and syslinux differ in their handling of absolute paths in menu files. A pxelinux path is aways prepended with the bootfile path while syslinux allows for absolute paths. u-boot was always treating a leading / as an absolute path breaking some pxelinux setups. Fix this by adding a flag to distinguish pxelinux vs. syslinux behavior. Reported-by: Ian Campbell <Ian.Campbell@citrix.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: versatile: convert to common timer codeRob Herring
Convert versatile to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: tegra: convert to common timer codeRob Herring
Convert tegra to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: socfpga: convert to common timer codeRob Herring
Convert socfpga to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: vexpress: convert to common timer codeRob Herring
Convert vexpress to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: mx25: convert to common timer codeRob Herring
Convert mx25 to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04ARM: highbank: convert to common timer codeRob Herring
Convert highbank to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04sh: convert to common timer codeRob Herring
Convert sh to use the commmon timer code. Remove reset_timer and set_timer as they are unused on sh. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04Introduce common timer functionsRob Herring
Many platforms duplicate pretty much the same timer code yet they all have a 32-bit freerunning counter register. Create a common implementation that minimally requires 2 or 3 defines to add timer support: CONFIG_SYS_TIMER_RATE - Clock rate of the timer counter CONFIG_SYS_TIMER_COUNTER - Address of 32-bit counter CONFIG_SYS_TIMER_COUNTS_DOWN - Define if counter counts down All functions are weak or ifdef'ed so they can still be overriden by any platform. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04examples: enable gc-sections optionRob Herring
This fixes building time.c when unreferenced functions are added. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04config: remove platform CONFIG_SYS_HZ definition part 2/2Rob Herring
Remove platform CONFIG_SYS_HZ definition for configs a-z*. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04config: remove platform CONFIG_SYS_HZ definition part 1/2Rob Herring
Remove platform CONFIG_SYS_HZ definition for configs A-Z*. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04config: consolidate CONFIG_SYS_HZ definitionRob Herring
According to the README, CONFIG_SYS_HZ must be 1000 and most platforms follow that. In preparation to remove CONFIG_SYS_HZ from all these platforms, provide a common definition. The platforms which use a value other than 1000 will get build warning now. These configs are: include/configs/M5271EVB.h:#define CONFIG_SYS_HZ 1000000 include/configs/balloon3.h:#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */ include/configs/idmr.h:#define CONFIG_SYS_HZ (50000000 / 64) include/configs/mini2440.h:#define CONFIG_SYS_HZ 1562500 include/configs/mx1ads.h:#define CONFIG_SYS_HZ 3686400 include/configs/omap3_zoom2.h:#define CONFIG_SYS_HZ ((V_SCLK) / (2 << CONFIG_SYS_PTV)) include/configs/omap730p2.h:#define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV)) include/configs/palmld.h:#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */ include/configs/palmtc.h:#define CONFIG_SYS_HZ 3686400 /* Timer @ 3686400 Hz */ include/configs/rsk7203.h:#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) include/configs/rsk7264.h:#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) include/configs/rsk7269.h:#define CONFIG_SYS_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) include/configs/scb9328.h:#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ include/configs/versatile.h:#define CONFIG_SYS_HZ (1000000 / 256) include/configs/zipitz2.h:#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */ Signed-off-by: Rob Herring <rob.herring@calxeda.com>
2013-11-04config: Add a default CONFIG_SYS_PROMPTRob Herring
The definitions for CONFIG_SYS_PROMPT are varied with little reason other than to display the board name. Over half the definitions are "==> ", so make this the default. The rest of the boards remain unchanged to avoid breaking any external scripts expecting a certain prompt. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
2013-11-04Merge branch 'master' of git://git.denx.de/u-boot-blackfinTom Rini
Easy to resolve conflict on the GPIO change. Conflicts: arch/blackfin/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>
2013-11-04wandboard: README: Include the quad versionFabio Estevam
Wandboard quad was not ported into U-boot at the time of writing the README. Add it to the list of Wandboard variants. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
2013-11-04Revert "configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards"Stefano Babic
This reverts commit 178b8e15ade96c7bd59b9704b91ca51d27c391cd. Patch was merged too fast, without checking that another patch is fixing the reported issue globally - reverted. Signed-off--by: Stefano Babic <sbabic@denx.de>