mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-09 03:21:51 +00:00
Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit5d3a21df66
, reversing changes made to56d37f1c56
. Unfortunately this is causing CI failures:711313649
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
5d3a21df66
commit
7208396bbf
319 changed files with 653 additions and 2503 deletions
|
@ -114,16 +114,14 @@ def SetInputDirs(dirname):
|
|||
indir = dirname
|
||||
tout.Debug("Using input directories %s" % indir)
|
||||
|
||||
def GetInputFilename(fname, allow_missing=False):
|
||||
def GetInputFilename(fname):
|
||||
"""Return a filename for use as input.
|
||||
|
||||
Args:
|
||||
fname: Filename to use for new file
|
||||
allow_missing: True if the filename can be missing
|
||||
|
||||
Returns:
|
||||
The full path of the filename, within the input directory, or
|
||||
None on error
|
||||
The full path of the filename, within the input directory
|
||||
"""
|
||||
if not indir or fname[:1] == '/':
|
||||
return fname
|
||||
|
@ -132,8 +130,6 @@ def GetInputFilename(fname, allow_missing=False):
|
|||
if os.path.exists(pathname):
|
||||
return pathname
|
||||
|
||||
if allow_missing:
|
||||
return None
|
||||
raise ValueError("Filename '%s' not found in input path (%s) (cwd='%s')" %
|
||||
(fname, ','.join(indir), os.getcwd()))
|
||||
|
||||
|
@ -274,7 +270,7 @@ def ReadFile(fname, binary=True):
|
|||
#(fname, len(data), len(data)))
|
||||
return data
|
||||
|
||||
def WriteFile(fname, data, binary=True):
|
||||
def WriteFile(fname, data):
|
||||
"""Write data into a file.
|
||||
|
||||
Args:
|
||||
|
@ -283,7 +279,7 @@ def WriteFile(fname, data, binary=True):
|
|||
"""
|
||||
#self._out.Info("Write file '%s' size %d (%#0x)" %
|
||||
#(fname, len(data), len(data)))
|
||||
with open(Filename(fname), binary and 'wb' or 'w') as fd:
|
||||
with open(Filename(fname), 'wb') as fd:
|
||||
fd.write(data)
|
||||
|
||||
def GetBytes(byte, size):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue