[U-Boot] Please pull u-boot-dm.git branch for-tom

[Simon Glass]

Hi Tom,

Here are the changes that were reviewed by Jagan (SPI maintainer).

Branch is 'for-tom' as I had trouble with master (see below).

The following changes since commit f9860cf081efdf32c8a01b9fc271fe55e2a79f8d:

  nand/denali: Document CONFIG symbols (2014-09-25 13:54:58 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-dm.git

for you to fetch changes up to 248a0488bfbb2eb16dee408a976d5f4b5546bb51:

  spi: Add brackets and tidy defines in spi.h (2014-09-26 15:01:15 -0600)

----------------------------------------------------------------
Simon Glass (4):
      sandbox: Convert SPI flash emulation to use sf_params
      sandbox: config: Enable all SPI flash chips
      dm: spi: Move cmd device code into its own function
      spi: Add brackets and tidy defines in spi.h

 common/cmd_spi.c          |  53
++++++++++++++++++++++++++++++++---------------------
 drivers/mtd/spi/sandbox.c | 114
++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------
 include/configs/sandbox.h |   8 +++++++-
 include/spi.h             |  24 ++++++++++++------------
 4 files changed, 89 insertions(+), 110 deletions(-)


Here's the error I got with master:

git push dm HEAD:master
Counting objects: 19, done.
Delta compression using up to 32 threads.
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 3.19 KiB | 0 bytes/s, done.
Total 19 (delta 15), reused 0 (delta 0)
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree
inconsistent
remote: error: with what you pushed, and will require 'git reset
--hard' to match
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.

Regards,
Simon