August 2018 - U-Boot

[U-Boot] Converting to SPL_OF_CONTROL
by Alex Kiernan 11 Aug '18

11 Aug '18

I've long been trying to convert our board (AM3352) to all DM, after knocking out lots of problems, I've run into one I can't seem to configure my way around, when I enable SPL_OF_CONTROL. We have MMC2 as our boot device, with no MMC1 (and hence not present in the DTB). Once we're into full U-Boot this is all okay, we get the board's MMC2 appearing as mmc0 and everything's fine. My problem's during SPL, where the boot device is MMC2, the code tries to lookup by devnum (which is 1 because it numbers from 0 at this point), which doesn't exist. I'd expected aliases to work, but we don't seem to lookup up by alias, only index, so I don't have any way that I can see of overriding it. If I make this change, then everything works (with the addition of an an alias for mmc1 = &mmc2): diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 0b2f059570..b7544ba183 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -131,7 +131,7 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) } #if CONFIG_IS_ENABLED(DM_MMC) - err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev); + err = uclass_get_device_by_seq(UCLASS_MMC, mmc_dev, &dev); if (!err) *mmcp = mmc_get_mmc_dev(dev); #else But that feels like a pretty fundamental change to make across every board and I've no real idea if that would even be the right thing to do, or if I should be trying to fix this some other way. -- Alex Kiernan

2 4

[U-Boot] [PATCH 1/1] elf: Add support for PPC64 ELF V1 ABI in bootelf
by Rob Bracero 11 Aug '18

11 Aug '18

This update adds PPC64 ELF V1 ABI support to bootelf for both the program header and section header options. Elf64 support was already present for the program header option, but it was not handling the PPC64 ELF V1 ABI case. For the PPC64 ELF V1 ABI, the e_entry field of the elf header must be treated as function descriptor pointer instead of a function address. The first doubleword of the function descriptor is the function's entry address. Signed-off-by: Rob Bracero <robbracero(a)gmail.com> --- :100644 100644 eafea38... 0c38bde... M cmd/elf.c :100644 100644 6802428... 81f4019... M include/elf.h cmd/elf.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- include/elf.h | 3 +++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/cmd/elf.c b/cmd/elf.c index eafea38..0c38bde 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -57,6 +57,77 @@ static unsigned long load_elf64_image_phdr(unsigned long addr) ++phdr; } + if((ehdr->e_machine == EM_PPC64) && (ehdr->e_flags & EF_PPC64_ELFV1_ABI)) + { + /* + * For the 64-bit PowerPC ELF V1 ABI, e_entry is a function descriptor + * pointer with the first double word being the address of the entry + * point of the function. + */ + uintptr_t addr = ehdr->e_entry; + return *(Elf64_Addr *)addr; + } + + return ehdr->e_entry; +} + +static unsigned long load_elf64_image_shdr(unsigned long addr) +{ + Elf64_Ehdr *ehdr; /* Elf header structure pointer */ + Elf64_Shdr *shdr; /* Section header structure pointer */ + unsigned char *strtab = 0; /* String table pointer */ + unsigned char *image; /* Binary image pointer */ + int i; /* Loop counter */ + + ehdr = (Elf64_Ehdr *)addr; + + /* Find the section header string table for output info */ + shdr = (Elf64_Shdr *)(addr + (ulong)ehdr->e_shoff + + (ehdr->e_shstrndx * sizeof(Elf64_Shdr))); + + if (shdr->sh_type == SHT_STRTAB) + strtab = (unsigned char *)(addr + (ulong)shdr->sh_offset); + + /* Load each appropriate section */ + for (i = 0; i < ehdr->e_shnum; ++i) { + shdr = (Elf64_Shdr *)(addr + (ulong)ehdr->e_shoff + + (i * sizeof(Elf64_Shdr))); + + if (!(shdr->sh_flags & SHF_ALLOC) || + shdr->sh_addr == 0 || shdr->sh_size == 0) { + continue; + } + + if (strtab) { + debug("%sing %s @ 0x%08lx (%ld bytes)\n", + (shdr->sh_type == SHT_NOBITS) ? "Clear" : "Load", + &strtab[shdr->sh_name], + (unsigned long)shdr->sh_addr, + (long)shdr->sh_size); + } + + if (shdr->sh_type == SHT_NOBITS) { + memset((void *)(uintptr_t)shdr->sh_addr, 0, + shdr->sh_size); + } else { + image = (unsigned char *)addr + (ulong)shdr->sh_offset; + memcpy((void *)(uintptr_t)shdr->sh_addr, + (const void *)image, shdr->sh_size); + } + flush_cache((ulong)shdr->sh_addr, shdr->sh_size); + } + + if((ehdr->e_machine == EM_PPC64) && (ehdr->e_flags & EF_PPC64_ELFV1_ABI)) + { + /* + * For the 64-bit PowerPC ELF V1 ABI, e_entry is a function descriptor + * pointer with the first double word being the address of the entry + * point of the function. + */ + uintptr_t addr = ehdr->e_entry; + return *(Elf64_Addr *)addr; + } + return ehdr->e_entry; } @@ -107,7 +178,9 @@ static unsigned long load_elf_image_shdr(unsigned long addr) int i; /* Loop counter */ ehdr = (Elf32_Ehdr *)addr; - + if (ehdr->e_ident[EI_CLASS] == ELFCLASS64) + return load_elf64_image_shdr(addr); + /* Find the section header string table for output info */ shdr = (Elf32_Shdr *)(addr + ehdr->e_shoff + (ehdr->e_shstrndx * sizeof(Elf32_Shdr))); diff --git a/include/elf.h b/include/elf.h index 6802428..81f4019 100644 --- a/include/elf.h +++ b/include/elf.h @@ -593,6 +593,9 @@ unsigned long elf_hash(const unsigned char *name); /* Values for Elf32/64_Ehdr.e_flags */ #define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */ +#define EF_PPC64_ELFV1_ABI 0x00000001 +#define EF_PPC64_ELFV2_ABI 0x00000002 + /* Cygnus local bits below */ #define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/ #define EF_PPC_RELOCATABLE_LIB 0x00008000 /* PowerPC -mrelocatable-lib -- 1.8.3.1

