From 159e3c833f08f3c80abbd137511cf7f9e594d5bb Mon Sep 17 00:00:00 2001 From: Cory Tusar Date: Thu, 29 Aug 2019 19:10:25 +0000 Subject: Documentation: zii-imx7d-dev: Fix errors with openocd configuration script When attempting to use the existing configuration file to bootstrap an RMU2 board, openocd would consistently fail in the 'safe_reset' function with a number of errors. Disabling the internal reset handling (similar to what's done on the i.MX7 Sabre boards) allowed barebox to download and run successfully. Tested with openocd-0.10.0+dev-00924-g16496488 on a Zodiac RMU2. Signed-off-by: Cory Tusar Tested-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- Documentation/boards/imx/zii-imx7d-dev/openocd.cfg | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation') diff --git a/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg b/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg index f971c3fb21..6056b89578 100644 --- a/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg +++ b/Documentation/boards/imx/zii-imx7d-dev/openocd.cfg @@ -138,6 +138,12 @@ proc start_barebox { } { resume $MX7_DDR_BASE_ADDR } +# disable internal reset-assert handling to +# allow reset-init to work +$_TARGETNAME.0 configure -event reset-assert "" +$_TARGETNAME.1 configure -event reset-assert "" +$_TARGETNAME_2 configure -event reset-assert "" + # hook the init function into the reset-init event ${_TARGETNAME}.0 configure -event reset-init { board_init } -- cgit v1.2.3 From f539d54de049730096016ca9d243dedca1e637fb Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Fri, 30 Aug 2019 14:40:01 +0200 Subject: Documentation: efi: fix typos Signed-off-by: Ahmad Fatoum Signed-off-by: Sascha Hauer --- Documentation/boards/efi.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/boards/efi.rst b/Documentation/boards/efi.rst index 3da2daac99..2178c9ab42 100644 --- a/Documentation/boards/efi.rst +++ b/Documentation/boards/efi.rst @@ -43,7 +43,7 @@ name it ``BOOTx64.EFI`` on 64bit architectures and ``BOOTIA32.EFI`` on 32bit architectures. Switching to USB boot in the BIOS should then be enough to start barebox via USB. Some BIOSes allow to specify a path to a binary to be executed, others have a "start UEFI shell" entry which executes -EFI/Shellx64.efi on the :term:`ESP`. This can be a barebox binary aswell. +EFI/Shellx64.efi on the :term:`ESP`. This can be a barebox binary as well. To use the :ref:`state_framework`, the describing devicetree file ``state.dtb`` has to be put into the ``EFI/barebox/`` directory. Supported backends for EFI are raw partitions that can be discovered via a @@ -200,7 +200,7 @@ EFI device paths In EFI each device can be pointed to using a device path. Device paths have multiple components. The toplevel component on X86 systems will be the PCI root complex, on -other systems this can be the physical memory space. Each component will now descrive +other systems this can be the physical memory space. Each component will now describe how to find the child component on the parent bus. Additional device path nodes can describe network addresses or filenames on partitions. Device paths have a binary representation and a clearly defined string representation. These characteristics make @@ -274,7 +274,7 @@ Network Protocol GUID: EFI_GUID( 0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D ) Matching between EFI devices and drivers is done based on the Protocol GUIDs, so -whenever a driver GUID matches one of the GUIDs a device imeplements the drivers +whenever a driver GUID matches one of the GUIDs a device implements the drivers probe function is called. .. _efi_building_edk2: -- cgit v1.2.3 From cd6fe5bd7395c6d0e8bb3629a8d0e376a7984855 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sat, 7 Sep 2019 17:04:32 -0700 Subject: Documentation: Provide default values for version/release Provide default values for version/release so it would be possible to run Sphinx outside of the build system. Useful for rst-sphinx backend of flycheck in Emacs, for example. Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- Documentation/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/conf.py b/Documentation/conf.py index ec6ec0470b..bcd8633c91 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -53,9 +53,9 @@ copyright = u'2014, The barebox project' # The short X.Y version. import os -version = os.environ["KERNELVERSION"] +version = os.environ.get("KERNELVERSION", 'unknown version') # The full version, including alpha/beta/rc tags. -release = os.environ["KERNELRELEASE"] +release = os.environ.get("KERNELRELEASE", 'unknown release') # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit v1.2.3