]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge branch 'next'
authorTom Rini <trini@konsulko.com>
Mon, 4 Apr 2022 14:45:33 +0000 (10:45 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 4 Apr 2022 14:48:44 +0000 (10:48 -0400)
Signed-off-by: Tom Rini <trini@konsulko.com>
50 files changed:
1  2 
Makefile
arch/Kconfig
configs/MPC8548CDS_36BIT_defconfig
configs/MPC8548CDS_defconfig
configs/MPC8548CDS_legacy_defconfig
configs/P1010RDB-PA_36BIT_NAND_defconfig
configs/P1010RDB-PA_36BIT_NOR_defconfig
configs/P1010RDB-PA_36BIT_SDCARD_defconfig
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig
configs/P1010RDB-PA_NAND_defconfig
configs/P1010RDB-PA_NOR_defconfig
configs/P1010RDB-PA_SDCARD_defconfig
configs/P1010RDB-PA_SPIFLASH_defconfig
configs/P1010RDB-PB_36BIT_NAND_defconfig
configs/P1010RDB-PB_36BIT_NOR_defconfig
configs/P1010RDB-PB_36BIT_SDCARD_defconfig
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig
configs/P1010RDB-PB_NAND_defconfig
configs/P1010RDB-PB_NOR_defconfig
configs/P1010RDB-PB_SDCARD_defconfig
configs/P1010RDB-PB_SPIFLASH_defconfig
configs/P1020RDB-PC_36BIT_NAND_defconfig
configs/P1020RDB-PC_36BIT_SDCARD_defconfig
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig
configs/P1020RDB-PC_36BIT_defconfig
configs/P1020RDB-PC_NAND_defconfig
configs/P1020RDB-PC_SDCARD_defconfig
configs/P1020RDB-PC_SPIFLASH_defconfig
configs/P1020RDB-PC_defconfig
configs/P1020RDB-PD_NAND_defconfig
configs/P1020RDB-PD_SDCARD_defconfig
configs/P1020RDB-PD_SPIFLASH_defconfig
configs/P1020RDB-PD_defconfig
configs/P2020RDB-PC_36BIT_NAND_defconfig
configs/P2020RDB-PC_36BIT_SDCARD_defconfig
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig
configs/P2020RDB-PC_36BIT_defconfig
configs/P2020RDB-PC_NAND_defconfig
configs/P2020RDB-PC_SDCARD_defconfig
configs/P2020RDB-PC_SPIFLASH_defconfig
configs/P2020RDB-PC_defconfig
configs/socrates_defconfig
doc/develop/event.rst
doc/usage/cmd/bootmenu.rst
doc/usage/cmd/event.rst
doc/usage/index.rst
drivers/video/video-uclass.c
include/configs/imx8mm_venice.h
include/configs/imx8mn_venice.h
include/configs/socfpga_vining_fpga.h

diff --cc Makefile
Simple merge
diff --cc arch/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,6e144cfcddf4da0470a63e2fe9c86f8f77c39ed5..6951ec97e775d9738491f0f382aa2b261d0433df
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,66 +1,66 @@@
 -`CONFIG_CMD_EVENT`. The :doc:`../usage/event` command can then be used to
+ .. SPDX-License-Identifier: GPL-2.0+
+ Events
+ ======
+ U-Boot supports a way for various events to be handled by interested
+ subsystems. This provide a generic way to handle 'hooks' like setting up the
+ CPUs after driver model is active, or reading a partition table after a new
+ block device is probed.
+ Rather than using weak functions and direct calls across subsystemss, it is
+ often easier to use an event.
+ An event consists of a type (e.g. EVT_DM_POST_INIT) and some optional data,
+ in `union event_data`. An event spy can be creasted to watch for events of a
+ particular type. When the event is created, it is sent to each spy in turn.
+ Declaring a spy
+ ---------------
+ To declare a spy, use something like this::
+     static int snow_setup_cpus(void *ctx, struct event *event)
+     {
+         /* do something */
+         return 0;
+     }
+     EVENT_SPY(EVT_DM_POST_INIT, snow_setup_cpus);
+ Your function is called when EVT_DM_POST_INIT is emitted, i.e. after driver
+ model is inited (in SPL, or in U-Boot proper before and after relocation).
+ Debugging
+ ---------
+ To assist with debugging events, enable `CONFIG_EVENT_DEBUG` and
++`CONFIG_CMD_EVENT`. The :doc:`../usage/cmd/event` command can then be used to
+ provide a spy list.
+ It is also possible to list spy information from the U-Boot executable,, using
+ the `event_dump.py` script::
+     $ scripts/event_dump.py /tmp/b/sandbox/u-boot
+     Event type            Id                              Source location
+     --------------------  ------------------------------  ------------------------------
+     EVT_MISC_INIT_F       f:sandbox_misc_init_f           arch/sandbox/cpu/start.c:125
+ This shows each event spy in U-Boot, along with the event type, function name
+ (or ID) and source location.
+ Note that if `CONFIG_EVENT_DEBUG` is not enabled, the event ID is missing, so
+ the function is shown instead (with an `f:` prefix as above). Since the ID is
+ generally the same as the function name, this does not matter much.
+ The event type is decoded by the symbol used by U-Boot for the event linker
+ list. Symbols have the form::
+     _u_boot_list_2_evspy_info_2_EVT_MISC_INIT_F
+ so the event type can be read from the end. To manually list spy information
+ in an image, use $(CROSS_COMPILE)nm::
+     nm u-boot |grep evspy |grep list
+     00000000002d6300 D _u_boot_list_2_evspy_info_2_EVT_MISC_INIT_F
Simple merge
index 0000000000000000000000000000000000000000,c0f8acd727b878a7824e6773dea60be80e1204fa..47c900d17e9e6f0e8c134674c3fc0b69b46ea4ab
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,49 +1,49 @@@
 -See :doc:`../develop/event` for more information on events.
+ .. SPDX-License-Identifier: GPL-2.0+
+ event command
+ =============
+ Synopsis
+ --------
+ ::
+     event list
+ Description
+ -----------
+ The event command provides spy list.
+ This shows the following information:
+ Seq
+     Sequence number of the spy, numbered from 0
+ Type
+     Type of the spy, both as a number and a label. If `CONFIG_EVENT_DEBUG` is
+     not enabled, the label just shows `(unknown)`.
+ Function
+     Address of the function to call
+ ID
+     ID string for this event, if `CONFIG_EVENT_DEBUG` is enabled. Otherwise this
+     just shows `?`.
++See :doc:`../../develop/event` for more information on events.
+ Example
+ -------
+ ::
+     => event list
+     Seq  Type                              Function  ID
+       0  7   misc_init_f               55a070517c68  ?
+ Configuration
+ -------------
+ The event command is only available if CONFIG_CMD_EVENT=y.
index 8a54d9cb03074f76eb0e7cbf9e57ad3b552ba958,3e520530c62103fb16335dbef069f3c301313d02..f457bffc2c4a441be1a5f7d2ae0d1b1b5c2c9b1f
@@@ -18,47 -19,39 +19,48 @@@ Shell command
  .. toctree::
     :maxdepth: 1
  
 -   acpi
 -   addrmap
 -   askenv
 -   base
 -   bootefi
 -   booti
 -   bootmenu
 -   button
 -   x86/cbsysinfo
 -   conitrace
 -   echo
 -   event
 -   exception
 -   extension
 -   exit
 -   false
 -   fatinfo
 -   fatload
 -   for
 -   load
 -   loady
 -   mbr
 -   md
 -   mmc
 -   pinmux
 -   pstore
 -   qfw
 -   reset
 -   sbi
 -   sf
 -   scp03
 -   setexpr
 -   size
 -   true
 -   ums
 -   wdt
 +   cmd/acpi
 +   cmd/addrmap
 +   cmd/askenv
 +   cmd/base
 +   cmd/bootefi
 +   cmd/booti
 +   cmd/bootmenu
 +   cmd/button
 +   cmd/cbsysinfo
 +   cmd/conitrace
 +   cmd/echo
++   cmd/event
 +   cmd/exception
 +   cmd/extension
 +   cmd/exit
 +   cmd/false
 +   cmd/fatinfo
 +   cmd/fatload
 +   cmd/for
 +   cmd/load
 +   cmd/loady
 +   cmd/mbr
 +   cmd/md
 +   cmd/mmc
 +   cmd/pinmux
 +   cmd/pstore
 +   cmd/qfw
 +   cmd/reset
 +   cmd/sbi
 +   cmd/sf
 +   cmd/scp03
 +   cmd/setexpr
 +   cmd/size
 +   cmd/true
 +   cmd/ums
 +   cmd/wdt
 +
 +Booting OS
 +----------
 +
 +.. toctree::
 +   :maxdepth: 1
 +
 +   os/plan9
 +   os/vxworks
Simple merge
Simple merge
Simple merge
Simple merge