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

Masahiro YAMADA yamada.m at jp.panasonic.com
Sat Sep 27 17:15:30 CEST 2014


Hi Simon, Felipe,

2014-09-27 9:57 GMT+09:00 Felipe Balbi <balbi at ti.com>:
> On Fri, Sep 26, 2014 at 05:52:11PM -0600, Simon Glass wrote:
>> 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
>
> why isn't u-boot-dm.git a bare repository ? Seems like you have
> refs/heads/master checked out. Odd.
>


Me too.

I cannot push to  git.denx.de/u-boot-uniphier.git
because the 'master' branch is checked out.

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/


-- 
Best Regards
Masahiro Yamada


More information about the U-Boot mailing list