2 1

[U-Boot] [PATCH v2 1/2] snapdragon: Add DRAM detection & FDT fixup
by Ramon Fried 11 Aug '18

11 Aug '18

Fixup the Linux FDT with the detection of onboard DRAM as provided by SBL (Secondary boot loader) by reading the shared-memory region. Signed-off-by: Ramon Fried <ramon.fried(a)gmail.com> --- v2: fixed compiler warning introduced because missing include arch/arm/mach-snapdragon/Makefile | 1 + arch/arm/mach-snapdragon/dram.c | 98 ++++++++++++++++++++ arch/arm/mach-snapdragon/include/mach/dram.h | 12 +++ 3 files changed, 111 insertions(+) create mode 100644 arch/arm/mach-snapdragon/dram.c create mode 100644 arch/arm/mach-snapdragon/include/mach/dram.h diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index 1d35fea912..f375d07d03 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-apq8016.o obj-$(CONFIG_TARGET_DRAGONBOARD410C) += pinctrl-snapdragon.o obj-y += clock-snapdragon.o +obj-y += dram.o diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c new file mode 100644 index 0000000000..79eb19992d --- /dev/null +++ b/arch/arm/mach-snapdragon/dram.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Onboard memory detection for Snapdragon boards + * + * (C) Copyright 2018 Ramon Fried <ramon.fried(a)gmail.com> + * + */ + +#include <common.h> +#include <dm.h> +#include <smem.h> +#include <fdt_support.h> +#include <asm/arch/dram.h> + +#define SMEM_USABLE_RAM_PARTITION_TABLE 402 +#define RAM_PART_NAME_LENGTH 16 +#define RAM_NUM_PART_ENTRIES 32 +#define CATEGORY_SDRAM 0x0E +#define TYPE_SYSMEM 0x01 + +struct smem_ram_ptable_hdr { + u32 magic[2]; + u32 version; + u32 reserved; + u32 len; +} __attribute__ ((__packed__)); + +struct smem_ram_ptn { + char name[RAM_PART_NAME_LENGTH]; + u64 start; + u64 size; + u32 attr; + u32 category; + u32 domain; + u32 type; + u32 num_partitions; + u32 reserved[3]; +} __attribute__ ((__packed__)); + +struct smem_ram_ptable { + struct smem_ram_ptable_hdr hdr; + u32 reserved; /* Added for 8 bytes alignment of header */ + struct smem_ram_ptn parts[RAM_NUM_PART_ENTRIES]; +} __attribute__ ((__packed__)); + +#ifndef MEMORY_BANKS_MAX +#define MEMORY_BANKS_MAX 4 +#endif + +int msm_fixup_memory(void *blob) +{ + u64 bank_start[MEMORY_BANKS_MAX]; + u64 bank_size[MEMORY_BANKS_MAX]; + size_t size; + int i; + int count = 0; + struct udevice *smem; + int ret; + struct smem_ram_ptable *ram_ptable; + struct smem_ram_ptn *p; + + ret = uclass_get_device_by_name(UCLASS_SMEM, "smem", &smem); + if (ret < 0) { + printf("Failed to find SMEM node. Check device tree\n"); + return 0; + } + + ram_ptable = smem_get(smem, -1, SMEM_USABLE_RAM_PARTITION_TABLE, &size); + + if (!ram_ptable) { + printf("Failed to find SMEM partition.\n"); + return -ENODEV; + } + + /* Check validy of RAM */ + for (i = 0; i < RAM_NUM_PART_ENTRIES; i++) { + p = &ram_ptable->parts[i]; + if (p->category == CATEGORY_SDRAM && p->type == TYPE_SYSMEM) { + bank_start[count] = p->start; + bank_size[count] = p->size; + debug("Detected memory bank %u: start: 0x%llx size: 0x%llx\n", + count, p->start, p->size); + count++; + } + } + + if (!count) { + printf("Failed to detect any memory bank\n"); + return -ENODEV; + } + + ret = fdt_fixup_memory_banks(blob, bank_start, bank_size, count); + if (ret) + return ret; + + return 0; +} + diff --git a/arch/arm/mach-snapdragon/include/mach/dram.h b/arch/arm/mach-snapdragon/include/mach/dram.h new file mode 100644 index 0000000000..0a9eedda41 --- /dev/null +++ b/arch/arm/mach-snapdragon/include/mach/dram.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Snapdragon DRAM + * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> + */ + +#ifndef DRAM_H +#define DRAM_H + +int msm_fixup_memory(void *blob); + +#endif -- 2.18.0

