From: Tom Rini Date: Wed, 18 Sep 2024 19:07:19 +0000 (-0600) Subject: Merge patch series "Fix various bugs" X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=c17805e19b9335e1fb5295c81b59eddf88d1b9ec;p=u-boot.git Merge patch series "Fix various bugs" Simon Glass says: This series includes the patches needed to make make the EFI 'boot' test work. That test has now been split off into a separate series along with the EFI patches. This series fixes these problems: - sandbox memory-mapping conflict with PCI - the fix for that causes the mbr test to crash as it sets up pointers instead of addresses for its 'mmc' commands - the mmc and read commands which cast addresses to pointers - a tricky bug to do with USB keyboard and stdio - a few other minor things --- c17805e19b9335e1fb5295c81b59eddf88d1b9ec diff --cc doc/arch/sandbox/sandbox.rst index 4967551724,1515f93c84..a8b0d7f039 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@@ -655,15 -655,17 +655,17 @@@ Memory Ma Sandbox has its own emulated memory starting at 0. Here are some of the things that are mapped into that memory: - ======= ======================== =============================== -======== ======================== =============================== --Addr Config Usage - ======= ======================== =============================== - 100 CONFIG_SYS_FDT_LOAD_ADDR Device tree - b000 CONFIG_BLOBLIST_ADDR Blob list - 10000 CFG_MALLOC_F_ADDR Early memory allocation - f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer - 100000 TCG Event log TCG Event Log - 200000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used -======== ======================== =============================== - 100 CONFIG_SYS_FDT_LOAD_ADDR Device tree - b000 CONFIG_BLOBLIST_ADDR Blob list - 10000 CFG_MALLOC_F_ADDR Early memory allocation - f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer - 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used -- as the SPL load buffer in spl_test_load(). - 400000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) - ======= ======================== =============================== - 200000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) -10000000 PCI address space (see test.dts) - -ff000000 Memory-mapping tags start here -======== ======================== =============================== ++======== ======================== =============================== ++Addr Config Usage ++======== ======================== =============================== ++ 100 CONFIG_SYS_FDT_LOAD_ADDR Device tree ++ b000 CONFIG_BLOBLIST_ADDR Blob list ++ 10000 CFG_MALLOC_F_ADDR Early memory allocation ++ f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer ++ 100000 TCG Event log TCG Event Log ++ 200000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used ++ 400000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) ++10000000 PCI address space (see test.dts) ++ ++ff000000 Memory-mapping tags start here ++======== ======================== ===============================