openstlinux/uboot-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
v2021.10-stm32mp
uboot-st/cmd
History
Patrick Delaunay a46e065f82 cmd: pxe: support INITRD and FDT selection with FIT 
Since the commit d5ba6188df ("cmd: pxe_utils: Check fdtcontroladdr
in label_boot") the FDT or the FDTDIR label is required in extlinux.conf
and the fallback done by bootm command for device tree present is no more
performed when FIT is used for kernel.

When the labels FDT or FDTDIR are absent or if the device tree file is
absent, the PXE command in U-Boot uses the default U-Boot device tree
selected by fdtcontroladdr = gd->fdt_blob, it is the "Scenario 3".

With this patch the bootm FIP fallback is no more possible with
the extlinux.conf when only "kernel" label is present and is a FIP:

  kernel <path>#<conf>[#<extra-conf[#...]]

As the U-Boot FDT is selected in the third bootm argument the device
tree from FIP is not used as it was done previously.

This patch adds a new field kernel_label to save the full kernel label.
The FDT bootm parameters use the kernel address (to avoid to load a
second time the same FIP) and the config when this full label is reused
for "fdt" or "initrd" label.

This FIP support in extlinux.conf is restored when the "FDT" label
can be found and select the same FIP (identical file and configuration):

  kernel <path>#<conf>[#<extra-conf[#...]]
  fdt <path>#<conf>[#<extra-conf[#...]]

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Change-Id: I4662774cdd525de1992f84f0ea97255e2e43d8c2
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/u-boot/+/268490
Reviewed-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: CIBUILD <MDG-smet-aci-builds@list.st.com>
2022-10-17 10:48:26 +02:00
..
arm
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
broadcom
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mvebu
common: Remove unused CONFIG_FIT_SHAxxx selectors
2021-09-08 16:10:34 -04:00
riscv
cmd/exception: support ebreak exception on RISC-V
2021-05-05 16:13:12 +08:00
sandbox
cmd: sandbox: implement exception command
2020-12-13 07:58:17 -07:00
ti
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
x86
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
2021-08-02 21:35:50 -04:00
.gitignore
cmd: rework "license" command
2017-02-08 15:56:28 -05:00
ab_select.c
part: Support getting whole disk from part_get_info_by_dev_and_name_or_num
2021-02-26 15:30:55 +01:00
abootimg.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
acpi.c
cmd: Add missing check for CONFIG_SYS_LONGHELP
2021-03-27 15:04:30 +13:00
adc.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
addrmap.c
cmd: Add a command to display the address map
2021-03-05 10:25:43 +05:30
adtimg.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
aes.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
armflash.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
avb.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
axi.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
bcb.c
cmd: bcb: Add support for processing const string literals in bcb_set()
2021-01-31 14:08:56 +01:00
bdinfo.c
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
2021-02-15 10:16:45 -05:00
bedbug.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
bind.c
cmd: bind: Fix driver binding on a device
2022-05-19 09:21:13 +02:00
binop.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
blk_common.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
blkcache.c
cmd:Elaborate 'blkcache' cmd HELP statement
2021-08-04 15:58:31 -04:00
blob.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
bloblist.c
cmd: Add missing check for CONFIG_SYS_LONGHELP
2021-03-27 15:04:30 +13:00
bmp.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
boot.c
cmd: boot: Update reset usage message
2021-08-26 08:08:11 +02:00
bootcount.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
bootefi.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
booti.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
bootm.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
bootmenu.c
bootmenu: Allow to quit it via ESC/CTRL+C
2021-01-16 14:49:09 -05:00
bootstage.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
bootz.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
btrfs.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
button.c
dm: treewide: Rename 'platdata' variables to just 'plat'
2020-12-13 16:51:08 -07:00
cache.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
cbfs.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
clk.c
cmd: clk: fix long help message
2022-05-19 09:21:14 +02:00
clone.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
cls.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
config.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
conitrace.c
cmd: conitrace: increase wait for next key
2021-01-13 02:38:01 +01:00
console.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
cpu.c
dm: Avoid accessing seq directly
2020-12-18 20:32:21 -07:00
cramfs.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
cros_ec.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
dataflash_mmc_mux.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
date.c
cmd: date: rtc: Update command to read the first RTC with seq 0
2021-08-06 09:32:02 +02:00
demo.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
dfu.c
cmd: dfu: Propagate error if dfu gadget fails
2021-04-23 08:45:55 +02:00
diag.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
disk.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
dm.c
cmd: dm: Fixed/Added DM driver listing subcommands
2020-07-07 15:37:13 -04:00
echo.c
cmd: change suppress newline in echo command
2021-01-25 01:15:33 +01:00
eeprom.c
i2c: Rename CONFIG_SYS_I2C to CONFIG_SYS_I2C_LEGACY
2021-07-28 14:29:37 -04:00
efi.c
common: Drop asm/global_data.h from common header
2021-02-02 15:33:42 -05:00
efidebug.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
elf.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
ethsw.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
exit.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
ext2.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
ext4.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
extension_board.c
cmd: add support for a new "extension" command
2021-05-13 13:09:05 -04:00
fastboot.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
fat.c
cmd: fat: Use do_save() for fatwrite
2020-10-23 13:33:07 -04:00
fdt.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
flash.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
fpga.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
fpgad.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
fs_uuid.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
fs.c
cmd: fs: Add command to list supported fs types
2020-07-07 15:36:59 -04:00
fuse.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
gettime.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
gpio.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
gpt.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
hash.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
help.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
host.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
i2c.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
ide.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
ini.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
io.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
iotrace.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
irq.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
itest.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
jffs2.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
Kconfig
mmc: Add support for enumerating MMC card in a given mode using mmc command
2021-09-10 18:17:04 +08:00
led.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
legacy_led.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
legacy-mtd-utils.c
cmd: nand/sf: isolate legacy code
2019-12-04 17:10:51 -05:00
legacy-mtd-utils.h
cmd: nand/sf: isolate legacy code
2019-12-04 17:10:51 -05:00
license.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
load.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
log.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
lsblk.c
dm: treewide: Rename 'platdata' variables to just 'plat'
2020-12-13 16:51:08 -07:00
lzmadec.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mac.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
Makefile
cmd: setexpr: add format string handling
2021-07-27 14:50:47 -04:00
mbr.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
md5sum.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mdio.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mem.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
mfsl.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mii.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
misc.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mmc.c
mmc: Add support for enumerating MMC card in a given mode using mmc command
2021-09-10 18:17:04 +08:00
mp.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
mtd.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
mtdparts.c
cmd:(cosmetic)Mentioned in 'chpart' command HELP text that it is for MTD devices
2021-08-04 15:58:31 -04:00
mux.c
cmd: Add a mux command
2020-10-28 11:49:31 -04:00
nand.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
net.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
nvedit_efi.c
efi_loader: eliminate EFI_CALL() in nvedit_efi.c
2021-09-11 11:02:02 +02:00
nvedit.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
nvme.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
onenand.c
mtd: Remove mtd_erase_callback() entirely
2022-05-19 09:21:14 +02:00
optee_rpmb.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
osd.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
panic.c
cmd: add a panic command
2020-07-08 17:21:46 -04:00
part.c
cmd: part: Correct error handling
2021-07-23 07:13:25 -04:00
pcap.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
pci.c
pci: Drop old code from pci command
2021-08-05 15:58:48 -04:00
pinmux.c
cmd: pinmux: support pin name in status command
2021-07-23 07:13:25 -04:00
pmc.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
pmic.c
dm: Avoid accessing seq directly
2020-12-18 20:32:21 -07:00
printf.c
cmd: setexpr: add format string handling
2021-07-27 14:50:47 -04:00
printf.h
cmd: setexpr: add format string handling
2021-07-27 14:50:47 -04:00
pstore.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
pvblock.c
xen: pvblock: Add initial support for para-virtualized block driver
2020-08-14 15:18:30 -04:00
pwm.c
cmd: pwm: Remove additional pwm description
2021-08-26 08:08:11 +02:00
pxe_utils.c
cmd: pxe: support INITRD and FDT selection with FIT
2022-10-17 10:48:26 +02:00
pxe_utils.h
cmd: pxe: support INITRD and FDT selection with FIT
2022-10-17 10:48:26 +02:00
pxe.c
cmd: pxe: Add relocation to pxe_sub cmds
2020-09-23 14:29:57 +02:00
qfw.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
read.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
reginfo.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
regulator.c
dm: treewide: Rename ..._platdata variables to just ..._plat
2020-12-13 16:51:09 -07:00
reiser.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
remoteproc.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
rng.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
rockusb.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
rtc.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
sata.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
sb.c
common: Drop asm/global_data.h from common header
2021-02-02 15:33:42 -05:00
scp03.c
cmd: SCP03: enable and provision command
2021-03-13 13:14:52 -05:00
scsi.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
setexpr.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
sf.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
sha1sum.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
sleep.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
smccc.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
sound.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
source.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
spi.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
spl.c
common: Drop asm/global_data.h from common header
2021-02-02 15:33:42 -05:00
sqfs.c
fs/squashfs: add filesystem commands
2020-08-07 22:31:32 -04:00
stackprot_test.c
stackprot: Make our test a bit more complex
2021-05-24 14:23:01 -04:00
strings.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
sysboot.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
terminal.c
terminal: only serial_reinit_all if available
2021-04-12 17:44:55 -04:00
test.c
common: Drop log.h from common header
2020-05-18 21:19:18 -04:00
thordown.c
thor: add support for the dfu_alt_info reintialization from the flashed script
2021-01-31 14:08:56 +01:00
time.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
timer.c
cmd: Split out timer command from the sleep command
2020-10-23 13:33:07 -04:00
tlv_eeprom.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
tpm_test.c
tpm: Switch TPMv1 over to use the new API
2021-03-02 15:53:37 -05:00
tpm-common.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
tpm-user-utils.h
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
tpm-v1.c
tpm: Switch TPMv1 over to use the new API
2021-03-02 15:53:37 -05:00
tpm-v2.c
tpm: use more than sha256 on pcr_extend
2020-12-03 21:22:40 +01:00
trace.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
tsi148.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
ubi.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
ubifs.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
ufs.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
universe.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
unlz4.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
unzip.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
usb_gadget_sdp.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
usb_mass_storage.c
cmd: usb_mass_storage: show device interface name
2021-01-31 14:08:56 +01:00
usb.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
version.c
x86: Make coreboot sysinfo available to any x86 board
2021-03-27 13:59:37 +13:00
virtio.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
w1.c
global: Convert simple_strtoul() with decimal to dectoul()
2021-08-02 13:32:14 -04:00
wdt.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
wol.c
command: Remove the cmd_tbl_t typedef
2020-05-18 18:36:55 -04:00
ximg.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
yaffs2.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
zfs.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00
zip.c
global: Convert simple_strtoul() with hex to hextoul()
2021-08-02 13:32:14 -04:00