2 3

[U-Boot] [PATCH] travis: give every job a name
by Stephen Warren 11 Aug '18

11 Aug '18

From: Stephen Warren <swarren(a)nvidia.com> Travis CI now supports giving jobs an explicit name. Do this for all jobs. This allows more direct control over jobs names than the previous automatic or implicit naming based on the environment variables or script text. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- .travis.yml | 231 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 137 insertions(+), 94 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b0eb6e4f6b5..12eeafc74696 100644 --- a/.travis.yml +++ b/.travis.yml @@ -146,233 +146,276 @@ matrix: include: # we need to build by vendor due to 50min time limit for builds # each env setting here is a dedicated build - - env: + - name: "buildman arc" + env: - BUILDMAN="arc" TOOLCHAIN="arc" - - env: + - name: "buildman arm11 arm7 arm920t arm946es" + env: - BUILDMAN="arm11 arm7 arm920t arm946es" - - env: - - JOB="arm926ejs" - BUILDMAN="arm926ejs -x mx,siemens,atmel" - - env: + - name: "buildman arm926ejs (non-mx,siemens,atmel)" + env: + - BUILDMAN="arm926ejs -x mx,siemens,atmel" + - name: "buildman Atmel" + env: - BUILDMAN="atmel" - - env: - BUILDMAN="boundary engicam toradex" - - env: - - JOB="Freescale ARM32" - BUILDMAN="freescale -x powerpc,m68k,aarch64" - - env: - - JOB="Freescale AArch64" - BUILDMAN="freescale&aarch64" - - env: - - JOB="i.MX6 (non-Freescale)" - BUILDMAN="mx6 -x freescale,toradex,boundary,engicam" - - env: - - JOB="i.MX (non-Freescale, non-i.MX6)" - BUILDMAN="mx -x freescale,mx6,toradex" - - env: + - name: "buildman boundary engicam toradex" + env: + - BUILDMAN="boundary engicam toradex" + - name: "buildman Freescale ARM32" + env: + - BUILDMAN="freescale -x powerpc,m68k,aarch64" + - name: "buildman Freescale AArch64" + env: + - BUILDMAN="freescale&aarch64" + - name: "buildman i.MX6 (non-Freescale)" + env: + - BUILDMAN="mx6 -x freescale,toradex,boundary,engicam" + - name: "buildman i.MX (non-Freescale,i.MX6,toradex)" + env: + - BUILDMAN="mx -x freescale,mx6,toradex" + - name: "buildman k2" + env: - BUILDMAN="k2" - - env: + - name: "buildman samsung socfpga" + env: - BUILDMAN="samsung socfpga" - - env: + - name: "buildman sun4i" + env: - BUILDMAN="sun4i" - - env: + - name: "buildman sun5i" + env: - BUILDMAN="sun5i" - - env: + - name: "buildman sun6i" + env: - BUILDMAN="sun6i" - - env: + - name: "builman sun7i" + env: - BUILDMAN="sun7i" - - env: + - name: "buildman sun8i" + env: - BUILDMAN="sun8i" - - env: + - name: "buildman sun9i" + env: - BUILDMAN="sun9i" - - env: + - name: "buildman sun50i" + env: - BUILDMAN="sun50i" - - env: - - JOB="Catch-all ARM" - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx" - - env: + - name: "buildman catch-all ARM" + env: + - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx" + - name: "buildman sandbox x86" + env: - BUILDMAN="sandbox x86" TOOLCHAIN="x86_64" - - env: + - name: "buildman kirkwood" + env: - BUILDMAN="kirkwood" - - env: + - name: "buildman mvebu" + env: - BUILDMAN="mvebu" - - env: - - JOB="PXA" + - name: "buildman PXA (non-toradex)" + env: - BUILDMAN="pxa -x toradex" - - env: + - name: "buildman m68k" + env: - BUILDMAN="m68k" TOOLCHAIN="m68k" - - env: + - name: "buildman microblaze" + env: - BUILDMAN="microblaze" TOOLCHAIN="microblaze" - - env: + - name: "buildman mips" + env: - BUILDMAN="mips" TOOLCHAIN="mips" - - env: - - JOB="Non-Freescale PowerPC" - BUILDMAN="powerpc -x freescale" + - name: "buildman non-Freescale PowerPC" + env: + - BUILDMAN="powerpc -x freescale" TOOLCHAIN="powerpc" - - env: + - name: "buildman mpc85xx&freescale (excluding many)" + env: - BUILDMAN="mpc85xx&freescale -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x bsc91*" TOOLCHAIN="powerpc" - - env: + - name: "buildman t208xrdb corenet_ds" + env: - BUILDMAN="t208xrdb corenet_ds" TOOLCHAIN="powerpc" - - env: + - name: "buildman Freescale PowerPC" + env: - BUILDMAN="t4qds b4860qds mpc83xx&freescale mpc86xx&freescale" TOOLCHAIN="powerpc" - - env: + - name: "buildman t102*" + env: - BUILDMAN="t102*" TOOLCHAIN="powerpc" - - env: + - name: "buildman p1_p2_rdb_pc" + env: - BUILDMAN="p1_p2_rdb_pc" TOOLCHAIN="powerpc" - - env: + - name: "buildman p1010rdb bsc91" + env: - BUILDMAN="p1010rdb bsc91" TOOLCHAIN="powerpc" - - env: + - name: "buildman siemens" + env: - BUILDMAN="siemens" - - env: - - JOB="tegra" - BUILDMAN="tegra -x toradex" - - env: - - JOB="am33xx" - BUILDMAN="am33xx -x siemens" - - env: + - name: "buildman tegra" + env: + - BUILDMAN="tegra -x toradex" + - name: "buildman am33xx (no siemens)" + env: + - BUILDMAN="am33xx -x siemens" + - name: "buildman omap" + env: - BUILDMAN="omap" - - env: + - name: "buildman uniphier" + env: - BUILDMAN="uniphier" - - env: - - JOB="Catch-all AArch64" - BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip,xilinx" - - env: + - name: "buildman catch-all AArch64" + env: + - BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip,xilinx" + - name: "buildman rockchip" + env: - BUILDMAN="rockchip" - - env: - - JOB="sh" - BUILDMAN="sh -x arm" + - name: "buildman sh" + env: + - BUILDMAN="sh -x arm" TOOLCHAIN="sh" - - env: - - JOB="Xilinx (ARM)" - BUILDMAN="xilinx -x microblaze" - - env: + - name: "buildman Xilinx (ARM)" + env: + - BUILDMAN="xilinx -x microblaze" + - name: "buildman xtensa" + env: - BUILDMAN="xtensa" TOOLCHAIN="xtensa-dc233c-elf" - - env: + - name: "buildman riscv" + env: - BUILDMAN="riscv" TOOLCHAIN="riscv" # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) - - env: - - JOB="cppcheck" + - name: "cppcheck" script: - cppcheck --force --quiet --inline-suppr . # search for TODO within source tree - - env: - - JOB="grep TODO" + - name: "grep TODO" script: - grep -r TODO . # search for FIXME within source tree - - env: - - JOB="grep FIXME HACK" + - name: "grep FIXME HACK" script: - grep -r FIXME . # search for HACK within source tree and ignore HACKKIT board script: - grep -r HACK . | grep -v HACKKIT # some statistics about the code base - - env: - - JOB="sloccount" + - name: "sloccount" script: - sloccount . # test/py - - env: + - name: "test/py sandbox" + env: - TEST_PY_BD="sandbox" BUILDMAN="^sandbox$" TOOLCHAIN="x86_64" - - env: + - name: "test/py sandbox_spl" + env: - TEST_PY_BD="sandbox_spl" TEST_PY_TEST_SPEC="test_ofplatdata" BUILDMAN="^sandbox$" TOOLCHAIN="x86_64" TEST_PY_TOOLS="yes" - - env: + - name: "test/py sandbox_flattree" + env: - TEST_PY_BD="sandbox_flattree" BUILDMAN="^sandbox_flattree$" TOOLCHAIN="x86_64" - - env: + - name: "test/py vexpress_ca15_tc2" + env: - TEST_PY_BD="vexpress_ca15_tc2" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" BUILDMAN="^vexpress_ca15_tc2$" - - env: + - name: "test/py vexpress_ca9x4" + env: - TEST_PY_BD="vexpress_ca9x4" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" BUILDMAN="^vexpress_ca9x4$" - - env: + - name: "test/py integratorcp_cm926ejs" + env: - TEST_PY_BD="integratorcp_cm926ejs" TEST_PY_TEST_SPEC="not sleep" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" BUILDMAN="^integratorcp_cm926ejs$" - - env: + - name: "test/py qemu_arm" + env: - TEST_PY_BD="qemu_arm" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="arm-softmmu" BUILDMAN="^qemu_arm$" - - env: + - name: "test/py qemu_arm64" + env: - TEST_PY_BD="qemu_arm64" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="aarch64-softmmu" BUILDMAN="^qemu_arm64$" - - env: + - name: "test/py qemu_mips" + env: - TEST_PY_BD="qemu_mips" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="mips-softmmu" BUILDMAN="^qemu_mips$" TOOLCHAIN="mips" - - env: + - name: "test/py qemu_mipsel" + env: - TEST_PY_BD="qemu_mipsel" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="mipsel-softmmu" BUILDMAN="^qemu_mipsel$" TOOLCHAIN="mips" - - env: + - name: "test/py qemu_mips64" + env: - TEST_PY_BD="qemu_mips64" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="mips64-softmmu" BUILDMAN="^qemu_mips64$" TOOLCHAIN="mips" - - env: + - name: "test/py qemu_mips64el" + env: - TEST_PY_BD="qemu_mips64el" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="mips64el-softmmu" BUILDMAN="^qemu_mips64el$" TOOLCHAIN="mips" - - env: + - name: "test/py qemu-ppce500" + env: - TEST_PY_BD="qemu-ppce500" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="ppc-softmmu" BUILDMAN="^qemu-ppce500$" TOOLCHAIN="powerpc" - - env: + - name: "test/py qemu-x86" + env: - TEST_PY_BD="qemu-x86" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="i386-softmmu" BUILDMAN="^qemu-x86$" TOOLCHAIN="x86_64" BUILD_ROM="yes" - - env: + - name: "test/py zynq_zc702" + env: - TEST_PY_BD="zynq_zc702" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="arm-softmmu" TEST_PY_ID="--id qemu" BUILDMAN="^zynq_zc702$" - - env: + - name: "test/py xtfpga" + env: - TEST_PY_BD="xtfpga" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="xtensa-softmmu" -- 2.18.0

