Commits · c97bd17b2cfea02c9ef34f889bfb336b7c645cf2 · U-Boot / Custodians / MMC U-Boot Custodian Tree

Nov 01, 2021

pxe_utils: Clean up {bootm,zboot}_argv generation · c97bd17b

Zhaofeng Li authored 3 years ago and

Bin Meng committed 3 years ago


Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

c97bd17b

pxe_utils: Fix arguments to x86 zboot · 23f3e399

Zhaofeng Li authored 3 years ago and

Bin Meng committed 3 years ago


bootm and zboot accept different arguments:

> bootm [addr [arg ...]]
>    - boot application image stored in memory
>        passing arguments 'arg ...'; when booting a Linux kernel,
>        'arg' can be the address of an initrd image

> zboot [addr] [size] [initrd addr] [initrd size] [setup] [cmdline]
>       addr -        The optional starting address of the bzimage.
>                     If not set it defaults to the environment
>                     variable "fileaddr".
>       size -        The optional size of the bzimage. Defaults to
>                     zero.
>       initrd addr - The address of the initrd image to use, if any.
>       initrd size - The size of the initrd image to use, if any.

In the zboot flow, the current code will reuse the bootm args and attempt
to pass the initrd arg (argv[2]) as the kernel size (should be argv[3]).
zboot also expects the initrd address and size to be separate arguments.

Let's untangle them and have separate argv/argc locals.

Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

23f3e399

docs: uefi: Update stale U-Boot on EFI doc · 7a0eecb2

Bin Meng authored 3 years ago


The existing intructions in the U-Boot on EFI doc do not work with
the latest QEMU. Update the doc with the correct instructions, as
well as using the new OVMF URL link.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

7a0eecb2

Oct 31, 2021

Merge tag 'dm-pull-boo21' of https://source.denx.de/u-boot/custodians/u-boot-dm · 360e3922

Tom Rini authored 3 years ago

Environment tidy-ups
patman 'postfix' support
fix binman test race condition causing a timeout error

# gpg: Signature made Sun 31 Oct 2021 03:36:55 PM EDT
# gpg:                using RSA key B25C0022AF86A7CC1655B6277F173A3E9008ADE6
# gpg:                issuer "sjg@chromium.org"
# gpg: Good signature from "Simon Glass <sjg@chromium.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B25C 0022 AF86 A7CC 1655  B627 7F17 3A3E 9008 ADE6

360e3922

bootstage: Add SPL support · b55881dd

Marek Vasut authored 3 years ago and

Simon Glass committed 3 years ago


Allow usage of the bootstage facilities in SPL.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

b55881dd

patman: Add "postfix" support to patch subjects · 082c119a

Sean Anderson authored 3 years ago and

Simon Glass committed 3 years ago

In some communities, it may be necessary to append something after PATCH
in the subject line. For example, the Linux networking subsystem
expects [1] patch subject prefixes like [RFC PATCH net-next 0/99]. This
adds support for such "postfix"s to patman. Although entirely cosmetic,
it is still nice to have.

[1] https://www.kernel.org/doc/html/latest/networking/netdev-FAQ.html#how-do-i-indicate-which-tree-net-vs-net-next-my-patch-should-be-in



Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

082c119a

env: Use static_assert() to check if default_environment is too large · 37f3758a

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


Check sizeof(default_environment) against ENV_SIZE in a static_assert()
instead of runtime.
Only check if !USE_HOSTCC (for in fw_env tool ENV_SIZE expands to a
variable, and cannot be checked statically) nad
!DEFAULT_ENV_INSTANCE_EMBEDDED, for in that case the default_environment
variable is not set.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

37f3758a

env: Always use char for default_environment · c5cbbe35

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


Sometimes we use uchar and sometimes char for the default environment
array. By always using char, we can get rid of some explicit casts.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

c5cbbe35

board: freescale: various boards: Let env subsystem set gd->env_addr · b2633482

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago

Various freescale boards set gd->env_addr to default_environment in
board_init(), conditional on CONFIG_ENV_IS_NOWHERE, but this is
redundant, since it is done by env_init() before board_init() is called.

Let the env subsystem handle this.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Ramon Fried <rfried.dev@gmail.com>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Cc: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

b2633482

board: synquacer: developerbox: Don't set gd->env_addr to default_environment · 535870f3

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


This board sets gd->env_addr to default_environment in board_init(), but
the board has environment in SPI flash according to defconfig. Let the
env API handle environment automatically.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

535870f3

env: flash: Cosmetic fix · ee483902

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


Change tab to space in env_flash_init().

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

ee483902

env: flash: Let generic env_init() assign default environment · cf89c518

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


env_flash_init() (both implementations) assigns default environment if
ENV_INVALID, but this is done in the generic env_init() function, which
calls this initializer, so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

