Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-18 10:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2021-06-22-assorted-fixes'

Browse source 
- Assorted minor bugfixes
This commit is contained in:
Tom Rini 2021-06-23 08:45:09 -04:00
commit 6fc0a2f76b
15 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -882,6 +882,7 @@ F: arch/mips/dts/mrvl,cn73xx.dtsi
MMC
M: Peng Fan <peng.fan@nxp.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-mmc.git
F: drivers/mmc/

2
Makefile
View file

@ -2279,7 +2279,7 @@ endif
$(build)=$(build-dir) $(@:.ko=.o)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
quiet_cmd_genenv = GENENV $@
quiet_cmd_genenv = GENENV $@
cmd_genenv = $(OBJCOPY) --dump-section .rodata.default_environment=$@ env/common.o; \
sed --in-place -e 's/\x00/\x0A/g' $@

2
arch/arc/include/asm/global_data.h
View file

@ -6,8 +6,6 @@
#ifndef __ASM_ARC_GLOBAL_DATA_H
#define __ASM_ARC_GLOBAL_DATA_H
#include <config.h>
#ifndef __ASSEMBLY__
/* Architecture-specific global data */
struct arch_global_data {

2
arch/arm/include/asm/global_data.h
View file

@ -9,6 +9,8 @@
#ifndef __ASSEMBLY__
#include <config.h>
#include <asm/types.h>
#include <linux/types.h>

2
arch/m68k/include/asm/global_data.h
View file

@ -7,6 +7,8 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
#include <config.h>
/* Architecture-specific global data */
struct arch_global_data {
#ifdef CONFIG_SYS_I2C_FSL

2
arch/nds32/include/asm/global_data.h
View file

@ -17,6 +17,8 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
#include <config.h>
/* Architecture-specific global data */
struct arch_global_data {
};

2
arch/powerpc/include/asm/global_data.h
View file

@ -8,7 +8,7 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
#include "config.h"
#include <config.h>
#include "asm/types.h"
/* Architecture-specific global data */

1
arch/powerpc/lib/traps.c
View file

@ -4,7 +4,6 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
#include <common.h>
#include <init.h>
#include <asm/global_data.h>

8
common/autoboot.c
View file

@ -44,8 +44,8 @@ static int menukey;
#define AUTOBOOT_STOP_STR_SHA256 ""
#endif
#ifdef CONFIG_USE_AUTOBOOT_MENUKEY
#define AUTOBOOT_MENUKEY CONFIG_USE_AUTOBOOT_MENUKEY
#ifdef CONFIG_AUTOBOOT_USE_MENUKEY
#define AUTOBOOT_MENUKEY CONFIG_AUTOBOOT_USE_MENUKEY
#else
#define AUTOBOOT_MENUKEY 0
#endif
@ -282,7 +282,7 @@ static int abortboot_single_key(int bootdelay)
abort = 1; /* don't auto boot */
bootdelay = 0; /* no more delay */
key = getchar();/* consume input */
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY))
if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY))
menukey = key;
break;
}
@ -388,7 +388,7 @@ void autoboot_command(const char *s)
disable_ctrlc(prev); /* restore Ctrl-C checking */
}
if (IS_ENABLED(CONFIG_USE_AUTOBOOT_MENUKEY) &&
if (IS_ENABLED(CONFIG_AUTOBOOT_USE_MENUKEY) &&
menukey == AUTOBOOT_MENUKEY) {
s = env_get("menucmd");
if (s)

10
common/dlmalloc.c
View file

@ -1,3 +1,13 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* This code is based on a version (aka dlmalloc) of malloc/free/realloc written
* by Doug Lea and released to the public domain, as explained at
* http://creativecommons.org/publicdomain/zero/1.0/-
*
* The original code is available at http://gee.cs.oswego.edu/pub/misc/
* as file malloc-2.6.6.c.
*/
#include <common.h>
#include <log.h>
#include <asm/global_data.h>

2
disk/part_dos.c
View file

@ -424,7 +424,7 @@ int write_mbr_partitions(struct blk_desc *dev,
}
/* Update the partition table entries*/
part_init(dev_desc);
part_init(dev);
return 0;
}

2
doc/git-mailrc
View file

@ -119,7 +119,7 @@ alias kerneldoc uboot, marex
alias fdt uboot, sjg
alias i2c uboot, hs
alias kconfig uboot, masahiro
alias mmc uboot, freenix
alias mmc uboot, freenix, jaehoon
alias nand uboot
alias net uboot, jhersh
alias phy uboot, jhersh

1
include/configs/socfpga_soc64_common.h
View file

@ -21,7 +21,6 @@
/* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */
#define CPU_RELEASE_ADDR 0xFFD12210
#define CONFIG_SYS_CACHELINE_SIZE 64
#define CONFIG_SYS_MEM_RESERVE_SECURE 0 /* using OCRAM, not DDR */
/*
* U-Boot console configurations

9
include/malloc.h
View file

@ -1,12 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
A version of malloc/free/realloc written by Doug Lea and released to the
public domain. Send questions/comments/complaints/performance data
to dl@cs.oswego.edu
This code is based on a version of malloc/free/realloc written by Doug Lea and
released to the public domain. Send questions/comments/complaints/performance
data to dl@cs.oswego.edu
* VERSION 2.6.6 Sun Mar 5 19:10:03 2000 Doug Lea (dl at gee)
Note: There may be an updated version of this malloc obtainable at
ftp://g.oswego.edu/pub/misc/malloc.c
http://g.oswego.edu/pub/misc/malloc.c
Check before installing!
* Why use this malloc?

4
test/py/tests/test_fs/conftest.py
View file

@ -159,6 +159,10 @@ def mk_fs(config, fs_type, size, id):
count = (size + 1048576 - 1) / 1048576
# Some distributions do not add /sbin to the default PATH, where mkfs lives
if '/sbin' not in os.environ["PATH"].split(os.pathsep):
os.environ["PATH"] += os.pathsep + '/sbin'
try:
check_call('rm -f %s' % fs_img, shell=True)
check_call('dd if=/dev/zero of=%s bs=1M count=%d'