2 3

[U-Boot] [PATCH v3 0/2] env: Make environment loading log more clear
by Sam Protsenko 11 Aug '18

11 Aug '18

This patch series intended to make boot log better. Basically here we just remove unwanted error messages, relying on the message from most deep API to be printed (like mmc subsystem). At the moment this looks like most clean solution to cluttered log problem, as any other solution will be hackish. With this patch set applied we will see something like this: Loading Environment from FAT... MMC: no card present Loading Environment from MMC... OK instead of: Loading Environment from FAT... MMC: no card present ** Bad device mmc 0 ** Failed (-5) Loading Environment from MMC... OK Sam Protsenko (2): env: Don't show "Failed" error message disk: part: Don't show redundant error message disk/part.c | 2 +- env/env.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) -- 2.18.0

2 4

[U-Boot] [PATCH 1/2] smbios: fix checkstyle error
by Christian Gmeiner 11 Aug '18

11 Aug '18

Fixes the following chechpatch -f error: ERROR: "(foo*)" should be "(foo *)" + strncpy((char*)t->uuid, serial_str, sizeof(t->uuid)); Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- lib/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/smbios.c b/lib/smbios.c index df3d26b071..40c921984c 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -116,7 +116,7 @@ static int smbios_write_type1(ulong *current, int handle) t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME); if (serial_str) { - strncpy((char*)t->uuid, serial_str, sizeof(t->uuid)); + strncpy((char *)t->uuid, serial_str, sizeof(t->uuid)); t->serial_number = smbios_add_string(t->eos, serial_str); } -- 2.17.1

