Skip to content
Snippets Groups Projects
  1. Nov 07, 2014
    • Masahiro Yamada's avatar
      kbuild: sync misc scripts with Linux 3.18-rc1 · 176d0982
      Masahiro Yamada authored
      
      This commit imports some updates in misc scripts from Linux 3.18-rc1.
      
      [1] commit cbb4d3e6510b99522719c5ef0 by Horia Geanta
      scripts/kernel-doc: handle object-like macros
      
      [2] commit 164f0d2efaaef83 by Michal Marek
      kbuild: Fix handling of backslashes in *.cmd files
      
      [3] commit 270a00963cd367214e by Randy Dunlap
      scripts/kernel-doc: recognize __meminit
      
      [4] commit a4954fd7724c0f55361eb5 by Masahiro Yamada
        kbuild: remove obj-n and lib-n handling
      
      [5] commit 5b2389b45d1a9c12b9f by Masahiro Yamada
      kbuild: simplify build, clean, modbuiltin shorthands
      
      Signed-off-by: default avatarHoria Geanta <horia.geanta@freescale.com>
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      176d0982
    • Masahiro Yamada's avatar
      kconfig: sync kconfig files with Linux 3.18-rc1 · ad618992
      Masahiro Yamada authored
      
      This commit imports Kconfig updates from Linux 3.18-rc1.
      
      'kvmconfig' and 'tinyconfig' help message have been commented out
      since they are unavailable at least now;  in the future perhaps
      we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to
      create a very small U-Boot image.
      
      [1] commit 3aaefce10351 by Josh Triplett
      x86, platform, kconfig: move kvmconfig functionality to a helper
      
      [2] commit 0da1d4a0b951 by Josh Triplett
      x86: Add "make tinyconfig" to configure the tiniest possible kernel
      
      [3] commit c40724d3f381 by Brian Norris
        kconfig: lxdialog: fix spelling
      
      [4] commit 7285996aa000 by Brian Norris
        kconfig: nconfig: fix multi-byte UTF handling
      
      Signed-off-by: default avatarJosh Triplett <josh@joshtriplett.org>
      Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      ad618992
    • Masahiro Yamada's avatar
      kbuild: sync top Makefile with Linux 3.18-rc1 · ffe29ebc
      Masahiro Yamada authored
      
      Since Linux 3.15, relative path feature and related fixes,
      cleanups have been merged to the top Makefile.
      
      The relative path feature looks stable enough, so let's import it
      to U-Boot along with various cleanups.
      
      Commits imported from Linux (some need adjustment) are:
      
      [1] commit 7e1c04779efd by Michal Marek
        kbuild: Use relative path for $(objtree)
      
      [2] commit 890676c65d69 by Michal Marek
        kbuild: Use relative path when building in the source tree
      
      [3] commit 9da0763bdd82 by Michal Marek
        kbuild: Use relative path when building in a subdir of the source tree
      
      [4] commit c2e28dc975ea by Michal Marek
        kbuild: Print the name of the build directory
      
      [5] commit 066b7ed95580 by Michal Marek
        kbuild: Do not print the build directory with make -s
      
      [6] commit 3f1d9a6cec01 by Michal Marek
        kbuild: make -s should be used with kernelrelease/kernelversion/image_name
      
      [7] commit 7ff525712acf by Masahiro Yamada
        kbuild: fake the "Entering directory ..." message more simply
      
      [8] commit 745a254322c8 by Masahiro Yamada
        kbuild: use $(Q) for sub-make target
      
      [9] commit aa55c8e2f7a3 by Masahiro Yamada
        kbuild: handle C=... and M=... after entering into build directory
      
      [10] commit ab7474ea5361 by Borislav Petkov
        Kbuild: Ignore GREP_OPTIONS env variable
      
      To use relative path feature, tools/Makefile and scripts/Makefile.autoconf
      must be tweaked.
      
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      ffe29ebc
    • Masahiro Yamada's avatar
      kbuild: improve multi-objs dependency and cleanups · cb6e7b0d
      Masahiro Yamada authored
      
      Since Linux 3.18-rc1, Kbuild is able to handle multi-objs
      dependency correctly, which also allows us futher cleanups
      of some makefiles.
      
      This commit imports those commits:
      
      [1] commit c8589d1e9e01 by Masahiro Yamada
      kbuild: handle multi-objs dependency appropriately
      
      [2] commit 97e3226e6e98 by Masahiro Yamada
      kbuild: handle the dependency of multi-objs hostprogs appropriately
      
      [3] commit 022af62d0190 by Masahiro Yamada
      kbuild: refactor script/kconfig/Makefile
      
      [4] commit 221ecca6cafe by Masahiro Yamada
      kbuild: remove redundant clean-files from scripts/kconfig/Makefile
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      cb6e7b0d
    • Masahiro Yamada's avatar
      kbuild: bug fixes and cleanups of Makefile.host · 87e90729
      Masahiro Yamada authored
      
      This commit imports updates of scripts/Makefile.host
      from Linux 3.18-rc1.
      
      Imported commits are:
      
      [1] commit d8d9efe22709 by Masahiro Yamada
        kbuild: fix a typo in scripts/Makefile.host
      
      [2] commit edb950c17de0 by Masahiro Yamada
        kbuild: fix a bug of C++ host program handling
      
      [3] commit 62e2210798ed by Masahiro Yamada
        kbuild: drop shared library support from Makefile.host
      
      [4] commit 663935593915 by Masahiro Yamada
        kbuild: clean up scripts/Makefile.host
      
      [5] commit 1791ff7179f6 by Masahiro Yamada
        kbuild: clean-up and bug fix of scripts/Makefile.host
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      87e90729
    • Masahiro Yamada's avatar
      kbuild: remove "clobber" target · 48aa812d
      Masahiro Yamada authored
      
      Now we stick to Linux Kernel's build system, so squash
      "clobber" to "clean" target.
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      48aa812d
    • Rabin Vincent's avatar
      hush: make run_command() return an error on parsing failure · 2302b3ab
      Rabin Vincent authored
      
      run_command() returns success even if the command had a syntax error;
      correct this behaviour.
      
      Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
      Acked-by: default avatarSimon Glass <sjg@chromium.org)>
      2302b3ab
    • Rabin Vincent's avatar
      hush: fix segfault on syntax error · 128059b9
      Rabin Vincent authored
      
      Hush segfaults if it sees a syntax error while attempting to parse a
      command:
      
       $ ./u-boot -c "'"
       ...
       syntax error
       Segmentation fault (core dumped)
      
      This is due to a NULL pointer dereference of in_str->p in static_peek().
      The problem is that the exit condition for the loop in
      parse_stream_outer() checks for rcode not being -1, but rcode is only
      ever 0 or 1.
      
      Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
      Acked-by: default avatarSimon Glass <sjg@chromium.org)>
      Tested-by: default avatarSimon Glass <sjg@chromium.org)>
      128059b9
    • Rabin Vincent's avatar
      hush: return consistent codes from run_command() · 484408fb
      Rabin Vincent authored
      
      Attempting to run:
       - an empty string
       - a string with just spaces
      
      returns different error codes, 1 for the empty string and 0
      for the string with just spaces.  Make both of them return
      0 for consistency.
      
      Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
      Acked-by: default avatarSimon Glass <sjg@chromium.org)>
      484408fb
    • Rabin Vincent's avatar
      sandbox: init cli for -c · 7dbcb76e
      Rabin Vincent authored
      
      sandbox crashes if a variable is set in the -c command, because
      hush's top_vars is not allocated.  Call cli_init() from sandbox
      to ensure this is done before we execute the -c command.
      
       $ ./u-boot -c 'a=1'
       ...
       Segmentation fault (core dumped)
      
      Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
      Acked-by: default avatarSimon Glass <sjg@chromium.org)>
      Tested-by: default avatarSimon Glass <sjg@chromium.org)>
      7dbcb76e
    • Rabin Vincent's avatar
      dlmalloc: ensure gd is set for early alloc · 854d2b97
      Rabin Vincent authored
      
      Attempting to run the sandbox leads to a segfault, because some dynamic
      libraries (outside of u-boot) attempt to use malloc() to allocate memory
      before u-boot's gd variable is initialized.
      
      Check for gd not being NULL in the SYS_MALLOC_F_LEN handling, so that
      malloc() doesn't crash when called at this point.
      
       $ gdb -q --args ./u-boot
       (gdb) r
       Program received signal SIGSEGV, Segmentation fault.
       0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184
       2184		if (!(gd->flags & GD_FLG_RELOC)) {
       (gdb) p gd
       $1 = (gd_t *) 0x0
       (gdb) bt
       #0  0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184
       #1  0x00007ffff75bf8e1 in set_binding_values (domainname=0x7ffff11f4f12 "libgpg-error", dirnamep=0x7fffffffe168, codesetp=0x0)
           at bindtextdom.c:228
       #2  0x00007ffff75bfb4c in set_binding_values (codesetp=0x0, dirnamep=0x7fffffffe168, domainname=<optimized out>) at bindtextdom.c:350
       #3  __bindtextdomain (domainname=<optimized out>, dirname=0x7ffff11f4f00 "/usr/share/locale") at bindtextdom.c:348
       #4  0x00007ffff11eca17 in ?? () from /lib/x86_64-linux-gnu/libgpg-error.so.0
       #5  0x00007ffff7dea9fa in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe208,
           env=env@entry=0x7fffffffe218) at dl-init.c:78
       #6  0x00007ffff7deaae3 in call_init (env=0x7fffffffe218, argv=0x7fffffffe208, argc=1, l=<optimized out>) at dl-init.c:36
       #7  _dl_init (main_map=0x7ffff7ffe1a8, argc=1, argv=0x7fffffffe208, env=0x7fffffffe218) at dl-init.c:126
       #8  0x00007ffff7ddd1ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2
      
      Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
      Acked-by: default avatarSimon Glass <sjg@chromium.org>
      854d2b97
    • Tom Rini's avatar
      power_spi.c: Rewrite pmic_reg function · 5b471dee
      Tom Rini authored
      
      The pmic_spi_free function isn't ever used, and as the frameworks stand
      today, cannot be, so remove it.  Integrate the probe function into
      pmic_reg as it's not really a "probe" today.  Finally, add an err label
      for the common failure cases.
      
      Cc: Lukasz Majewski <l.majewski@samsung.com>
      Cc: Przemyslaw Marczak <p.marczak@samsung.com>
      Cc: Stefano Babic <sbabic@denx.de>
      Signed-off-by: default avatarTom Rini <trini@ti.com>
      Acked-by: default avatarStefano Babic <sbabic@denx.de>
      5b471dee
    • Noam Camus's avatar
      image-fdt: boot_get_fdt() return value when no DTB exists · c6150aaf
      Noam Camus authored
      
      I believe that when no DTB is around we should return 1.
      This why I fixed such scenarious to not return zero anymore.
      Else kernel might get NULL pointer to DTB which doesn't exists.
      
      Signed-off-by: default avatarNoam Camus <noamc@ezchip.com>
      c6150aaf
    • Anatolij Gustschin's avatar
      8086988f
    • Marek Vasut's avatar
      net: smc911x: Keep MAC programmed · 99dd6ab4
      Marek Vasut authored
      
      Make sure to keep the MAC address programmed in the SMC911x ADDRH
      and ADDRL registers. Linux can read those registers to determine
      the MAC address on EEPROM-less configurations.
      
      Signed-off-by: default avatarMarek Vasut <marex@denx.de>
      Cc: Joe Hershberger <joe.hershberger@ni.com>
      Cc: Tom Rini <trini@ti.com>
      99dd6ab4
    • Pavel Machek's avatar
      sort drivers/mmc/Makefile · 389b89c7
      Pavel Machek authored
      
      Sort drivers/mmc makefile, as requested by wd.
      
      Signed-off-by: default avatarPavel Machek <pavel@denx.de>
      Acked-by: default avatarChin Liang See <clsee@altera.com>
      389b89c7
    • Masahiro Yamada's avatar
      generic-board: make compile-time noise for non-generic boards · 5add293b
      Masahiro Yamada authored
      
      Commit 0f605c15 (Start the deprecation process for generic board)
      added a run-time warning message.  Let's be noisier for non-generic
      boards to inform the dead line of the conversion.
      
      This commit intentionally outputs a warning message to stdout.
      We still have many unconverted boards.  If we print the message
      to stderr, MAKEALL and buildman will report tons of broken boards
      and really important information will be buried.
      
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarMarek Vasut <marex@denx.de>
      Acked-by: default avatarSimon Glass <sjg@chromium.org>
      Cc: Tom Rini <trini@ti.com>
      5add293b
    • Tom Rini's avatar
      Merge git://git.denx.de/u-boot-ti · cfa1bd07
      Tom Rini authored
      cfa1bd07
  2. Nov 06, 2014
Loading