cf89c518

env: nowhere: Cosmetic fix · 9fc31062

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


Use spaces instead of tabs in assignments, since there are no lines to
align assignment values to.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

9fc31062

env: nowhere: Let generic env_init() assign default environment · 5aab7f5d

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


env_nowhere_init() assigns default environment if ENV_INVALID, but this
is done in the generic env_init() function, which calls this
initializer, so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

5aab7f5d

env: nvram: Cosmetic fix in env_nvram_init() · a73c1f00

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


Use spaces consistently in assignments instead of tabs.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

a73c1f00

env: nvram: Let generic env_init() assign default environment · 4735de4f

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


env_nvram_init() assigns default environment if ENV_INVALID, but this is
done in the generic env_init() function, which calls this initializer,
so drop it from here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

4735de4f

env: nand: Put ENV_INVALID into gd->env_valid if default environment · 07dcd825

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


env_nand_init() says the environment is valid even if it is assigning
default environment due to not being able to access nand pre-reloaction
(determined by macro values). Change this to ENV_INVALID and let the
generic env_init() function, which calls this initializer, assign the
default environment.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

07dcd825

env: sf: Put ENV_INVALID into gd->env_valid on CRC failure · af8149e9

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


env_sf_init_addr() says the environment is valid even if it is assigning
default environment due to CRC failure. Change this to ENV_INVALID and
let the generic env_init() function, which calls this initializer,
assign the default environment.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

af8149e9

env: sf: Use ENV_VALID enum names instead of literals · 87221bd6

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


The function env_sf_init_addr() assigns number literals (1) instead of
ENV_VALID to gd->env_valid. Fix this.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

87221bd6

env: sf: Cosmetic fix in env_sf_init_addr() · 9ab30d2b

Marek Behún authored 3 years ago and

Simon Glass committed 3 years ago


In the if clause we use tabs and in the else clause spaces. Let's use
spaces in the if clause too.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Simon Glass <sjg@chromium.org>

9ab30d2b

x86: Fix linking u-boot with ld.lld · 58772283

Alistair Delva authored 3 years ago and

Simon Glass committed 3 years ago


When linking the final u-boot binary with LLD, the following link errors
are seen:

ld.lld: error: can't create dynamic relocation R_386_32 against local
               symbol in readonly segment; recompile object files with
               -fPIC or pass '-Wl,-z,notext' to allow text relocations
               in the output
>>> defined in arch/x86/cpu/start.o
>>> referenced by arch/x86/cpu/start.o:(.text.start+0x32)
[...]
>>> defined in arch/x86/cpu/start16.o
>>> referenced by arch/x86/cpu/start16.o:(.start16+0x1C)

According to Nick Desaulniers:

"This is a known difference between GNU and LLVM linkers; the GNU
 linkers permit relocations in readonly segments (making them not read
 only), LLVM does not (by default)."

Since U-Boot apparently seems to use relocations in readonly segments,
change the global linker flags to permit them when linking with LLD by
specifying '-z notext'.

Signed-off-by: Alistair Delva <adelva@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

58772283

sandbox: Migrate ARCH_MAP_SYSMEM to Kconfig · 286a1595

Tom Rini authored 3 years ago and

Simon Glass committed 3 years ago


Move this from a hard-coded define in config.mk to Kconfig.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

286a1595

binman: Allow timeout to occur in the image or its section · b2dfe838

Simon Glass authored 3 years ago


At present testThreadTimeout() assumes that the expected timeout happens
first when building the section, but it can just as easily happen at the
top-level image. Update the test to cope with both.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>

b2dfe838

image.h: make image_sign_info.fit point to const · 2289629f

Hannu Lounento authored 3 years ago and

Simon Glass committed 3 years ago


The data blob apparently does not need to be modified through the fit
field of the image_sign_info struct so make it point to const to avoid
the need to cast away constness in functions that assign a pointer to
const data to the field.

fit_image_setup_verify already had to cast away constness as it assigned
a const void * argument to the field. The cast can now be removed.

Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

2289629f

Merge https://source.denx.de/u-boot/custodians/u-boot-usb · 77680d8f
Tom Rini authored 3 years ago
```
- usb_mass_storage, xhci-brcm bugfixes
```
77680d8f
Merge https://source.denx.de/u-boot/custodians/u-boot-sh · e63a3130
Tom Rini authored 3 years ago
```
- rzg2_beacon updates
```
e63a3130

Merge branch '2021-10-31-assorted-platform-updates' · 50bff6a6

Tom Rini authored 3 years ago

- Revert GIC LPI changes that need to be reworked.
- mvebu SATA booting bugfix
- Samsung Galaxy S9/S9+(SM-G96x0), Samsung Galaxy A and Apple M1
  platform support.

50bff6a6