3 5

[U-Boot] [PATCH] configs: omap3_logic: Disable NAND ID during SPL
by Adam Ford 11 Aug '18

11 Aug '18

For these boards, the GPMC timings are more determined by processor speed/type than the NAND/PoP memory. This code is never invoked, so disable the config option, so it doesn't take the time to compile it in. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index ed9f454a5d..77dfdfc0e5 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_OMAP3_LOGIC=y +# CONFIG_SPL_OMAP3_ID_NAND is not set CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit" CONFIG_DISTRO_DEFAULTS=y -- 2.17.1

2 1

[U-Boot] [PATCH] configs: omap: Remove dead config CONFIG_SYS_NAND_ADDR
by Adam Ford 11 Aug '18

11 Aug '18

CONFIG_SYS_NAND_ADDR is defined and never referenced. This patch removes the dead code. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 2 -- include/configs/devkit8000.h | 3 --- include/configs/mcx.h | 2 -- include/configs/omap3_logic.h | 2 -- include/configs/omap3_overo.h | 2 -- include/configs/omap3_pandora.h | 2 -- include/configs/omap3_zoom1.h | 2 -- include/configs/tao3530.h | 2 -- include/configs/tricorder.h | 3 --- scripts/config_whitelist.txt | 1 - 13 files changed, 27 deletions(-) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index ffe40a4160..b9a3a5079d 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -99,8 +99,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access */ /* nand at CS0 */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 9a20796214..c767961562 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -66,8 +66,6 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 415924549b..adadfb29bf 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -89,8 +89,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 2c889d4a85..0ea70cc1bf 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -91,8 +91,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index f36dc2dc2c..1b4e33255d 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -60,9 +60,6 @@ #define CONFIG_TWL4030_LED 1 /* Board NAND Info */ - -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0" diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0cad187a3c..66dec07b2a 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -81,8 +81,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access */ /* nand at CS0 */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 4d811e096c..c904d289fb 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -43,8 +43,6 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a3d0e5fcaa..bcad26b2f1 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -51,8 +51,6 @@ #endif /* CONFIG_NAND */ /* Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 9259282729..8edd16d395 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -44,8 +44,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c62b373de3..ca03fc167d 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -56,8 +56,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 4b596c680a..02bf54ea6f 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -70,8 +70,6 @@ /* * Board NAND Info. */ -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 95c3ea9ce4..6b4edcc8c4 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -65,9 +65,6 @@ #define CONFIG_TWL4030_LED /* Board NAND Info */ - -#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ - /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced4099f2..d902bf02d9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3574,7 +3574,6 @@ CONFIG_SYS_NAND_ACTL_ALE CONFIG_SYS_NAND_ACTL_CLE CONFIG_SYS_NAND_ACTL_DELAY CONFIG_SYS_NAND_ACTL_NCE -CONFIG_SYS_NAND_ADDR CONFIG_SYS_NAND_ALE CONFIG_SYS_NAND_AMASK CONFIG_SYS_NAND_BAD_BLOCK_POS -- 2.17.1

2 1

