summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* am335x_evm: Convert NOR_BOOT to KconfigTom Rini2014-11-05-1/+9
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* am335x_evm: Add NOR to KconfigTom Rini2014-11-05-2/+11
| | | | | | | Make enabling support for NOR (and describe where it's seen) be done via Kconfig. Signed-off-by: Tom Rini <trini@ti.com>
* Merge git://www.denx.de/git/u-boot-sunxiTom Rini2014-11-05-199/+2403
|\
| * dm: sunxi: Request USB vbus gpioHans de Goede2014-11-05-0/+10
| | | | | | | | | | | | | | This is necessary for the device-model enabled builds to work properly. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Simon Glass <sjg@chromium.org>
| * dm: sunxi: Request card detect gpioHans de Goede2014-11-05-10/+22
| | | | | | | | | | | | | | This is necessary for the device-model enabled builds to work properly. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Simon Glass <sjg@chromium.org>
| * dm: sunxi: Add support for serial using driver modelSimon Glass2014-11-05-6/+55
| | | | | | | | | | | | | | | | | | | | Add a driver for the designware serial UART used on sunxi. This just redirects to the normal ns16550 driver. Add a stdout-path to the device tree so that the correct UART is chosen. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * dm: sunxi: Modify the GPIO driver to support driver modelSimon Glass2014-11-05-0/+171
| | | | | | | | | | | | | | | | | | This adds driver model support to the sunxi GPIO driver, using the device tree to trigger binding of the driver. The driver will still operate without driver model too. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * dm: sunxi: Make sure that GPIOs are requestedSimon Glass2014-11-05-0/+1
| | | | | | | | | | | | | | | | | | | | The scsi_init() function uses a GPIO so should request it. There is no way to return an error here, and the request may be made multiple times, so just ignore errors for now. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * dm: sunxi: Add pinmux functions which take a bank parameterSimon Glass2014-11-05-12/+24
| | | | | | | | | | | | | | | | | | | | With driver model we will have access to a bank pointer, so we want to use it rather than converting back to a number, and then back to a bank pointer. Add functions to provide this feature. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * dm: sunxi: Add a new config for an FDT-based pcDuino3Simon Glass2014-11-05-1/+19
| | | | | | | | | | | | | | | | | | For now we won't want to mess with the existing configurations. Create a new one which will enable device tree and driver model. Note that this brings the device tree binary into u-boot-sunxi-with-spl.bin. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * dm: sunxi: dts: Add sun7i device tree filesSimon Glass2014-11-05-0/+1775
| | | | | | | | | | | | | | | | | | | | | | These are from Linux 3.17-rc7 (commit fe82dcec). U-Boot only uses a small portion of these, but we may as well have something to look forward to. The total compiled size is about 25KB. Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms.Ian Campbell2014-11-05-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | $ make BOARD_felconfig is more convenient than $ make BOARD_defconfig $ echo CONFIG_SPL_FEL=y >> .config $ echo CONFIG_SPL_FEL=y >> spl/.config Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: kconfig: Introduce CONFIG_TARGET_<BOARD>Ian Campbell2014-11-05-46/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done automatically with the following bits of scripting. The Kconfig choice content was generated with this script snippet: for i in $(git grep -l CONFIG_ARCH_SUNXI configs/*) ; do TARGET=$(sed -n -e 's/CONFIG_SYS_EXTRA_OPTIONS="\([^,"]\+\).*/\1/p' $i); MACH=$(sed -n -e 's/.*CONFIG_\(MACH_SUN.I\)=./\1/p' $i) echo "config TARGET_$TARGET" echo " bool \"$TARGET\"" echo " depends on $MACH" echo done defconfigs were updated with a sed script (t): # Extract board from first entry of CONFIG_SYS_EXTRA_OPTIONS, /^CONFIG_SYS_EXTRA_OPTIONS/ { s/^\(CONFIG_SYS_EXTRA_OPTIONS="\)\([^,"]\+\),\?\(.*\)/\1\3\nCONFIG_TARGET_\2=y/; # Print and delete first line (CONFIG_SYS_EXTRA_OPTIONS), leaving # CONFIG_TARGET_<BOARD> in pattern space P;D; }; # Move CONFIG_TARGET_<BOARD> to hold space /^CONFIG_TARGET/{h;n} # Print CONFIG_TARGET_<BOARD> after CONFIG_MACH_<SOC> in either SPL or # normal mode. /^CONFIG_MACH/{p;g;p;n}; /^\+S:CONFIG_MACH/{p;g;s/^CONFIG_TARGET/+S:&/;p;n}; # Print any remaining lines normally p; Run as: sed -i -n -f t $(git grep -l CONFIG_ARCH_SUNXI configs/*) and then manually removing the one instance of CONFIG_SYS_EXTRA_OPTIONS="" from Colombus_defconfig board/sunxi/Makefile was updated with: sed -e 's/^\(obj-\$(CONFIG_\)\(.*\)\().*+= dram_.*\)/\1TARGET_\2\3/g' board/sunxi/Makefile and manually retabbing a few lines to line up again. The board descriptions could certainly be improved. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: Drop FEL variants of defconfigs.Ian Campbell2014-11-05-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | This can now be configured via Kconfig, e.g. with: $ make BOARD_defconfig $ echo CONFIG_SPL_FEL=y >> .config $ echo CONFIG_SPL_FEL=y >> spl/.config Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: Use CONFIG_MACH_SUN?I from Kconfig instead of CONFIG_SUN?IIan Campbell2014-11-05-57/+52
| | | | | | | | | | | | | | | | | | | | | | Mostly automatic with: sed -i -e 's/CONFIG_\(SUN[45678]I\)/CONFIG_MACH_\1/g' $(git grep -l CONFIG_SUN[45678]I) followed by removing the relevant #defines from include/configs/sun?i.h by hand. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig optionIan Campbell2014-11-05-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unfortunate that this needs to be present in both .config and spl/.config since it makes it slightly hard to enable FEL mode for a regular defconfig. It can be done with: echo CONFIG_SPL_FEL=y >> .config echo CONFIG_SPL_FEL=y >> spl/.config Ideally only one of those would be needed. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I.Ian Campbell2014-11-05-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | Now we have CONFIG_ARCH_SUNXI as the toplevel, CONFIG_MACH_SUN[45678]I as the per-SoC option and leave CONFIG_TARGET_BLAH free for individual boards in the future. Done automatically with: sed -i -e 's/TARGET_\(SUN[45678]I\)/MACH_\1/g' $(git grep -l TARGET_SUN[45678]I) Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * sunxi: kconfig: Add top-level ARCH_SUNXIIan Campbell2014-11-05-25/+57
| | | | | | | | | | | | | | | | | | | | | | And make TARGET_SUN[45678]I a choice variable under this. configs updated with: sed -i -e 's/^\(\+S:\)\?CONFIG_TARGET_SUN.I=y/\1CONFIG_ARCH_SUNXI=y\n&/g' configs/* Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| * ARM: sunxi: Fix Ippo-q8h-v5 defconfig filenameChen-Yu Tsai2014-11-05-1/+1
| | | | | | | | | | | | | | | | | | | | The defconfig for Ippo-q8h-v5 was incorrectly committed as "Ippo_q8h". This patch renames it correctly, as well as correct a typo in my name in the maintainers listing. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* | Merge git://www.denx.de/git/u-boot-ppc4xxTom Rini2014-11-05-0/+3
|\ \
| * | ppc: Fix ppc4xx CONFIG_SYS_GENERIC_BOARDDirk Eibach2014-11-05-0/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized that with v2014.10 u-boot is not starting up on ppc4xx boards with CONFIG_SYS_GENERIC_BOARD set. I bisected it down to this: d54d7eb support blackfin board initialization in generic board_f With d29437a ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD I set gd to a defined value for ppc4xx in cpu_init_f(). I did not realize that the gd struct has also to be memset() to zero at this point. But at least commit d54d7eb assumes it is: @@ -516,11 +528,13 @@ static int reserve_malloc(void) /* (permanently) allocate a Board Info struct */ static int reserve_board(void) { - gd->start_addr_sp -= sizeof(bd_t); - gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t)); - memset(gd->bd, '\0', sizeof(bd_t)); - debug("Reserving %zu Bytes for Board Info at: %08lx\n", - sizeof(bd_t), gd->start_addr_sp); + if (!gd->bd) { + gd->start_addr_sp -= sizeof(bd_t); + gd->bd = (bd_t *)map_sysmem(gd->start_addr_sp, sizeof(bd_t)); + memset(gd->bd, '\0', sizeof(bd_t)); + debug("Reserving %zu Bytes for Board Info at: %08lx\n", + sizeof(bd_t), gd->start_addr_sp); + } return 0; } #endif This might also be an issue on other architectures, so maintainers should check. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge git://git.denx.de/u-boot-shTom Rini2014-11-04-62/+64
|\ \ | |/ |/|
| * net: sh-eth: Add cache writeback control after setting bit of DMA descriptorNobuhiro Iwamatsu2014-11-04-2/+8
| | | | | | | | | | | | | | | | A bit field of DMA descriptor is on memory area of DMA. If we set data to bit of DMA descriptor, we must be writeback data of DMA descriptor. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * net: sh-eth: Use memalign instead of orignal memroy alignment functionNobuhiro Iwamatsu2014-11-04-48/+41
| | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * net: sh-eth: Remove definition of RX_DESC_SIZE and TX_DESC_SIZENobuhiro Iwamatsu2014-11-04-12/+12
| | | | | | | | | | | | | | | | RX_DESC_SIZE and TX_DESC_SIZE mean the size of the data descriptor for sh-eth. We can acquire this in sizeof. It is not necessary to define these in define. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * serial: sh: r8a7794: Add support external clockNobuhiro Iwamatsu2014-11-04-2/+2
| | | | | | | | | | | | | | | | The baud rate setting of external clock is enabled. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * net: sh-eth: Add support R8A7793Nobuhiro Iwamatsu2014-11-04-4/+5
| | | | | | | | | | | | | | | | R8A7793 has the same sh-ether IP core as other SH/rmobile. This patch adds support of R8A7793. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * serial: sh: Add support R8A7793Nobuhiro Iwamatsu2014-11-04-4/+6
| | | | | | | | | | | | | | This adds the preset value to register for R8A7793. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | ARM: kwimage: fix v0 formatGerald Kerma2014-11-04-4/+6
| | | | | | | | | | | | | | | | | | | | This patch fix the kwimage tools for version 0 fileformat used for kirkwood Tested on sheevaplug Signed-off-by: Gerald Kerma <drEagle@doukki.net> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Stefan Roese <sr@denx.de> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
* | MAINTAINERS: fix Pantelis Antoniou email addressIgor Grinberg2014-11-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Trivial fix (unless Pantelis has a new email address): Pantelis Antoniou <panto.antoniou-consulting.com> ^ make it: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
* | Fix cosmetic issues in mkimage manpageVagrant Cascadian2014-11-04-3/+5
| | | | | | | | | | | | | | | | | | * Escape use of - in description of -F. * Fix line continuations in examples so that the continued lines are also bold. Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
* | kbuild: do not hide clang warnings during build with W=1Masahiro Yamada2014-11-04-10/+0
| | | | | | | | | | | | | | | | | | | | | | These lines originate in Linux; it looks like Linux folks chose to hide bunch of warnings reported by clang rather than fixing C code. In U-boot, warnings are being fixed thanks to Jeroen's great efforts. Let's stop suppressing clang warnings. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Jeroen Hofstee <jeroen@myspectrum.nl>
* | sparc: move CONFIG_SYS_TEXT_BASE to KconfigMasahiro Yamada2014-11-04-84/+11
| | | | | | | | | | | | | | | | | | | | | | | | Defining CONFIG_SYS_TEXT_BASE in config.mk is very old style. Create CONFIG_SYS_TEXT_BASE option in Kconfig, but let it depend on CONFIG_SPARC because we do not want to disturb the other architectures that still define CONFIG_SYS_TEXT_BASE in their header files. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | sparc: merge CONFIG_SYS_CPU and CONFIG_SYS_VENDOR definesMasahiro Yamada2014-11-04-33/+10
| | | | | | | | | | | | | | For now, all the SPARC boards in U-Boot are provided by Gaisler. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | sparc: merge arch/sparc/cpu/*/config.mk to arch/sparc/config.mkMasahiro Yamada2014-11-04-16/+2
| | | | | | | | | | | | | | | | Remove arch/sparc/cpu/{leon2,leon3}/config.mk and move duplicated defines of -fPIC to arch/sparc/config.mk. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | sparc: move CONFIG_{LEON, LEON2, LEON3} to KconfigMasahiro Yamada2014-11-04-4/+16
| | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | sparc: Use nicer prompt for board select menuMasahiro Yamada2014-11-04-6/+10
| | | | | | | | | | | | | | | | | | | | | | The Board names in the board select menu were simply taken from the board directory name by a conversion tool when switching to Kconfig. Let's use more descriptive prompts taken from include/configs/gr*.h and board/gaisler/*/config.mk. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* | serial: add prototypes for init functionsJeroen Hofstee2014-11-04-70/+119
| | | | | | | | | | | | | | | | While at it, sort them. Cc: Tom Rini <trini@ti.com> Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | arm926ejs: cache: use __weakJeroen Hofstee2014-11-04-4/+1
| | | | | | | | | | Cc: Albert Aribaud <albert.u.boot@aribaud.net> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | i2c: use __weakJeroen Hofstee2014-11-04-6/+2
| | | | | | | | | | Cc: Heiko Schocher <hs@denx.de> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-stagingTom Rini2014-11-04-893/+42
|\ \
| * | Remove the CREDITS fileMasahiro Yamada2014-10-31-536/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is not maintained these days. We use MAINTAINERS for the maintainership of the supported boards. For dead boards, we have some clues in doc/README.scrapyard and also imperishable history in git-log. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Wolfgang Denk <wd@denx.de> Acked-By: Wolfgang Denk <wd@denx.de>
| * | novena: Add MAINTAINERS fileFabio Estevam2014-10-31-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Commit f91c09acf5c58c ("ARM: mx6: Add support for Kosagi Novena") missed to add a MAINTAINERS file, so add Marek as the maintainer. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Marek Vasut <marex@denx.de>
| * | ppc/arm: remove remainders of dead boards in KconfigMasahiro Yamada2014-10-31-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Commit d58a9451e733 (ppc/arm: zap EMK boards) removed TOP* boards support but missed to remove entries in Kconfig. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Wolfgang Denk <wd@denx.de>
| * | Remove unused filesMasahiro Yamada2014-10-31-338/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [1] arch/arm/include/asm/arch-at91/at91_shdwn.h The top9000 was the last board to use this header file. It was removed by commit d58a9451e733 (ppc/arm: zap EMK boards). [2] board/matrix_vision/common/* Some Matrix Vision boards were dropped by commit e7a565638a7a (powerpc: mpc83xx: remove board support for MERGERBOX and MVBLM7) and commit af55e35d3389 (powerpc: mpc5xxx: remove board support for MVBC_P and MVSMR). Since then these files have been unused. [3] include/usb/omap1510_udc.h The omap5912osk was the last board to use this header file. It was removed by commit 62d636aa2ac2 (omap: remove omap5912osk board support). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-By: Wolfgang Denk <wd@denx.de>
| * | twl4030: VMMC2 3.2V enable on MMC initPaul Kocialkowski2014-10-31-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the VMMC2 LDO, which powers the MMC2 device. When the device starts from MMC2, this has already been enabled by the BootROM, but when starting from peripheral boot (USB, UART), it is not the case. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
| * | tools/kwbimage: Fix compilation warningStefan Roese2014-10-31-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a compilation warning of kwbimage.c: tools/kwbimage.c: In function ‘kwbimage_set_header’: tools/kwbimage.c:784:8: warning: ‘headersz’ may be used uninitialized in this function [-Wmaybe-uninitialized] memcpy(ptr, image, headersz); ^ Instead of using multiple if statements, use a switch statement with a default entry. And return with error if an unsupported version is configured in the cfg file. Signed-off-by: Stefan Roese <sr@denx.de> Acked-By: Wolfgang Denk <wd@denx.de>
| * | tools/kwbimage.c: fix build on darwinAndreas Bießmann2014-10-31-3/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kwbimage uses get_current_dir_name(3) which is a gnu extension and not available on darwin host. Fix this by converting to portable getcwd(3) function. This patch fixes the following error: ---8<--- HOSTCC tools/kwbimage.o tools/kwbimage.c:399:16: warning: implicit declaration of function 'get_current_dir_name' is invalid in C99 [-Wimplicit-function-declaration] char *cwd = get_current_dir_name(); ^ tools/kwbimage.c:399:10: warning: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *cwd = get_current_dir_name(); ^ ~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. ... Undefined symbols for architecture x86_64: "_get_current_dir_name", referenced from: _image_headersz_v1 in kwbimage.o ld: symbol(s) not found for architecture x86_64 --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Stefan Roese <sr@denx.de> Acked-by: Stefan Roese <sr@denx.de> [agust: fixed getcwd() return warning] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-samsungTom Rini2014-11-04-21/+58
|\ \
| * | odroid: adjust gpio calls to dm gpio apiPrzemyslaw Marczak2014-10-30-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting gpio value before dm gpio init has no effect, so now, odroid gpio settings are moved after the gpio uclass init. Using non-requested gpio pin cases printing error messages. To avoid this, gpio_request() is added for those gpios. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>