diff options
Diffstat (limited to 'doc')
27 files changed, 609 insertions, 364 deletions
diff --git a/doc/README.NX25 b/doc/README.NX25 new file mode 100644 index 00000000000..9f054e5cf2e --- /dev/null +++ b/doc/README.NX25 @@ -0,0 +1,46 @@ +NX25 is Andes CPU IP to adopt RISC-V architecture. + +Features +======== + +CPU Core + - 5-stage in-order execution pipeline + - Hardware Multiplier + - radix-2/radix-4/radix-16/radix-256/fast + - Hardware Divider + - Optional branch prediction + - Machine mode and optional user mode + - Optional performance monitoring + +ISA + - RV64I base integer instructions + - RVC for 16-bit compressed instructions + - RVM for multiplication and division instructions + +Memory subsystem + - I & D local memory + - Size: 4KB to 16MB + - Memory subsyetem soft-error protection + - Protection scheme: parity-checking or error-checking-and-correction (ECC) + - Automatic hardware error correction + +Bus + - Interface Protocol + - Synchronous AHB (32-bit/64-bit data-width), or + - Synchronous AXI4 (64-bit data-width) + +Power management + - Wait for interrupt (WFI) mode + +Debug + - Configurable number of breakpoints: 2/4/8 + - External Debug Module + - AHB slave port + - External JTAG debug transport module + +Platform Level Interrupt Controller (PLIC) + - AHB slave port + - Configurable number of interrupts: 1-1023 + - Configurable number of interrupt priorities: 3/7/15/63/127/255 + - Configurable number of targets: 1-16 + - Preempted interrupt priority stack diff --git a/doc/README.ae250 b/doc/README.ae250 new file mode 100644 index 00000000000..a80bb39b157 --- /dev/null +++ b/doc/README.ae250 @@ -0,0 +1,137 @@ +Andes Technology SoC AE250 +=========================== + +AE250 is the mainline SoC produced by Andes Technology using NX25 CPU core +base on RISC-V architecture. + +AE250 has integrated both AHB and APB bus and many periphals for application +and product development. + +NX25-AE250 +========= + +NX25-AE250 is the SoC with AE250 hardcore CPU. + +Configurations +============== + +CONFIG_SKIP_LOWLEVEL_INIT: + If you want to boot this system from SPI ROM and bypass e-bios (the + other boot loader on ROM). You should undefine CONFIG_SKIP_LOWLEVEL_INIT + in "include/configs/nx25-ae250.h". + +Build and boot steps +==================== + +build: +1. Prepare the toolchains and make sure the $PATH to toolchains is correct. +2. Use `make nx25-ae250_defconfig` in u-boot root to build the image. + +Verification +==================== + +Target +==================== +1. startup +2. relocation +3. timer driver +4. uart driver +5. mac driver +6. mmc driver +7. spi driver + +Steps +==================== +1. Define CONFIG_SKIP_LOWLEVEL_INIT to build u-boot which is loaded via gdb from ram. +2. Undefine CONFIG_SKIP_LOWLEVEL_INIT to build u-boot which is booted from spi rom. +3. Ping a server by mac driver +4. Scan sd card and copy u-boot image which is booted from flash to ram by sd driver. +5. Burn this u-boot image to spi rom by spi driver +6. Re-boot u-boot from spi flash with power off and power on. + +Messages +==================== +U-Boot 2018.01-rc2-00033-g824f89a (Dec 21 2017 - 16:51:26 +0800) + +DRAM: 1 GiB +MMC: mmc@f0e00000: 0 +SF: Detected mx25u1635e with page size 256 Bytes, erase size 4 KiB, total 2 MiB +In: serial@f0300000 +Out: serial@f0300000 +Err: serial@f0300000 +Net: +Warning: mac@e0100000 (eth0) using random MAC address - be:dd:d7:e4:e8:10 +eth0: mac@e0100000 + +RISC-V # version +U-Boot 2018.01-rc2-00033-gb265b91-dirty (Dec 22 2017 - 13:54:21 +0800) + +riscv32-unknown-linux-gnu-gcc (GCC) 7.2.0 +GNU ld (GNU Binutils) 2.29 + +RISC-V # setenv ipaddr 10.0.4.200 ; +RISC-V # setenv serverip 10.0.4.97 ; +RISC-V # ping 10.0.4.97 ; +Using mac@e0100000 device +host 10.0.4.97 is alive + +RISC-V # mmc rescan +RISC-V # fatls mmc 0:1 + 318907 u-boot-ae250-64.bin + 1252 hello_world_ae250_32.bin + 328787 u-boot-ae250-32.bin + +3 file(s), 0 dir(s) + +RISC-V # sf probe 0:0 50000000 0 +SF: Detected mx25u1635e with page size 256 Bytes, erase size 4 KiB, total 2 MiB + +RISC-V # sf test 0x100000 0x1000 +SPI flash test: +0 erase: 36 ticks, 111 KiB/s 0.888 Mbps +1 check: 29 ticks, 137 KiB/s 1.096 Mbps +2 write: 40 ticks, 100 KiB/s 0.800 Mbps +3 read: 20 ticks, 200 KiB/s 1.600 Mbps +Test passed +0 erase: 36 ticks, 111 KiB/s 0.888 Mbps +1 check: 29 ticks, 137 KiB/s 1.096 Mbps +2 write: 40 ticks, 100 KiB/s 0.800 Mbps +3 read: 20 ticks, 200 KiB/s 1.600 Mbps + +RISC-V # fatload mmc 0:1 0x600000 u-boot-ae250-32.bin +reading u-boot-ae250-32.bin +328787 bytes read in 324 ms (990.2 KiB/s) + +RISC-V # sf erase 0x0 0x51000 +SF: 331776 bytes @ 0x0 Erased: OK + +RISC-V # sf write 0x600000 0x0 0x50453 +device 0 offset 0x0, size 0x50453 +SF: 328787 bytes @ 0x0 Written: OK + +RISC-V # crc32 0x600000 0x50453 +crc32 for 00600000 ... 00650452 ==> 692dc44a + +RISC-V # crc32 0x80000000 0x50453 +crc32 for 80000000 ... 80050452 ==> 692dc44a +RISC-V # + +*** power-off and power-on, this U-Boot is booted from spi flash *** + +U-Boot 2018.01-rc2-00032-gf67dd47-dirty (Dec 21 2017 - 13:56:03 +0800) + +DRAM: 1 GiB +MMC: mmc@f0e00000: 0 +SF: Detected mx25u1635e with page size 256 Bytes, erase size 4 KiB, total 2 MiB +In: serial@f0300000 +Out: serial@f0300000 +Err: serial@f0300000 +Net: +Warning: mac@e0100000 (eth0) using random MAC address - ee:4c:58:29:32:f5 +eth0: mac@e0100000 +RISC-V # + +TODO +==================== + +Boot bbl and riscv-linux diff --git a/doc/README.ext4 b/doc/README.ext4 index 2b0eab5ddec..8ecd21eee3b 100644 --- a/doc/README.ext4 +++ b/doc/README.ext4 @@ -2,10 +2,10 @@ U-Boot supports access of both ext2 and ext4 filesystems, either in read-only mode or in read-write mode. First, to enable support for both ext4 (and, automatically, ext2 as well), -but without selecting the corresponding commands, use one of: +but without selecting the corresponding commands, enable one of the following: - #define CONFIG_FS_EXT4 (for read-only) - #define CONFIG_EXT4_WRITE (for read-write) + CONFIG_FS_EXT4 (for read-only) + CONFIG_EXT4_WRITE (for read-write) Next, to select the ext2-related commands: @@ -20,22 +20,22 @@ or ext4-related commands: use one or both of: - #define CONFIG_CMD_EXT2 - #define CONFIG_CMD_EXT4 + CONFIG_CMD_EXT2 + CONFIG_CMD_EXT4 -Selecting either of the above automatically defines CONFIG_FS_EXT4 if it -wasn't defined already. +Selecting either of the above automatically selects CONFIG_FS_EXT4 if it +wasn't enabled already. -In addition, to get the write access command "ext4write", use: +In addition, to get the write access command "ext4write", enable: - #define CONFIG_CMD_EXT4_WRITE + CONFIG_CMD_EXT4_WRITE -which automatically defines CONFIG_EXT4_WRITE if it wasn't defined +which automatically selects CONFIG_EXT4_WRITE if it wasn't defined already. Also relevant are the generic filesystem commands, selected by: - #define CONFIG_CMD_FS_GENERIC + CONFIG_CMD_FS_GENERIC This does not automatically enable EXT4 support for you, you still need to do that yourself. diff --git a/doc/README.m54418twr b/doc/README.m54418twr index 1d90fccbcff..0ca74aa114c 100644 --- a/doc/README.m54418twr +++ b/doc/README.m54418twr @@ -63,7 +63,6 @@ Changed files: 1.2 Configuration settings for M54418TWR Development Board CONFIG_MCF5441x -- define for all MCF5441x CPUs CONFIG_M54418 -- define for all Freescale MCF54418 CPUs -CONFIG_M54418TWR -- define for M54418TWR board CONFIG_MCFUART -- define to use common CF Uart driver CONFIG_SYS_UART_PORT -- define UART port number, start with 0, 1 and 2 diff --git a/doc/README.qemu-arm b/doc/README.qemu-arm index 2895e3b97ff..aee789447ae 100644 --- a/doc/README.qemu-arm +++ b/doc/README.qemu-arm @@ -4,11 +4,12 @@ # SPDX-License-Identifier: GPL-2.0+ # -U-Boot on QEMU's 'virt' machine on ARM -====================================== +U-Boot on QEMU's 'virt' machine on ARM & AArch64 +================================================ QEMU for ARM supports a special 'virt' machine designed for emulation and virtualization purposes. This document describes how to run U-Boot under it. +Both 32-bit ARM and AArch64 are supported. The 'virt' platform provides the following as the basic functionality: @@ -17,7 +18,7 @@ The 'virt' platform provides the following as the basic functionality: - A generated device tree blob placed at the start of RAM - A freely configurable amount of RAM, described by the DTB - A PL011 serial port, discoverable via the DTB - - An ARMv7 architected timer + - An ARMv7/ARMv8 architected timer - PSCI for rebooting the system - A generic ECAM-based PCI host controller, discoverable via the DTB @@ -25,19 +26,29 @@ Additionally, a number of optional peripherals can be added to the PCI bus. Building U-Boot --------------- -Set the CROSS_COMPILE and ARCH=arm environment variables as usual, and run: +Set the CROSS_COMPILE environment variable as usual, and run: +- For ARM: make qemu_arm_defconfig make +- For AArch64: + make qemu_arm64_defconfig + make + Running U-Boot -------------- The minimal QEMU command line to get U-Boot up and running is: +- For ARM: qemu-system-arm -machine virt,highmem=off -bios u-boot.bin +- For AArch64: + qemu-system-aarch64 -machine virt,highmem=off -cpu cortex-a57 -bios u-boot.bin + The 'highmem=off' parameter to the 'virt' machine is required for PCI to work -in U-Boot. +in U-Boot. Also, for some odd reason qemu-system-aarch64 needs to be explicitly +told to use a 64-bit CPU or it will boot in 32-bit mode. Additional peripherals that have been tested to work in both U-Boot and Linux can be enabled with the following command line parameters: diff --git a/doc/README.rockusb b/doc/README.rockusb new file mode 100644 index 00000000000..5405dc48c11 --- /dev/null +++ b/doc/README.rockusb @@ -0,0 +1,51 @@ +Rockusb (Rockchip USB protocol) +===================================================== + +Overview +-------- + +Rockusb protocol is widely used by Rockchip SoC based devices. It can +read/write info, image to/from devices. This document briefly describes how to +use Rockusb for upgrading firmware (e.g. kernel, u-boot, rootfs, etc.). + +Tools +-------- +There are many tools can support Rockusb protocol. rkdeveloptool +(https://github.com/rockchip-linux/rkdeveloptool) is open source, +It is maintained by Rockchip. People don't want to build from source +can download from here +(https://github.com/rockchip-linux/rkbin/blob/master/tools/rkdeveloptool) + +Usage +-------- +The Usage of Rockusb command is: + +rockusb <USB_controller> <devtype> <dev[:part]> + +e.g. rockusb 0 mmc 0 + +On your U-Boot console, type this command to enter rockusb mode. +On your host PC. use lsusb command. you should see a usb device +using 0x2207 as its USB verdor id. + +for more detail about the rkdeveloptool. please read the usage. + +rkdeveloptool -h + +use rkdeveloptool wl command to write lba. BeginSec is the lba on device +you want to write. + +sudo rkdeveloptool wl <BeginSec> <File> + +to flash U-Boot image use below command. U-Boot binary is made by mkimage. +see doc/README.rockchip for more detail about how to get U-Boot binary. + +sudo rkdeveloptool wl 64 <U-Boot binary> + +There are plenty of Rockusb command. but wl(write lba) and +rd(reboot) command. These two command can let people flash +image to device. + +To do +----- +* Fully support Rockusb protocol diff --git a/doc/README.standalone b/doc/README.standalone index 659a12f6cb7..28ebde1dec7 100644 --- a/doc/README.standalone +++ b/doc/README.standalone @@ -58,6 +58,7 @@ Design Notes on Exporting U-Boot Functions to Standalone Applications: Blackfin 0x00001000 0x00001000 NDS32 0x00300000 0x00300000 Nios II 0x02000000 0x02000000 + RISC-V 0x00600000 0x00600000 For example, the "hello world" application may be loaded and executed on a PowerPC board with the following commands: diff --git a/doc/README.uniphier b/doc/README.uniphier index 0fa3248fae7..990806ab793 100644 --- a/doc/README.uniphier +++ b/doc/README.uniphier @@ -142,7 +142,7 @@ The following is an example for a simple usecase: #address-cells = <1>; images { - kernel@0 { + kernel { description = "linux"; data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/Image.gz"); type = "kernel"; @@ -151,44 +151,44 @@ The following is an example for a simple usecase: compression = "gzip"; load = <0x82080000>; entry = <0x82080000>; - hash@0 { + hash-1 { algo = "sha256"; }; }; - fdt@0 { + fdt-1 { description = "fdt"; data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; - hash@0 { + hash-1 { algo = "sha256"; }; }; - ramdisk@0 { + ramdisk { description = "ramdisk"; data = /incbin/("PATH/TO/YOUR/ROOTFS/DIR/rootfs.cpio"); type = "ramdisk"; arch = "arm64"; os = "linux"; compression = "none"; - hash@0 { + hash-1 { algo = "sha256"; }; }; }; configurations { - default = "config@0"; + default = "config-1"; - config@0 { + config-1 { description = "Configuration0"; - kernel = "kernel@0"; - fdt = "fdt@0"; - ramdisk = "ramdisk@0"; - signature@0 { + kernel = "kernel"; + fdt = "fdt-1"; + ramdisk = "ramdisk"; + signature-1 { algo = "sha256,rsa2048"; key-name-hint = "dev"; sign-images = "kernel", "fdt", "ramdisk"; @@ -268,9 +268,9 @@ If it is successful, you will see messages like follows: ---------------------------------------->8---------------------------------------- ## Loading kernel from FIT Image at 84100000 ... - Using 'config@0' configuration + Using 'config-1' configuration Verifying Hash Integrity ... sha256,rsa2048:dev+ OK - Trying 'kernel@0' kernel subimage + Trying 'kernel' kernel subimage Description: linux Created: 2017-10-20 14:32:29 UTC Type: Kernel Image @@ -285,8 +285,8 @@ If it is successful, you will see messages like follows: Hash value: 82a37b7f11ae55f4e07aa25bf77e4067cb9dc1014d52d6cd4d588f92eee3aaad Verifying Hash Integrity ... sha256+ OK ## Loading ramdisk from FIT Image at 84100000 ... - Using 'config@0' configuration - Trying 'ramdisk@0' ramdisk subimage + Using 'config-1' configuration + Trying 'ramdisk' ramdisk subimage Description: ramdisk Created: 2017-10-20 14:32:29 UTC Type: RAMDisk Image @@ -301,8 +301,8 @@ If it is successful, you will see messages like follows: Hash value: 44980a2874154a2e31ed59222c9f8ea968867637f35c81e4107a984de7014deb Verifying Hash Integrity ... sha256+ OK ## Loading fdt from FIT Image at 84100000 ... - Using 'config@0' configuration - Trying 'fdt@0' fdt subimage + Using 'config-1' configuration + Trying 'fdt-1' fdt subimage Description: fdt Created: 2017-10-20 14:32:29 UTC Type: Flat Device Tree diff --git a/doc/chromium/chromebook_jerry.its b/doc/chromium/chromebook_jerry.its index 8cff840e008..7505a20535b 100644 --- a/doc/chromium/chromebook_jerry.its +++ b/doc/chromium/chromebook_jerry.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "U-Boot mainline"; type = "kernel_noload"; arch = "arm"; @@ -14,29 +14,29 @@ compression = "none"; load = <0>; entry = <0>; - hash@2 { + hash-2 { algo = "sha1"; }; }; - fdt@1{ + fdt-1{ description = "rk3288-veryron-jerry.dtb"; data = /incbin/("../../b/chromebook_jerry/u-boot.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1{ + hash-1{ algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot U-Boot"; - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/doc/chromium/nyan-big.its b/doc/chromium/nyan-big.its index 8dc8d73041a..37d4e10949e 100644 --- a/doc/chromium/nyan-big.its +++ b/doc/chromium/nyan-big.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "U-Boot mainline"; type = "kernel_noload"; arch = "arm"; @@ -14,29 +14,29 @@ compression = "none"; load = <0>; entry = <0>; - hash@2 { + hash-2 { algo = "sha1"; }; }; - fdt@1{ + fdt-1{ description = "tegra124-nyan-big.dtb"; data = /incbin/("../.././b/nyan-big/u-boot.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1{ + hash-1{ algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot U-Boot"; - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/doc/uImage.FIT/beaglebone_vboot.txt b/doc/uImage.FIT/beaglebone_vboot.txt index b4ab28542e5..f1862c2753b 100644 --- a/doc/uImage.FIT/beaglebone_vboot.txt +++ b/doc/uImage.FIT/beaglebone_vboot.txt @@ -130,7 +130,7 @@ Put this into a file in that directory called sign.its: #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("Image.lzo"); type = "kernel"; arch = "arm"; @@ -138,27 +138,27 @@ Put this into a file in that directory called sign.its: compression = "lzo"; load = <0x80008000>; entry = <0x80008000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - fdt@1 { + fdt-1 { description = "beaglebone-black"; data = /incbin/("am335x-boneblack.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1 { + hash-1 { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature-1 { algo = "sha1,rsa2048"; key-name-hint = "dev"; sign-images = "fdt", "kernel"; @@ -211,7 +211,7 @@ You should see something like this: FIT description: Beaglebone black Created: Sun Jun 1 12:50:30 2014 - Image 0 (kernel@1) + Image 0 (kernel) Description: unavailable Created: Sun Jun 1 12:50:30 2014 Type: Kernel Image @@ -223,7 +223,7 @@ Created: Sun Jun 1 12:50:30 2014 Entry Point: 0x80008000 Hash algo: sha1 Hash value: c94364646427e10f423837e559898ef02c97b988 - Image 1 (fdt@1) + Image 1 (fdt-1) Description: beaglebone-black Created: Sun Jun 1 12:50:30 2014 Type: Flat Device Tree @@ -232,11 +232,11 @@ Created: Sun Jun 1 12:50:30 2014 Architecture: ARM Hash algo: sha1 Hash value: cb09202f889d824f23b8e4404b781be5ad38a68d - Default Configuration: 'conf@1' - Configuration 0 (conf@1) + Default Configuration: 'conf-1' + Configuration 0 (conf-1) Description: unavailable - Kernel: kernel@1 - FDT: fdt@1 + Kernel: kernel + FDT: fdt-1 Now am335x-boneblack-pubkey.dtb contains the public key and image.fit contains @@ -251,12 +251,12 @@ which results in: Verifying Hash Integrity ... sha1,rsa2048:dev+ ## Loading kernel from FIT Image at 7fc6ee469000 ... - Using 'conf@1' configuration + Using 'conf-1' configuration Verifying Hash Integrity ... sha1,rsa2048:dev+ OK - Trying 'kernel@1' kernel subimage + Trying 'kernel' kernel subimage Description: unavailable Created: Sun Jun 1 12:50:30 2014 Type: Kernel Image @@ -274,8 +274,8 @@ OK Unimplemented compression type 4 ## Loading fdt from FIT Image at 7fc6ee469000 ... - Using 'conf@1' configuration - Trying 'fdt@1' fdt subimage + Using 'conf-1' configuration + Trying 'fdt-1' fdt subimage Description: beaglebone-black Created: Sun Jun 1 12:50:30 2014 Type: Flat Device Tree @@ -291,7 +291,7 @@ OK Loading Flat Device Tree ... OK ## Loading ramdisk from FIT Image at 7fc6ee469000 ... - Using 'conf@1' configuration + Using 'conf-1' configuration Could not find subimage node Signature check OK @@ -313,8 +313,8 @@ the above flow works. But it is fun to do this by hand, so you can load image.fit into a hex editor like ghex, and change a byte in the kernel: - $UOUT/tools/fit_info -f image.fit -n /images/kernel@1 -p data -NAME: kernel@1 + $UOUT/tools/fit_info -f image.fit -n /images/kernel -p data +NAME: kernel LEN: 7790938 OFF: 168 @@ -324,12 +324,12 @@ fit_check_sign again. You should see something like: Verifying Hash Integrity ... sha1,rsa2048:dev+ ## Loading kernel from FIT Image at 7f5a39571000 ... - Using 'conf@1' configuration + Using 'conf-1' configuration Verifying Hash Integrity ... sha1,rsa2048:dev+ OK - Trying 'kernel@1' kernel subimage + Trying 'kernel' kernel subimage Description: unavailable Created: Sun Jun 1 13:09:21 2014 Type: Kernel Image @@ -343,12 +343,12 @@ OK Hash value: c94364646427e10f423837e559898ef02c97b988 Verifying Hash Integrity ... sha1 error -Bad hash value for 'hash@1' hash node in 'kernel@1' image node +Bad hash value for 'hash-1' hash node in 'kernel' image node Bad Data Hash ## Loading fdt from FIT Image at 7f5a39571000 ... - Using 'conf@1' configuration - Trying 'fdt@1' fdt subimage + Using 'conf-1' configuration + Trying 'fdt-1' fdt subimage Description: beaglebone-black Created: Sun Jun 1 13:09:21 2014 Type: Flat Device Tree @@ -364,7 +364,7 @@ OK Loading Flat Device Tree ... OK ## Loading ramdisk from FIT Image at 7f5a39571000 ... - Using 'conf@1' configuration + Using 'conf-1' configuration Could not find subimage node Signature check Bad (error 1) @@ -386,11 +386,11 @@ images configurations fdtget -l image.fit /configurations -conf@1 -fdtget -l image.fit /configurations/conf@1 -signature@1 +conf-1 +fdtget -l image.fit /configurations/conf-1 +signature-1 - fdtget -p image.fit /configurations/conf@1/signature@1 + fdtget -p image.fit /configurations/conf-1/signature-1 hashed-strings hashed-nodes timestamp @@ -401,20 +401,20 @@ algo key-name-hint sign-images - fdtget image.fit /configurations/conf@1/signature@1 hashed-nodes -/ /configurations/conf@1 /images/fdt@1 /images/fdt@1/hash@1 /images/kernel@1 /images/kernel@1/hash@1 + fdtget image.fit /configurations/conf-1/signature-1 hashed-nodes +/ /configurations/conf-1 /images/fdt-1 /images/fdt-1/hash /images/kernel /images/kernel/hash-1 This gives us a bit of a look into the signature that mkimage added. Note you can also use fdtdump to list the entire device tree. Say we want to change the kernel that this configuration uses -(/images/kernel@1). We could just put a new kernel in the image, but we will +(/images/kernel). We could just put a new kernel in the image, but we will need to change the hash to match. Let's simulate that by changing a byte of the hash: - fdtget -tx image.fit /images/kernel@1/hash@1 value + fdtget -tx image.fit /images/kernel/hash-1 value c9436464 6427e10f 423837e5 59898ef0 2c97b988 - fdtput -tx image.fit /images/kernel@1/hash@1 value c9436464 6427e10f 423837e5 59898ef0 2c97b981 + fdtput -tx image.fit /images/kernel/hash-1 value c9436464 6427e10f 423837e5 59898ef0 2c97b981 Now check it again: @@ -437,7 +437,7 @@ configuration. But that won't work since you are not allowed to change the configuration in any way. Try it with a fresh (valid) image if you like by running the mkimage link again. Then: - fdtput -p image.fit /configurations/conf@1/signature@2 value fred + fdtput -p image.fit /configurations/conf-1/signature-1 value fred $UOUT/tools/fit_check_sign -f image.fit -k am335x-boneblack-pubkey.dtb Verifying Hash Integrity ... - sha1,rsa2048:devrsa_verify_with_keynode: RSA failed to verify: -13 @@ -521,9 +521,9 @@ U-Boot# ext2load mmc 0:2 82000000 /boot/image.fit 7824930 bytes read in 589 ms (12.7 MiB/s) U-Boot# bootm 82000000 ## Loading kernel from FIT Image at 82000000 ... - Using 'conf@1' configuration + Using 'conf-1' configuration Verifying Hash Integrity ... sha1,rsa2048:dev+ OK - Trying 'kernel@1' kernel subimage + Trying 'kernel' kernel subimage Description: unavailable Created: 2014-06-01 19:32:54 UTC Type: Kernel Image @@ -538,8 +538,8 @@ U-Boot# bootm 82000000 Hash value: c94364646427e10f423837e559898ef02c97b988 Verifying Hash Integrity ... sha1+ OK ## Loading fdt from FIT Image at 82000000 ... - Using 'conf@1' configuration - Trying 'fdt@1' fdt subimage + Using 'conf-1' configuration + Trying 'fdt-1' fdt subimage Description: beaglebone-black Created: 2014-06-01 19:32:54 UTC Type: Flat Device Tree diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index 676f992f904..6a99089ab55 100644 --- a/doc/uImage.FIT/command_syntax_extensions.txt +++ b/doc/uImage.FIT/command_syntax_extensions.txt @@ -138,31 +138,31 @@ unit. Examples: -- boot kernel "kernel@1" stored in a new uImage located at 200000: -bootm 200000:kernel@1 +- boot kernel "kernel-1" stored in a new uImage located at 200000: +bootm 200000:kernel-1 -- boot configuration "cfg@1" from a new uImage located at 200000: -bootm 200000#cfg@1 +- boot configuration "cfg-1" from a new uImage located at 200000: +bootm 200000#cfg-1 -- boot configuration "cfg@1" with extra "cfg@2" from a new uImage located +- boot configuration "cfg-1" with extra "cfg-2" from a new uImage located at 200000: -bootm 200000#cfg@1#cfg@2 +bootm 200000#cfg-1#cfg-2 -- boot "kernel@1" from a new uImage at 200000 with initrd "ramdisk@2" found in +- boot "kernel-1" from a new uImage at 200000 with initrd "ramdisk-2" found in some other new uImage stored at address 800000: -bootm 200000:kernel@1 800000:ramdisk@2 +bootm 200000:kernel-1 800000:ramdisk-2 -- boot "kernel@2" from a new uImage at 200000, with initrd "ramdisk@1" and FDT - "fdt@1", both stored in some other new uImage located at 800000: -bootm 200000:kernel@1 800000:ramdisk@1 800000:fdt@1 +- boot "kernel-2" from a new uImage at 200000, with initrd "ramdisk-1" and FDT + "fdt-1", both stored in some other new uImage located at 800000: +bootm 200000:kernel-1 800000:ramdisk-1 800000:fdt-1 -- boot kernel "kernel@2" with initrd "ramdisk@2", both stored in a new uImage +- boot kernel "kernel-2" with initrd "ramdisk-2", both stored in a new uImage at address 200000, with a raw FDT blob stored at address 600000: -bootm 200000:kernel@2 200000:ramdisk@2 600000 +bootm 200000:kernel-2 200000:ramdisk-2 600000 -- boot kernel "kernel@2" from new uImage at 200000 with FDT "fdt@1" from the +- boot kernel "kernel-2" from new uImage at 200000 with FDT "fdt-1" from the same new uImage: -bootm 200000:kernel@2 - 200000:fdt@1 +bootm 200000:kernel-2 - 200000:fdt-1 Note on current image address @@ -186,16 +186,16 @@ current image address is to be used. For example, consider the following commands: tftp 200000 /tftpboot/uImage -bootm :kernel@1 +bootm :kernel-1 Last command is equivalent to: -bootm 200000:kernel@1 +bootm 200000:kernel-1 tftp 200000 /tftpboot/uImage -bootm 400000:kernel@1 :ramdisk@1 +bootm 400000:kernel-1 :ramdisk-1 Last command is equivalent to: -bootm 400000:kernel@1 400000:ramdisk@1 +bootm 400000:kernel-1 400000:ramdisk-1 tftp 200000 /tftpboot/uImage -bootm :kernel@1 400000:ramdisk@1 :fdt@1 +bootm :kernel-1 400000:ramdisk-1 :fdt-1 Last command is equivalent to: -bootm 200000:kernel@1 400000:ramdisk@1 400000:fdt@1 +bootm 200000:kernel-1 400000:ramdisk-1 400000:fdt-1 diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt index 2988a52aa17..8592719685e 100644 --- a/doc/uImage.FIT/howto.txt +++ b/doc/uImage.FIT/howto.txt @@ -86,7 +86,7 @@ $ $ mkimage -l kernel.itb FIT description: Simple image with single Linux kernel Created: Tue Mar 11 17:26:15 2008 - Image 0 (kernel@1) + Image 0 (kernel) Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -99,10 +99,10 @@ Created: Tue Mar 11 17:26:15 2008 Hash value: 2ae2bb40 Hash algo: sha1 Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4 - Default Configuration: 'config@1' - Configuration 0 (config@1) + Default Configuration: 'config-1' + Configuration 0 (config-1) Description: Boot Linux kernel - Kernel: kernel@1 + Kernel: kernel The resulting image file kernel.itb can be now transferred to the target, @@ -130,7 +130,7 @@ Bytes transferred = 944464 (e6950 hex) FIT image found FIT description: Simple image with single Linux kernel Created: 2008-03-11 16:26:15 UTC - Image 0 (kernel@1) + Image 0 (kernel) Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -144,15 +144,15 @@ Bytes transferred = 944464 (e6950 hex) Hash value: 2ae2bb40 Hash algo: sha1 Hash value: 3c200f34e2c226ddc789240cca0c59fc54a67cf4 - Default Configuration: 'config@1' - Configuration 0 (config@1) + Default Configuration: 'config-1' + Configuration 0 (config-1) Description: Boot Linux kernel - Kernel: kernel@1 + Kernel: kernel => bootm ## Booting kernel from FIT Image at 00900000 ... - Using 'config@1' configuration - Trying 'kernel@1' kernel subimage + Using 'config-1' configuration + Trying 'kernel' kernel subimage Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -196,7 +196,7 @@ $ $ mkimage -l kernel_fdt.itb FIT description: Simple image with single Linux kernel and FDT blob Created: Tue Mar 11 16:29:22 2008 - Image 0 (kernel@1) + Image 0 (kernel) Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -209,7 +209,7 @@ Created: Tue Mar 11 16:29:22 2008 Hash value: 2c0cc807 Hash algo: sha1 Hash value: 264b59935470e42c418744f83935d44cdf59a3bb - Image 1 (fdt@1) + Image 1 (fdt-1) Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed @@ -219,11 +219,11 @@ Created: Tue Mar 11 16:29:22 2008 Hash value: 0d655d71 Hash algo: sha1 Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def - Default Configuration: 'conf@1' - Configuration 0 (conf@1) + Default Configuration: 'conf-1' + Configuration 0 (conf-1) Description: Boot Linux kernel with FDT blob - Kernel: kernel@1 - FDT: fdt@1 + Kernel: kernel + FDT: fdt-1 The resulting image file kernel_fdt.itb can be now transferred to the target, @@ -245,7 +245,7 @@ Bytes transferred = 1109776 (10ef10 hex) FIT image found FIT description: Simple image with single Linux kernel and FDT blob Created: 2008-03-11 15:29:22 UTC - Image 0 (kernel@1) + Image 0 (kernel) Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -259,7 +259,7 @@ Bytes transferred = 1109776 (10ef10 hex) Hash value: 2c0cc807 Hash algo: sha1 Hash value: 264b59935470e42c418744f83935d44cdf59a3bb - Image 1 (fdt@1) + Image 1 (fdt-1) Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed @@ -270,15 +270,15 @@ Bytes transferred = 1109776 (10ef10 hex) Hash value: 0d655d71 Hash algo: sha1 Hash value: 25ab4e15cd4b8a5144610394560d9c318ce52def - Default Configuration: 'conf@1' - Configuration 0 (conf@1) + Default Configuration: 'conf-1' + Configuration 0 (conf-1) Description: Boot Linux kernel with FDT blob - Kernel: kernel@1 - FDT: fdt@1 + Kernel: kernel + FDT: fdt-1 => bootm ## Booting kernel from FIT Image at 00900000 ... - Using 'conf@1' configuration - Trying 'kernel@1' kernel subimage + Using 'conf-1' configuration + Trying 'kernel' kernel subimage Description: Vanilla Linux kernel Type: Kernel Image Compression: gzip compressed @@ -295,8 +295,8 @@ Bytes transferred = 1109776 (10ef10 hex) Verifying Hash Integrity ... crc32+ sha1+ OK Uncompressing Kernel Image ... OK ## Flattened Device Tree from FIT Image at 00900000 - Using 'conf@1' configuration - Trying 'fdt@1' FDT blob subimage + Using 'conf-1' configuration + Trying 'fdt-1' FDT blob subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed diff --git a/doc/uImage.FIT/kernel.its b/doc/uImage.FIT/kernel.its index 0aaf47e6c6b..77ddf622deb 100644 --- a/doc/uImage.FIT/kernel.its +++ b/doc/uImage.FIT/kernel.its @@ -9,7 +9,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "Vanilla Linux kernel"; data = /incbin/("./vmlinux.bin.gz"); type = "kernel"; @@ -18,20 +18,20 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "crc32"; }; - hash@2 { + hash-2 { algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot Linux kernel"; - kernel = "kernel@1"; + kernel = "kernel"; }; }; }; @@ -47,7 +47,7 @@ For x86 a setup node is also required: see x86-fit-boot.txt. #address-cells = <1>; images { - kernel@1 { + kernel { description = "Vanilla Linux kernel"; data = /incbin/("./image.bin.lzo"); type = "kernel"; @@ -56,12 +56,12 @@ For x86 a setup node is also required: see x86-fit-boot.txt. compression = "lzo"; load = <0x01000000>; entry = <0x00000000>; - hash@2 { + hash-2 { algo = "sha1"; }; }; - setup@1 { + setup { description = "Linux setup.bin"; data = /incbin/("./setup.bin"); type = "x86_setup"; @@ -70,18 +70,18 @@ For x86 a setup node is also required: see x86-fit-boot.txt. compression = "none"; load = <0x00090000>; entry = <0x00090000>; - hash@2 { + hash-2 { algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot Linux kernel"; - kernel = "kernel@1"; - setup = "setup@1"; + kernel = "kernel"; + setup = "setup"; }; }; }; diff --git a/doc/uImage.FIT/kernel_fdt.its b/doc/uImage.FIT/kernel_fdt.its index 7c521486ef7..000d85b8e09 100644 --- a/doc/uImage.FIT/kernel_fdt.its +++ b/doc/uImage.FIT/kernel_fdt.its @@ -9,7 +9,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "Vanilla Linux kernel"; data = /incbin/("./vmlinux.bin.gz"); type = "kernel"; @@ -18,34 +18,34 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "crc32"; }; - hash@2 { + hash-2 { algo = "sha1"; }; }; - fdt@1 { + fdt-1 { description = "Flattened Device Tree blob"; data = /incbin/("./target.dtb"); type = "flat_dt"; arch = "ppc"; compression = "none"; - hash@1 { + hash-1 { algo = "crc32"; }; - hash@2 { + hash-2 { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { + default = "conf-1"; + conf-1 { description = "Boot Linux kernel with FDT blob"; - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/doc/uImage.FIT/multi-with-fpga.its b/doc/uImage.FIT/multi-with-fpga.its index 0cdb31fe91c..47ee5760c49 100644 --- a/doc/uImage.FIT/multi-with-fpga.its +++ b/doc/uImage.FIT/multi-with-fpga.its @@ -10,31 +10,31 @@ #address-cells = <1>; images { - fdt@1 { + fdt-1 { description = "zc706"; data = /incbin/("/tftpboot/devicetree.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; load = <0x10000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - fpga@1 { + fpga { description = "FPGA"; data = /incbin/("/tftpboot/download.bit"); type = "fpga"; arch = "arm"; compression = "none"; load = <0x30000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - linux_kernel@1 { + linux_kernel { description = "Linux"; data = /incbin/("/tftpboot/zImage"); type = "kernel"; @@ -43,25 +43,25 @@ compression = "none"; load = <0x8000>; entry = <0x8000>; - hash@1 { + hash-1 { algo = "md5"; }; }; }; configurations { - default = "config@2"; - config@1 { + default = "config-2"; + config-1 { description = "Linux"; - kernel = "linux_kernel@1"; - fdt = "fdt@1"; + kernel = "linux_kernel"; + fdt = "fdt-1"; }; - config@2 { + config-2 { description = "Linux with fpga"; - kernel = "linux_kernel@1"; - fdt = "fdt@1"; - fpga = "fpga@1"; + kernel = "linux_kernel"; + fdt = "fdt-1"; + fpga = "fpga"; }; }; }; diff --git a/doc/uImage.FIT/multi-with-loadables.its b/doc/uImage.FIT/multi-with-loadables.its index a8545d245c9..4d4909f8320 100644 --- a/doc/uImage.FIT/multi-with-loadables.its +++ b/doc/uImage.FIT/multi-with-loadables.its @@ -10,7 +10,7 @@ #address-cells = <1>; images { - xen_kernel@1 { + xen_kernel { description = "xen binary"; data = /incbin/("./xen"); type = "kernel"; @@ -19,36 +19,36 @@ compression = "none"; load = <0xa0000000>; entry = <0xa0000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - fdt@1 { + fdt-1 { description = "xexpress-ca15 tree blob"; data = /incbin/("./vexpress-v2p-ca15-tc1.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; load = <0xb0000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - fdt@2 { + fdt-2 { description = "xexpress-ca15 tree blob"; data = /incbin/("./vexpress-v2p-ca15-tc1.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; load = <0xb0400000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - linux_kernel@1 { + linux_kernel { description = "Linux Image"; data = /incbin/("./Image"); type = "kernel"; @@ -57,33 +57,33 @@ compression = "none"; load = <0xa0000000>; entry = <0xa0000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; }; configurations { - default = "config@2"; + default = "config-2"; - config@1 { + config-1 { description = "Just plain Linux"; - kernel = "linux_kernel@1"; - fdt = "fdt@1"; + kernel = "linux_kernel"; + fdt = "fdt-1"; }; - config@2 { + config-2 { description = "Xen one loadable"; - kernel = "xen_kernel@1"; - fdt = "fdt@1"; - loadables = "linux_kernel@1"; + kernel = "xen_kernel"; + fdt = "fdt-1"; + loadables = "linux_kernel"; }; - config@3 { + config-3 { description = "Xen two loadables"; - kernel = "xen_kernel@1"; - fdt = "fdt@1"; - loadables = "linux_kernel@1", "fdt@2"; + kernel = "xen_kernel"; + fdt = "fdt-1"; + loadables = "linux_kernel", "fdt-2"; }; }; }; diff --git a/doc/uImage.FIT/multi.its b/doc/uImage.FIT/multi.its index 37369ecc82d..26c8dad6a2b 100644 --- a/doc/uImage.FIT/multi.its +++ b/doc/uImage.FIT/multi.its @@ -9,7 +9,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel-1 { description = "vanilla-2.6.23"; data = /incbin/("./vmlinux.bin.gz"); type = "kernel"; @@ -18,15 +18,15 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "md5"; }; - hash@2 { + hash-2 { algo = "sha1"; }; }; - kernel@2 { + kernel-2 { description = "2.6.23-denx"; data = /incbin/("./2.6.23-denx.bin.gz"); type = "kernel"; @@ -35,12 +35,12 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - kernel@3 { + kernel-3 { description = "2.4.25-denx"; data = /incbin/("./2.4.25-denx.bin.gz"); type = "kernel"; @@ -49,12 +49,12 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "md5"; }; }; - ramdisk@1 { + ramdisk-1 { description = "eldk-4.2-ramdisk"; data = /incbin/("./eldk-4.2-ramdisk"); type = "ramdisk"; @@ -63,12 +63,12 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - ramdisk@2 { + ramdisk-2 { description = "eldk-3.1-ramdisk"; data = /incbin/("./eldk-3.1-ramdisk"); type = "ramdisk"; @@ -77,30 +77,30 @@ compression = "gzip"; load = <00000000>; entry = <00000000>; - hash@1 { + hash-1 { algo = "crc32"; }; }; - fdt@1 { + fdt-1 { description = "tqm5200-fdt"; data = /incbin/("./tqm5200.dtb"); type = "flat_dt"; arch = "ppc"; compression = "none"; - hash@1 { + hash-1 { algo = "crc32"; }; }; - fdt@2 { + fdt-2 { description = "tqm5200s-fdt"; data = /incbin/("./tqm5200s.dtb"); type = "flat_dt"; arch = "ppc"; compression = "none"; load = <00700000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; @@ -108,26 +108,26 @@ }; configurations { - default = "config@1"; + default = "config-1"; - config@1 { + config-1 { description = "tqm5200 vanilla-2.6.23 configuration"; - kernel = "kernel@1"; - ramdisk = "ramdisk@1"; - fdt = "fdt@1"; + kernel = "kernel-1"; + ramdisk = "ramdisk-1"; + fdt = "fdt-1"; }; - config@2 { + config-2 { description = "tqm5200s denx-2.6.23 configuration"; - kernel = "kernel@2"; - ramdisk = "ramdisk@1"; - fdt = "fdt@2"; + kernel = "kernel-2"; + ramdisk = "ramdisk-1"; + fdt = "fdt-2"; }; - config@3 { + config-3 { description = "tqm5200s denx-2.4.25 configuration"; - kernel = "kernel@3"; - ramdisk = "ramdisk@2"; + kernel = "kernel-3"; + ramdisk = "ramdisk-2"; }; }; }; diff --git a/doc/uImage.FIT/multi_spl.its b/doc/uImage.FIT/multi_spl.its index d43563d87a2..59421997441 100644 --- a/doc/uImage.FIT/multi_spl.its +++ b/doc/uImage.FIT/multi_spl.its @@ -45,7 +45,7 @@ load = <0x40000>; }; - fdt@1 { + fdt-1 { description = "Pine64+ DT"; type = "flat_dt"; compression = "none"; @@ -53,7 +53,7 @@ arch = "arm64"; }; - fdt@2 { + fdt-2 { description = "Pine64 DT"; type = "flat_dt"; compression = "none"; @@ -79,18 +79,18 @@ }; configurations { - default = "config@1"; + default = "config-1"; - config@1 { + config-1 { description = "sun50i-a64-pine64-plus"; loadables = "uboot", "atf", "kernel", "initrd"; - fdt = "fdt@1"; + fdt = "fdt-1"; }; - config@2 { + config-2 { description = "sun50i-a64-pine64"; loadables = "uboot", "atf", "mgmt-firmware"; - fdt = "fdt@2"; + fdt = "fdt-2"; }; }; }; diff --git a/doc/uImage.FIT/overlay-fdt-boot.txt b/doc/uImage.FIT/overlay-fdt-boot.txt index 63e47da2a96..dddc4db1a67 100644 --- a/doc/uImage.FIT/overlay-fdt-boot.txt +++ b/doc/uImage.FIT/overlay-fdt-boot.txt @@ -24,7 +24,7 @@ Without using overlays the configuration would be as follows for every case. /dts-v1/; / { images { - kernel@1 { + kernel { data = /incbin/("./zImage"); type = "kernel"; arch = "arm"; @@ -32,32 +32,32 @@ Without using overlays the configuration would be as follows for every case. load = <0x82000000>; entry = <0x82000000>; }; - fdt@1 { + fdt-1 { data = /incbin/("./foo-reva.dtb"); type = "flat_dt"; arch = "arm"; }; - fdt@2 { + fdt-2 { data = /incbin/("./foo-revb.dtb"); type = "flat_dt"; arch = "arm"; }; - fdt@3 { + fdt-3 { data = /incbin/("./foo-reva-bar.dtb"); type = "flat_dt"; arch = "arm"; }; - fdt@4 { + fdt-4 { data = /incbin/("./foo-revb-bar.dtb"); type = "flat_dt"; arch = "arm"; }; - fdt@5 { + fdt-5 { data = /incbin/("./foo-revb-baz.dtb"); type = "flat_dt"; arch = "arm"; }; - fdt@6 { + fdt-6 { data = /incbin/("./foo-revb-bar-baz.dtb"); type = "flat_dt"; arch = "arm"; @@ -67,28 +67,28 @@ Without using overlays the configuration would be as follows for every case. configurations { default = "foo-reva.dtb; foo-reva.dtb { - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; foo-revb.dtb { - kernel = "kernel@1"; - fdt = "fdt@2"; + kernel = "kernel"; + fdt = "fdt-2"; }; foo-reva-bar.dtb { - kernel = "kernel@1"; - fdt = "fdt@3"; + kernel = "kernel"; + fdt = "fdt-3"; }; foo-revb-bar.dtb { - kernel = "kernel@1"; - fdt = "fdt@4"; + kernel = "kernel"; + fdt = "fdt-4"; }; foo-revb-baz.dtb { - kernel = "kernel@1"; - fdt = "fdt@5"; + kernel = "kernel"; + fdt = "fdt-5"; }; foo-revb-bar-baz.dtb { - kernel = "kernel@1"; - fdt = "fdt@6"; + kernel = "kernel"; + fdt = "fdt-6"; }; }; }; @@ -117,7 +117,7 @@ explosion problem. /dts-v1/; / { images { - kernel@1 { + kernel { data = /incbin/("./zImage"); type = "kernel"; arch = "arm"; @@ -125,31 +125,31 @@ explosion problem. load = <0x82000000>; entry = <0x82000000>; }; - fdt@1 { + fdt-1 { data = /incbin/("./foo.dtb"); type = "flat_dt"; arch = "arm"; load = <0x87f00000>; }; - fdt@2 { + fdt-2 { data = /incbin/("./reva.dtbo"); type = "flat_dt"; arch = "arm"; load = <0x87fc0000>; }; - fdt@3 { + fdt-3 { data = /incbin/("./revb.dtbo"); type = "flat_dt"; arch = "arm"; load = <0x87fc0000>; }; - fdt@4 { + fdt-4 { data = /incbin/("./bar.dtbo"); type = "flat_dt"; arch = "arm"; load = <0x87fc0000>; }; - fdt@5 { + fdt-5 { data = /incbin/("./baz.dtbo"); type = "flat_dt"; arch = "arm"; @@ -160,34 +160,34 @@ explosion problem. configurations { default = "foo-reva.dtb; foo-reva.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@2"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-2"; }; foo-revb.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@3"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-3"; }; foo-reva-bar.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@2", "fdt@4"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-2", "fdt-4"; }; foo-revb-bar.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@3", "fdt@4"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-3", "fdt-4"; }; foo-revb-baz.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@3", "fdt@5"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-3", "fdt-5"; }; foo-revb-bar-baz.dtb { - kernel = "kernel@1"; - fdt = "fdt@1", "fdt@3", "fdt@4", "fdt@5"; + kernel = "kernel"; + fdt = "fdt-1", "fdt-3", "fdt-4", "fdt-5"; }; bar { - fdt = "fdt@4"; + fdt = "fdt-4"; }; baz { - fdt = "fdt@5"; + fdt = "fdt-5"; }; }; }; diff --git a/doc/uImage.FIT/sign-configs.its b/doc/uImage.FIT/sign-configs.its index 3c17f040de0..9e992c19882 100644 --- a/doc/uImage.FIT/sign-configs.its +++ b/doc/uImage.FIT/sign-configs.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,28 +14,28 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - hash@1 { + hash-1 { algo = "sha1"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; sign-images = "fdt", "kernel"; diff --git a/doc/uImage.FIT/sign-images.its b/doc/uImage.FIT/sign-images.its index f69326a39bc..18c759e9e65 100644 --- a/doc/uImage.FIT/sign-images.its +++ b/doc/uImage.FIT/sign-images.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { data = /incbin/("test-kernel.bin"); type = "kernel_noload"; arch = "sandbox"; @@ -14,29 +14,29 @@ load = <0x4>; entry = <0x8>; kernel-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; }; }; - fdt@1 { + fdt-1 { description = "snow"; data = /incbin/("sandbox-kernel.dtb"); type = "flat_dt"; arch = "sandbox"; compression = "none"; fdt-version = <1>; - signature@1 { + signature { algo = "sha1,rsa2048"; key-name-hint = "dev"; }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt index 2ece4c47de0..a7657226794 100644 --- a/doc/uImage.FIT/signature.txt +++ b/doc/uImage.FIT/signature.txt @@ -83,7 +83,7 @@ Device Tree Bindings The following properties are required in the FIT's signature node(s) to allow the signer to operate. These should be added to the .its file. Signature nodes sit at the same level as hash nodes and are called -signature@1, signature@2, etc. +signature-1, signature-2, etc. - algo: Algorithm name (e.g. "sha1,rsa2048") @@ -118,9 +118,9 @@ For config bindings, these properties are added by the signer: - hashed-nodes: A list of nodes which were hashed by the signer. Each is a string - the full path to node. A typical value might be: - hashed-nodes = "/", "/configurations/conf@1", "/images/kernel@1", - "/images/kernel@1/hash@1", "/images/fdt@1", - "/images/fdt@1/hash@1"; + hashed-nodes = "/", "/configurations/conf-1", "/images/kernel", + "/images/kernel/hash-1", "/images/fdt-1", + "/images/fdt-1/hash-1"; - hashed-strings: The start and size of the string region of the FIT that was hashed @@ -178,44 +178,44 @@ As an example, consider this FIT: / { images { - kernel@1 { + kernel-1 { data = <data for kernel1> - signature@1 { + signature-1 { algo = "sha1,rsa2048"; value = <...kernel signature 1...> }; }; - kernel@2 { + kernel-2 { data = <data for kernel2> - signature@1 { + signature-1 { algo = "sha1,rsa2048"; value = <...kernel signature 2...> }; }; - fdt@1 { + fdt-1 { data = <data for fdt1>; - signature@1 { + signature-1 { algo = "sha1,rsa2048"; vaue = <...fdt signature 1...> }; }; - fdt@2 { + fdt-2 { data = <data for fdt2>; - signature@1 { + signature-1 { algo = "sha1,rsa2048"; vaue = <...fdt signature 2...> }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel-1"; + fdt = "fdt-1"; }; - conf@1 { - kernel = "kernel@2"; - fdt = "fdt@2"; + conf-1 { + kernel = "kernel-2"; + fdt = "fdt-2"; }; }; }; @@ -224,18 +224,18 @@ Since both kernels are signed it is easy for an attacker to add a new configuration 3 with kernel 1 and fdt 2: configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; + default = "conf-1"; + conf-1 { + kernel = "kernel-1"; + fdt = "fdt-1"; }; - conf@1 { - kernel = "kernel@2"; - fdt = "fdt@2"; + conf-1 { + kernel = "kernel-2"; + fdt = "fdt-2"; }; - conf@3 { - kernel = "kernel@1"; - fdt = "fdt@2"; + conf-3 { + kernel = "kernel-1"; + fdt = "fdt-2"; }; }; @@ -250,49 +250,49 @@ So the above example is adjusted to look like this: / { images { - kernel@1 { + kernel-1 { data = <data for kernel1> - hash@1 { + hash-1 { algo = "sha1"; value = <...kernel hash 1...> }; }; - kernel@2 { + kernel-2 { data = <data for kernel2> - hash@1 { + hash-1 { algo = "sha1"; value = <...kernel hash 2...> }; }; - fdt@1 { + fdt-1 { data = <data for fdt1>; - hash@1 { + hash-1 { algo = "sha1"; value = <...fdt hash 1...> }; }; - fdt@2 { + fdt-2 { data = <data for fdt2>; - hash@1 { + hash-1 { algo = "sha1"; value = <...fdt hash 2...> }; }; }; configurations { - default = "conf@1"; - conf@1 { - kernel = "kernel@1"; - fdt = "fdt@1"; - signature@1 { + default = "conf-1"; + conf-1 { + kernel = "kernel-1"; + fdt = "fdt-1"; + signature-1 { algo = "sha1,rsa2048"; value = <...conf 1 signature...>; }; }; - conf@2 { - kernel = "kernel@2"; - fdt = "fdt@2"; - signature@1 { + conf-2 { + kernel = "kernel-2"; + fdt = "fdt-2"; + signature-1 { algo = "sha1,rsa2048"; value = <...conf 1 signature...>; }; @@ -303,11 +303,11 @@ So the above example is adjusted to look like this: You can see that we have added hashes for all images (since they are no longer signed), and a signature to each configuration. In the above example, -mkimage will sign configurations/conf@1, the kernel and fdt that are -pointed to by the configuration (/images/kernel@1, /images/kernel@1/hash@1, -/images/fdt@1, /images/fdt@1/hash@1) and the root structure of the image +mkimage will sign configurations/conf-1, the kernel and fdt that are +pointed to by the configuration (/images/kernel-1, /images/kernel-1/hash-1, +/images/fdt-1, /images/fdt-1/hash-1) and the root structure of the image (so that it isn't possible to add or remove root nodes). The signature is -written into /configurations/conf@1/signature@1/value. It can easily be +written into /configurations/conf-1/signature-1/value. It can easily be verified later even if the FIT has been signed with other keys in the meantime. diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 88663a161d3..d2793a195dc 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -102,15 +102,15 @@ Root node of the uImage Tree should have the following layout: | o images | | - | o image@1 {...} - | o image@2 {...} + | o image-1 {...} + | o image-2 {...} | ... | o configurations - |- default = "conf@1" + |- default = "conf-1" | - o conf@1 {...} - o conf@2 {...} + o conf-1 {...} + o conf-2 {...} ... @@ -142,7 +142,7 @@ Root node of the uImage Tree should have the following layout: This node is a container node for component sub-image nodes. Each sub-node of the '/images' node should have the following layout: - o image@1 + o image-1 |- description = "component sub-image description" |- data = /incbin/("path/to/data/file.bin") |- type = "sub-image type name" @@ -152,8 +152,8 @@ the '/images' node should have the following layout: |- load = <00000000> |- entry = <00000000> | - o hash@1 {...} - o hash@2 {...} + o hash-1 {...} + o hash-2 {...} ... Mandatory properties: @@ -183,14 +183,14 @@ the '/images' node should have the following layout: property of the root node. Mandatory for types: "standalone" and "kernel". Optional nodes: - - hash@1 : Each hash sub-node represents separate hash or checksum + - hash-1 : Each hash sub-node represents separate hash or checksum calculated for node's data according to specified algorithm. 5) Hash nodes ------------- -o hash@1 +o hash-1 |- algo = "hash or checksum algorithm name" |- value = [hash or checksum value] @@ -212,8 +212,8 @@ The 'configurations' node has has the following structure: o configurations |- default = "default configuration sub-node unit name" | - o config@1 {...} - o config@2 {...} + o config-1 {...} + o config-2 {...} ... @@ -231,7 +231,7 @@ o configurations Each configuration has the following structure: -o config@1 +o config-1 |- description = "configuration description" |- kernel = "kernel sub-node unit name" |- ramdisk = "ramdisk sub-node unit name" diff --git a/doc/uImage.FIT/update3.its b/doc/uImage.FIT/update3.its index a6eaef691e2..0659f20002d 100644 --- a/doc/uImage.FIT/update3.its +++ b/doc/uImage.FIT/update3.its @@ -9,34 +9,34 @@ #address-cells = <1>; images { - update@1 { + update-1 { description = "Linux kernel binary"; data = /incbin/("./vmlinux.bin.gz"); compression = "none"; type = "firmware"; load = <FF700000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - update@2 { + update-2 { description = "Ramdisk image"; data = /incbin/("./ramdisk_image.gz"); compression = "none"; type = "firmware"; load = <FF8E0000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; - update@3 { + update-3 { description = "FDT blob"; data = /incbin/("./blob.fdt"); compression = "none"; type = "firmware"; load = <FFAC0000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; diff --git a/doc/uImage.FIT/update_uboot.its b/doc/uImage.FIT/update_uboot.its index 846723e2d62..c2ac2663e62 100644 --- a/doc/uImage.FIT/update_uboot.its +++ b/doc/uImage.FIT/update_uboot.its @@ -10,13 +10,13 @@ #address-cells = <1>; images { - update@1 { + update-1 { description = "U-Boot binary"; data = /incbin/("./u-boot.bin"); compression = "none"; type = "firmware"; load = <FFFC0000>; - hash@1 { + hash-1 { algo = "sha1"; }; }; diff --git a/doc/uImage.FIT/x86-fit-boot.txt b/doc/uImage.FIT/x86-fit-boot.txt index 02238f9df80..88d3460a83e 100644 --- a/doc/uImage.FIT/x86-fit-boot.txt +++ b/doc/uImage.FIT/x86-fit-boot.txt @@ -197,7 +197,7 @@ You can take a look at the resulting fit file if you like: $ dumpimage -l image.fit FIT description: Simple image with single Linux kernel on x86 Created: Tue Oct 7 10:57:24 2014 - Image 0 (kernel@1) + Image 0 (kernel) Description: Vanilla Linux kernel Created: Tue Oct 7 10:57:24 2014 Type: Kernel Image @@ -209,7 +209,7 @@ Created: Tue Oct 7 10:57:24 2014 Entry Point: 0x00000000 Hash algo: sha1 Hash value: 446b5163ebfe0fb6ee20cbb7a8501b263cd92392 - Image 1 (setup@1) + Image 1 (setup) Description: Linux setup.bin Created: Tue Oct 7 10:57:24 2014 Type: x86 setup.bin @@ -217,10 +217,10 @@ Created: Tue Oct 7 10:57:24 2014 Data Size: 12912 Bytes = 12.61 kB = 0.01 MB Hash algo: sha1 Hash value: a1f2099cf47ff9816236cd534c77af86e713faad - Default Configuration: 'config@1' - Configuration 0 (config@1) + Default Configuration: 'config-1' + Configuration 0 (config-1) Description: Boot Linux kernel - Kernel: kernel@1 + Kernel: kernel Booting the FIT |