[U-Boot] [PATCH 1/1] doc: README.iscsi: make compatible with restructured text
by Heinrich Schuchardt 11 Aug '18

11 Aug '18

The Sphinx documentation system uses restructured text. Make the README.iscsi file compatible. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.iscsi | 130 +++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 62 deletions(-) diff --git a/doc/README.iscsi b/doc/README.iscsi index cb71c6e7446..d8880415e32 100644 --- a/doc/README.iscsi +++ b/doc/README.iscsi @@ -1,6 +1,8 @@ -# iSCSI booting with U-Boot and iPXE +iSCSI booting with U-Boot and iPXE +================================== -## Motivation +Motivation +---------- U-Boot has only a reduced set of supported network protocols. The focus for network booting has been on UDP based protocols. A TCP stack and HTTP support @@ -32,14 +34,15 @@ via HTTPS and to download any other files needed for booting via iSCSI from the same target where the operating system is installed. An alternative to implementing these protocols in U-Boot is to use an existing -software that can run on top of U-Boot. iPXE is the "swiss army knife" of +software that can run on top of U-Boot. iPXE[1] is the "swiss army knife" of network booting. It supports both HTTPS and iSCSI. It has a scripting engine for fine grained control of the boot process and can provide a command shell. iPXE can be built as an EFI application (named snp.efi) which can be loaded and run by U-Boot. -## Boot sequence +Boot sequence +------------- U-Boot loads the EFI application iPXE snp.efi using the bootefi command. This application has network access via the simple network protocol offered by @@ -56,67 +59,68 @@ For a selected iSCSI target iPXE sets up a handle with the block IO protocol. It uses the ConnectController boot service of U-Boot to request U-Boot to connect a file system driver. U-Boot reads from the iSCSI drive via the block IO protocol offered by iPXE. It creates the partition handles and installs the simple file -protocol. Now iPXE can call the simple file protocol to load Grub. U-Boot uses -the block IO protocol offered by iPXE to fulfill the request. - -Once Grub is started it uses the same block IO protocol to load Linux. Via -the EFI stub Linux is called as an EFI application. - -``` - +--------+ +--------+ - | | Runs | | - | U-Boot |=========>| iPXE | - | EFI | | snp.efi| -+--------+ | | DHCP | | -| |<====|********|<=========| | -| DHCP | | | Get IP | | -| Server | | | Address | | -| |====>|********|=========>| | -+--------+ | | Response | | - | | | | - | | | | -+--------+ | | HTTPS | | -| |<====|********|<=========| | -| HTTPS | | | Load | | -| Server | | | Script | | -| |====>|********|=========>| | -+--------+ | | | | - | | | | - | | | | -+--------+ | | iSCSI | | -| |<====|********|<=========| | -| iSCSI | | | Auth | | -| Server |====>|********|=========>| | -| | | | | | -| | | | Loads | | -| |<====|********|<=========| | +--------+ -| | | | Grub | | Runs | | -| |====>|********|=========>| |=======>| Grub | -| | | | | | | | -| | | | | | | | -| | | | | | Loads | | -| |<====|********|<=========|********|<=======| | +--------+ -| | | | | | Linux | | Runs | | -| |====>|********|=========>|********|=======>| |=====>| Linux | -| | | | | | | | | | -+--------+ +--------+ +--------+ +--------+ | | - | | - | | - | ~ ~ ~ ~| -``` - -## Security +protocol. Now iPXE can call the simple file protocol to load GRUB[2]. U-Boot +uses the block IO protocol offered by iPXE to fulfill the request. + +Once GRUB is started it uses the same block IO protocol to load Linux. Via +the EFI stub Linux is called as an EFI application:: + + +--------+ +--------+ + | | Runs | | + | U-Boot |========>| iPXE | + | EFI | | snp.efi| + +--------+ | | DHCP | | + | |<===|********|<========| | + | DHCP | | | Get IP | | + | Server | | | Address | | + | |===>|********|========>| | + +--------+ | | Response| | + | | | | + | | | | + +--------+ | | HTTPS | | + | |<===|********|<========| | + | HTTPS | | | Load | | + | Server | | | Script | | + | |===>|********|========>| | + +--------+ | | | | + | | | | + | | | | + +--------+ | | iSCSI | | + | |<===|********|<========| | + | iSCSI | | | Auth | | + | Server |===>|********|========>| | + | | | | | | + | | | | Loads | | + | |<===|********|<========| | +--------+ + | | | | GRUB | | Runs | | + | |===>|********|========>| |======>| GRUB | + | | | | | | | | + | | | | | | | | + | | | | | | Loads | | + | |<===|********|<========|********|<======| | +--------+ + | | | | | | Linux | | Runs | | + | |===>|********|========>|********|======>| |=====>| Linux | + | | | | | | | | | | + +--------+ +--------+ +--------+ +--------+ | | + | | + | | + | ~ ~ ~ ~| + +Security +-------- The iSCSI protocol is not encrypted. The traffic could be secured using IPsec but neither U-Boot nor iPXE does support this. So we should at least separate the iSCSI traffic from all other network traffic. This can be achieved using a virtual local area network (VLAN). -## Configuration +Configuration +------------- -### iPXE +iPXE +^^^^ -For running iPXE on arm64 the bin-arm64-efi/snp.efi build target is needed. +For running iPXE on arm64 the bin-arm64-efi/snp.efi build target is needed:: git clone http://git.ipxe.org/ipxe.git cd ipxe/src @@ -132,7 +136,7 @@ http://ipxe.org/cfg iPXE by default will put the CPU to rest when waiting for input. U-Boot does not wake it up due to missing interrupt support. To avoid this behavior create -file src/config/local/nap.h. +file src/config/local/nap.h:: /* nap.h */ #undef NAP_EFIX86 @@ -140,7 +144,7 @@ file src/config/local/nap.h. #define NAP_NULL The supported commands in iPXE are controlled by an include, too. Putting the -following into src/config/local/general.h is sufficient for most use cases. +following into src/config/local/general.h is sufficient for most use cases:: /* general.h */ #define NSLOOKUP_CMD /* Name resolution command */ @@ -153,7 +157,9 @@ following into src/config/local/general.h is sufficient for most use cases. #define DOWNLOAD_PROTO_NFS /* Network File System Protocol */ #define DOWNLOAD_PROTO_FILE /* Local file system access */ -## Links +Links +----- -* https://ipxe.org - iPXE open source boot firmware -* https://www.gnu.org/software/grub/ - GNU Grub (Grand Unified Bootloader) +* [1](https://ipxe.org) https://ipxe.org - iPXE open source boot firmware +* [2](https://www.gnu.org/software/grub/) https://www.gnu.org/software/grub/ - + GNU GRUB (Grand Unified Bootloader) -- 2.18.0

2 1

[U-Boot] [PATCH 1/1] doc: add structure to Sphinx generated docs
by Heinrich Schuchardt 11 Aug '18

11 Aug '18

Create separate html pages for linker lists, the serial subsystem, and the EFI subsystem. Add a table of content. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Documentation/efi.rst | 16 +++++ Documentation/index.rst | 122 +++------------------------------ Documentation/linker_lists.rst | 100 +++++++++++++++++++++++++++ Documentation/serial.rst | 7 ++ MAINTAINERS | 1 + 5 files changed, 132 insertions(+), 114 deletions(-) create mode 100644 Documentation/efi.rst create mode 100644 Documentation/linker_lists.rst create mode 100644 Documentation/serial.rst diff --git a/Documentation/efi.rst b/Documentation/efi.rst new file mode 100644 index 00000000000..51c1de24f84 --- /dev/null +++ b/Documentation/efi.rst @@ -0,0 +1,16 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +EFI subsystem +============= + +Boot services +------------- + +.. kernel-doc:: lib/efi_loader/efi_boottime.c + :internal: + +Runtime services +---------------- + +.. kernel-doc:: lib/efi_loader/efi_runtime.c + :internal: diff --git a/Documentation/index.rst b/Documentation/index.rst index a7b0ee4e87d..0353c10a4b0 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -1,117 +1,11 @@ -==================== -U-Boot Hacker Manual -==================== +.. SPDX-License-Identifier: GPL-2.0+ -Linker-Generated Arrays -======================= +####################### +U-Boot Developer Manual +####################### -A linker list is constructed by grouping together linker input -sections, each containing one entry of the list. Each input section -contains a constant initialized variable which holds the entry's -content. Linker list input sections are constructed from the list -and entry names, plus a prefix which allows grouping all lists -together. Assuming _list and _entry are the list and entry names, -then the corresponding input section name is +.. toctree:: -:: - - .u_boot_list_ + 2_ + @_list + _2_ + @_entry - -and the C variable name is - -:: - - _u_boot_list + _2_ + @_list + _2_ + @_entry - -This ensures uniqueness for both input section and C variable name. - -Note that the names differ only in the first character, "." for the -section and "_" for the variable, so that the linker cannot confuse -section and symbol names. From now on, both names will be referred -to as - -:: - - %u_boot_list_ + 2_ + @_list + _2_ + @_entry - -Entry variables need never be referred to directly. - -The naming scheme for input sections allows grouping all linker lists -into a single linker output section and grouping all entries for a -single list. - -Note the two '_2_' constant components in the names: their presence -allows putting a start and end symbols around a list, by mapping -these symbols to sections names with components "1" (before) and -"3" (after) instead of "2" (within). -Start and end symbols for a list can generally be defined as - -:: - - %u_boot_list_2_ + @_list + _1_... - %u_boot_list_2_ + @_list + _3_... - -Start and end symbols for the whole of the linker lists area can be -defined as - -:: - - %u_boot_list_1_... - %u_boot_list_3_... - -Here is an example of the sorted sections which result from a list -"array" made up of three entries : "first", "second" and "third", -iterated at least once. - -:: - - .u_boot_list_2_array_1 - .u_boot_list_2_array_2_first - .u_boot_list_2_array_2_second - .u_boot_list_2_array_2_third - .u_boot_list_2_array_3 - -If lists must be divided into sublists (e.g. for iterating only on -part of a list), one can simply give the list a name of the form -'outer_2_inner', where 'outer' is the global list name and 'inner' -is the sub-list name. Iterators for the whole list should use the -global list name ("outer"); iterators for only a sub-list should use -the full sub-list name ("outer_2_inner"). - -Here is an example of the sections generated from a global list -named "drivers", two sub-lists named "i2c" and "pci", and iterators -defined for the whole list and each sub-list: - -:: - - %u_boot_list_2_drivers_1 - %u_boot_list_2_drivers_2_i2c_1 - %u_boot_list_2_drivers_2_i2c_2_first - %u_boot_list_2_drivers_2_i2c_2_first - %u_boot_list_2_drivers_2_i2c_2_second - %u_boot_list_2_drivers_2_i2c_2_third - %u_boot_list_2_drivers_2_i2c_3 - %u_boot_list_2_drivers_2_pci_1 - %u_boot_list_2_drivers_2_pci_2_first - %u_boot_list_2_drivers_2_pci_2_second - %u_boot_list_2_drivers_2_pci_2_third - %u_boot_list_2_drivers_2_pci_3 - %u_boot_list_2_drivers_3 - -.. kernel-doc:: include/linker_lists.h - :internal: - -Serial system -============= - -.. kernel-doc:: drivers/serial/serial.c - :internal: - -The U-Boot EFI subsystem -======================== - -Boot services -------------- - -.. kernel-doc:: lib/efi_loader/efi_boottime.c - :internal: + efi + linker_lists + serial diff --git a/Documentation/linker_lists.rst b/Documentation/linker_lists.rst new file mode 100644 index 00000000000..72f514e0ac0 --- /dev/null +++ b/Documentation/linker_lists.rst @@ -0,0 +1,100 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Linker-Generated Arrays +======================= + +A linker list is constructed by grouping together linker input +sections, each containing one entry of the list. Each input section +contains a constant initialized variable which holds the entry's +content. Linker list input sections are constructed from the list +and entry names, plus a prefix which allows grouping all lists +together. Assuming _list and _entry are the list and entry names, +then the corresponding input section name is + +:: + + .u_boot_list_ + 2_ + @_list + _2_ + @_entry + +and the C variable name is + +:: + + _u_boot_list + _2_ + @_list + _2_ + @_entry + +This ensures uniqueness for both input section and C variable name. + +Note that the names differ only in the first character, "." for the +section and "_" for the variable, so that the linker cannot confuse +section and symbol names. From now on, both names will be referred +to as + +:: + + %u_boot_list_ + 2_ + @_list + _2_ + @_entry + +Entry variables need never be referred to directly. + +The naming scheme for input sections allows grouping all linker lists +into a single linker output section and grouping all entries for a +single list. + +Note the two '_2_' constant components in the names: their presence +allows putting a start and end symbols around a list, by mapping +these symbols to sections names with components "1" (before) and +"3" (after) instead of "2" (within). +Start and end symbols for a list can generally be defined as + +:: + + %u_boot_list_2_ + @_list + _1_... + %u_boot_list_2_ + @_list + _3_... + +Start and end symbols for the whole of the linker lists area can be +defined as + +:: + + %u_boot_list_1_... + %u_boot_list_3_... + +Here is an example of the sorted sections which result from a list +"array" made up of three entries : "first", "second" and "third", +iterated at least once. + +:: + + .u_boot_list_2_array_1 + .u_boot_list_2_array_2_first + .u_boot_list_2_array_2_second + .u_boot_list_2_array_2_third + .u_boot_list_2_array_3 + +If lists must be divided into sublists (e.g. for iterating only on +part of a list), one can simply give the list a name of the form +'outer_2_inner', where 'outer' is the global list name and 'inner' +is the sub-list name. Iterators for the whole list should use the +global list name ("outer"); iterators for only a sub-list should use +the full sub-list name ("outer_2_inner"). + +Here is an example of the sections generated from a global list +named "drivers", two sub-lists named "i2c" and "pci", and iterators +defined for the whole list and each sub-list: + +:: + + %u_boot_list_2_drivers_1 + %u_boot_list_2_drivers_2_i2c_1 + %u_boot_list_2_drivers_2_i2c_2_first + %u_boot_list_2_drivers_2_i2c_2_first + %u_boot_list_2_drivers_2_i2c_2_second + %u_boot_list_2_drivers_2_i2c_2_third + %u_boot_list_2_drivers_2_i2c_3 + %u_boot_list_2_drivers_2_pci_1 + %u_boot_list_2_drivers_2_pci_2_first + %u_boot_list_2_drivers_2_pci_2_second + %u_boot_list_2_drivers_2_pci_2_third + %u_boot_list_2_drivers_2_pci_3 + %u_boot_list_2_drivers_3 + +.. kernel-doc:: include/linker_lists.h + :internal: diff --git a/Documentation/serial.rst b/Documentation/serial.rst new file mode 100644 index 00000000000..ed34e592a44 --- /dev/null +++ b/Documentation/serial.rst @@ -0,0 +1,7 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Serial system +============= + +.. kernel-doc:: drivers/serial/serial.c + :internal: diff --git a/MAINTAINERS b/MAINTAINERS index c4f78d9e82d..a2cea8245d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -365,6 +365,7 @@ T: git git://github.com/agraf/u-boot.git F: doc/DocBook/efi.tmpl F: doc/README.uefi F: doc/README.iscsi +F: Documentation/efi.rst F: include/capitalization.h F: include/efi* F: include/pe.h -- 2.18.0

2 1