November 2018 - U-Boot

[U-Boot] [PATCH v2 0/3] dts: arm: socfpga: merge gen5 devicetrees from linux
by Simon Goldschmidt 02 Nov '18

02 Nov '18

This series merges socfpga gen5 dts and dtsi files from linux while keeping U-Boot behaviour. Changes in those files that need fixing (mostly in -u-boot.dtsi board files) are: - watchdog is now enabled - ethernet, spi and i2c aliases removed from socfpga.dtsi - gpio bank names not available - mmc disabled - qspi compatible string different - 'clock-frequency' removed from uarts These changes are mostly handled in changed dts files or U-Boot specific dtsi files except for: - change compatible to "cdns,qspi-nor" for cadence_qspi.c - allow binding dwapb_gpio driver without "bank-name" property (gpios still work, only access via bank name fails) Changes in v2: - remove old compatible "cadence,qspi" for cadence qspi driver and change all affected dts files to the new compatible "cdns,qspi-nor" - "cadence,qspi" to "cdns,qspi-nor" change in socfpga.dtsi moved to patch 2 Simon Goldschmidt (3): gpio: dwapb_gpio: fix binding without bank-name property spi: cadence_qspi: use "cdns,qspi-nor" as compatible dts: arm: socfpga: merge gen5 devicetrees from linux arch/arm/dts/keystone-k2g.dtsi | 2 +- arch/arm/dts/socfpga.dtsi | 404 ++++++++++++------ arch/arm/dts/socfpga_arria10.dtsi | 2 +- arch/arm/dts/socfpga_arria5.dtsi | 11 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 56 +++ arch/arm/dts/socfpga_arria5_socdk.dts | 97 +++-- arch/arm/dts/socfpga_cyclone5.dtsi | 9 +- arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 17 +- .../socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 46 ++ .../arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 69 +-- arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 16 + arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 16 + arch/arm/dts/socfpga_cyclone5_is1.dts | 8 + .../dts/socfpga_cyclone5_socdk-u-boot.dtsi | 72 ++++ arch/arm/dts/socfpga_cyclone5_socdk.dts | 88 +++- .../dts/socfpga_cyclone5_sockit-u-boot.dtsi | 56 +++ arch/arm/dts/socfpga_cyclone5_sockit.dts | 149 +++++-- .../dts/socfpga_cyclone5_socrates-u-boot.dtsi | 60 +++ arch/arm/dts/socfpga_cyclone5_socrates.dts | 85 ++-- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 12 + .../socfpga_cyclone5_vining_fpga-u-boot.dtsi | 60 +++ arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 222 ++++++++-- arch/arm/dts/stv0991.dts | 2 +- doc/device-tree-bindings/spi/spi-cadence.txt | 2 +- drivers/gpio/dwapb_gpio.c | 7 + drivers/spi/cadence_qspi.c | 2 +- 26 files changed, 1235 insertions(+), 335 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi -- 2.17.1

2 4

[U-Boot] [PATCH] drivers: serial: probe all serial devices
by Vabhav Sharma 02 Nov '18

02 Nov '18

Serial subsystem search and probe only one first serial device and unable to use remaining available UART devices This patch changes the logic to probe all available serial devices using platform data or device tree in DM model in order to use all UART devices Signed-off-by: Vabhav Sharma <vabhav.sharma(a)nxp.com> --- drivers/serial/Kconfig | 12 ++++++++++++ drivers/serial/serial-uclass.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 597db4b..d6451b1 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -133,6 +133,18 @@ config SERIAL_SEARCH_ALL If unsure, say N. +config SERIAL_PROBE_ALL + bool "Probe all available serial devices" + depends on DM_SERIAL + help + The serial subsystem only probe for single serial device, but does + not probe for remaining available devices. + With this option set,we make probing for all available devices + mandatory. + + If probing is not required for all remaining available + devices other than default current console device, say N. + config SPL_DM_SERIAL bool "Enable Driver Model for serial drivers in SPL" depends on DM_SERIAL && SPL_DM diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index e50f0aa..405e60e 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -82,6 +82,13 @@ static void serial_find_console_or_panic(void) uclass_first_device(UCLASS_SERIAL, &dev); if (dev) { gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } } else if (CONFIG_IS_ENABLED(OF_CONTROL) && blob) { @@ -92,11 +99,25 @@ static void serial_find_console_or_panic(void) if (np && !uclass_get_device_by_ofnode(UCLASS_SERIAL, np_to_ofnode(np), &dev)) { gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } } else { if (!serial_check_stdout(blob, &dev)) { gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } } @@ -121,6 +142,13 @@ static void serial_find_console_or_panic(void) !uclass_get_device(UCLASS_SERIAL, INDEX, &dev)) { if (dev->flags & DM_FLAG_ACTIVATED) { gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } } @@ -132,6 +160,13 @@ static void serial_find_console_or_panic(void) if (!ret) { /* Device did succeed probing */ gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } } @@ -140,6 +175,13 @@ static void serial_find_console_or_panic(void) !uclass_get_device(UCLASS_SERIAL, INDEX, &dev) || (!uclass_first_device(UCLASS_SERIAL, &dev) && dev)) { gd->cur_serial_dev = dev; +#ifdef CONFIG_SERIAL_PROBE_ALL + /* Scanning uclass to probe all devices */ + for (; + dev; + uclass_next_device(&dev)) + ; +#endif return; } #endif -- 2.7.4

5 14

[U-Boot] [PATCH 0/6] efi_loader: add HII database protocol
by AKASHI Takahiro 02 Nov '18

02 Nov '18

HII database protocol is the last missing (major?) piece of code so that we can run unmodified EDKII's shell and UEFI SCT on EFI-enabled u-boot. The original code was initially written by Leif and Rob a year ago[1], and now I'm reworking it. The implementation has not been much enhanced from the original, but I tried to give it clearer implementation to be able to add more functionality easily later on. I also addressed the comments by Alex[2] and added a self test on request of Heinrich. HII configuration routing protocol and access protocol have only a skeleton and should be implemented when we need to have *drivers* that require configuration mechanism. Concerns (if any): * missing features (see the commit log of patch#2) * unaligned access to *packed* structure in a package list should be cared? [1] https://lists.denx.de/pipermail/u-boot/2017-October/308999.html [2] https://lists.denx.de/pipermail/u-boot/2017-October/309116.html AKASHI Takahiro (4): efi: hii: add guid package support efi: hii: add keyboard layout package support efi: hii: add HII config routing/access protocols efi_selftest: add HII database protocols test Akashi, Takahiro (1): lib: add u16_strcpy/strdup functions Leif Lindholm (1): efi_loader: Initial HII database protocols include/charset.h | 18 + include/efi_api.h | 410 +++++++++ include/efi_loader.h | 8 + lib/charset.c | 29 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_boottime.c | 18 + lib/efi_loader/efi_hii.c | 1053 ++++++++++++++++++++++ lib/efi_loader/efi_hii_config.c | 146 +++ lib/efi_selftest/Makefile | 1 + lib/efi_selftest/efi_selftest_hii.c | 882 ++++++++++++++++++ lib/efi_selftest/efi_selftest_hii_data.c | 450 +++++++++ 11 files changed, 3016 insertions(+) create mode 100644 lib/efi_loader/efi_hii.c create mode 100644 lib/efi_loader/efi_hii_config.c create mode 100644 lib/efi_selftest/efi_selftest_hii.c create mode 100644 lib/efi_selftest/efi_selftest_hii_data.c -- 2.19.0

2 18

[U-Boot] [PATCH v3 00/10] arm: am654: Add r5 support for am654-evm
by Lokesh Vutla 02 Nov '18

02 Nov '18

This series adds r5 build support for booting am654 evm. There is still 1 step(loading system firmware) missing to complete the full boot. This will be posted as a separate series. Series depends on the following 2 pathces: - https://patchwork.ozlabs.org/patch/985201/ - https://patchwork.ozlabs.org/patch/988704/ Changes since v2: - Enabled CONFIG_SPL_DM_REGULATOR_GPIO in PATCH 9 - Remove the quotes in string CONFIG_SYS_K3_KEY when using - Add dependency on $(KEY) for generating u-boot-spl-cert.bin Changes since v1: - Fixed SPDX headers in patch 1/10 - Updated Linux tag from which dts got synced. - Updated Reviewed-by tags Lokesh Vutla (10): ram: Introduce K3 AM654 DDR Sub System driver armv7R: K3: am654: Enable MPU regions armv7R: K3: am654: Add support for generating build targets armv7R: K3: am654: Add support to start ATF from R5 SPL armv7R: K3: am654: Add support for triggering ddr init from SPL board: ti: am654: r5: Add initial support for am654 arm: dts: k3: Sync dts from Linux armv7r: dts: am654: Add initial support configs: am65x_evm_r5: Add initial support board: ti: am65x: Update README to add R5 build support arch/arm/dts/Makefile | 2 +- arch/arm/dts/k3-am65-main.dtsi | 51 +- arch/arm/dts/k3-am65-mcu.dtsi | 18 + arch/arm/dts/k3-am65-wakeup.dtsi | 46 + arch/arm/dts/k3-am65.dtsi | 54 +- .../dts/k3-am654-base-board-ddr4-1333MHz.dtsi | 195 +++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 94 +- arch/arm/dts/k3-am654-ddr.dtsi | 241 ++++ arch/arm/dts/k3-am654-r5-base-board.dts | 139 ++ arch/arm/mach-k3/Kconfig | 18 + arch/arm/mach-k3/Makefile | 2 + arch/arm/mach-k3/am6_init.c | 18 + arch/arm/mach-k3/common.c | 52 + arch/arm/mach-k3/common.h | 11 + arch/arm/mach-k3/config.mk | 59 + arch/arm/mach-k3/include/mach/sys_proto.h | 14 + arch/arm/mach-k3/r5_mpu.c | 47 + board/ti/am65x/Kconfig | 24 + board/ti/am65x/MAINTAINERS | 1 + board/ti/am65x/README | 114 +- configs/am65x_evm_r5_defconfig | 87 ++ .../ram/k3-am654-ddrss.txt | 46 + drivers/ram/Kconfig | 11 + drivers/ram/Makefile | 2 + drivers/ram/k3-am654-ddrss.c | 776 +++++++++++ drivers/ram/k3-am654-ddrss.h | 1227 +++++++++++++++++ include/configs/am65x_evm.h | 6 + include/configs/ti_armv7_common.h | 2 + tools/k3_x509template.txt | 48 + 29 files changed, 3290 insertions(+), 115 deletions(-) create mode 100644 arch/arm/dts/k3-am65-mcu.dtsi create mode 100644 arch/arm/dts/k3-am65-wakeup.dtsi create mode 100644 arch/arm/dts/k3-am654-base-board-ddr4-1333MHz.dtsi create mode 100644 arch/arm/dts/k3-am654-ddr.dtsi create mode 100644 arch/arm/dts/k3-am654-r5-base-board.dts create mode 100644 arch/arm/mach-k3/common.c create mode 100644 arch/arm/mach-k3/common.h create mode 100644 arch/arm/mach-k3/include/mach/sys_proto.h create mode 100644 arch/arm/mach-k3/r5_mpu.c create mode 100644 configs/am65x_evm_r5_defconfig create mode 100644 doc/device-tree-bindings/ram/k3-am654-ddrss.txt create mode 100644 drivers/ram/k3-am654-ddrss.c create mode 100644 drivers/ram/k3-am654-ddrss.h create mode 100644 tools/k3_x509template.txt -- 2.19.1

1 11

[U-Boot] [PATCH 1/4] tools: imx8image: check lseek return value
by Peng Fan 01 Nov '18

01 Nov '18

Check lseek return value. Fix Coverity CID: 184236 184235 184232 Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- tools/imx8image.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/imx8image.c b/tools/imx8image.c index e6b0a146b6..eb039b583d 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -333,7 +333,12 @@ static void copy_file_aligned(int ifd, const char *datafile, int offset, } size = sbuf.st_size; - lseek(ifd, offset, SEEK_SET); + if (lseek(ifd, offset, SEEK_SET) == -1) { + fprintf(stderr, "%s: lseek error %s\n", + __func__, strerror(errno)); + exit(EXIT_FAILURE); + } + if (write(ifd, ptr, size) != size) { fprintf(stderr, "Write error %s\n", strerror(errno)); exit(EXIT_FAILURE); @@ -387,7 +392,12 @@ static void copy_file (int ifd, const char *datafile, int pad, int offset) } size = sbuf.st_size; - lseek(ifd, offset, SEEK_SET); + if (lseek(ifd, offset, SEEK_SET) == -1) { + fprintf(stderr, "%s: lseek error %s\n", + __func__, strerror(errno)); + exit(EXIT_FAILURE); + } + if (write(ifd, ptr, size) != size) { fprintf(stderr, "Write error %s\n", strerror(errno)); @@ -883,7 +893,11 @@ static int build_container(soc_type_t soc, uint32_t sector_size, } while (img_sp->option != NO_IMG); /* Add padding or skip appended container */ - lseek(ofd, file_padding, SEEK_SET); + if (lseek(ofd, file_padding, SEEK_SET) == -1) { + fprintf(stderr, "%s: lseek error %s\n", + __func__, strerror(errno)); + exit(EXIT_FAILURE); + } /* Note: Image offset are not contained in the image */ tmp = flatten_container_header(&imx_header, container + 1, &size, -- 2.14.1

2 7

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 01 Nov '18

01 Nov '18

The following changes since commit 454cf76184c65426b68033a23da086e73663f2fc: Prepare v2018.11-rc3 (2018-10-29 16:04:26 -0400) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to f48db4ede07b52290477e188de714e327e4954de: arm: socfpga: imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION (2018-10-31 01:41:10 +0100) ---------------------------------------------------------------- Simon Goldschmidt (2): arm: socfpga: fpga: fix type of local variable arm: socfpga: imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION Stefan Roese (1): arm: socfpga: Fix bootcounter located at the end of internal SRAM arch/arm/Kconfig | 2 +- drivers/fpga/socfpga_arria10.c | 2 +- drivers/fpga/socfpga_gen5.c | 2 +- include/configs/socfpga_common.h | 13 +++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-)

2 1

Re: [U-Boot] [PATCH v2 16/29] riscv: invalidate the instruction cache before jumping to Linux
by Rick Chen 01 Nov '18

01 Nov '18

<rick(a)andestech.com> 於 2018年11月1日週四下午12:13寫道： > > > RISC-V does not guarantee that stores to instruction memory are visible to > > instruction fetches (i.e. incoherent instruction caches). Invalidate the instruction > > cache to ensure the kernel function pointer points to the correct memory > > location. > > > > Signed-off-by: Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> > > --- > > > > Changes in v2: > > - Clarify reasoning behind patch in commit message > > > > arch/riscv/lib/bootm.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index > > 2b5ccce933..c1cf618806 100644 > > --- a/arch/riscv/lib/bootm.c > > +++ b/arch/riscv/lib/bootm.c > > @@ -40,6 +40,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], > > bootm_headers_t *images) > > return 1; > > > > kernel = (void (*)(ulong, void *))images->ep; > > + invalidate_icache_all(); > > Hi Lukas [PATCH v2] riscv: cache: Implement i/dcache [status, enable, disable] will implement +void cache_flush(void) { + invalidate_icache_all(); + flush_dcache_all(); } It seem redundant here. Rick > > bootstage_mark(BOOTSTAGE_ID_RUN_OS); > > > > -- > > 2.17.2

1 0

[U-Boot] [PATCH] MIPS: make size of relocation table fixed but configurable
by Daniel Schwierzeck 01 Nov '18

01 Nov '18

Currently the size of the relocation table will be shrunk to the actual size needed. Although this gives a maximal space saving, it messes up the _end symbol. This breaks features like appended DTBs because the _end symbol doesn't point to the real end of the U-Boot binary. Remove the size shrinking and make the size of the relocation table fixed but configurable. This follows the Linux approach and the user can adjust the size to his needs. Also rename the relocation table section from .rel to .data.reloc to follow the Linux approach and to avoid ambiguities with the .rel.* sections added by the linker. Reported-by: Lars Povlsen <lars.povlsen(a)microsemi.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- Lars, I couldn't find a working solution for fixing up the _end symbol. Thus I decided to implement the Linux approach with a configurable size for the relocation table. The _end symbol should be now correct and aligned to 4 Bytes in all configurations. arch/mips/Kconfig | 18 ++++++++++++++++++ arch/mips/config.mk | 2 +- arch/mips/cpu/u-boot.lds | 20 +++++++++++++------- tools/mips-relocs.c | 30 ++++++++---------------------- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 071dea04ec..6d646ef999 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -248,6 +248,24 @@ config MIPS_CACHE_INDEX_BASE Normally this is CKSEG0. If the MIPS system needs to move this block to some SRAM or ScratchPad RAM, adapt this option accordingly. +config MIPS_RELOCATION_TABLE_SIZE + hex "Relocation table size" + range 0x100 0x10000 + default "0x8000" + ---help--- + A table of relocation data will be appended to the U-Boot binary + and parsed in relocate_code() to fix up all offsets in the relocated + U-Boot. + + This option allows the amount of space reserved for the table to be + adjusted in a range from 256 up to 64k. The default is 32k and should + be ok in most cases. Reduce this value to shrink the size of U-Boot + binary. + + The build will fail and a valid size suggested if this is too small. + + If unsure, leave at the default value. + endmenu menu "OS boot interface" diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 8aa45fc45c..22223a0f3e 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -55,7 +55,7 @@ PLATFORM_ELFFLAGS += -B mips $(OBJCOPYFLAGS) # MODFLAGS += -mlong-calls # ifndef CONFIG_SPL_BUILD -OBJCOPYFLAGS += -j .got -j .rel -j .padding -j .dtb.init.rodata +OBJCOPYFLAGS += -j .data.reloc -j .dtb.init.rodata LDFLAGS_FINAL += --emit-relocs endif diff --git a/arch/mips/cpu/u-boot.lds b/arch/mips/cpu/u-boot.lds index c7b29068df..86496737d3 100644 --- a/arch/mips/cpu/u-boot.lds +++ b/arch/mips/cpu/u-boot.lds @@ -41,16 +41,22 @@ SECTIONS __image_copy_end = .; __init_end = .; - /* - * .rel must come last so that the mips-relocs tool can shrink - * the section size & the PT_LOAD program header filesz. - */ - .rel : { + .data.reloc : { __rel_start = .; - BYTE(0x0) - . += (32 * 1024) - 1; + /* + * Space for relocation table + * This needs to be filled so that the + * mips-reloc tool can overwrite the content. + * An invalid value is left at the start of the + * section to abort relocation if the table + * has not been filled in. + */ + LONG(0xFFFFFFFF); + FILL(0); + . += CONFIG_MIPS_RELOCATION_TABLE_SIZE - 4; } + . = ALIGN(4); _end = .; .bss __rel_start (OVERLAY) : { diff --git a/tools/mips-relocs.c b/tools/mips-relocs.c index 442cc8f6d2..625258085b 100644 --- a/tools/mips-relocs.c +++ b/tools/mips-relocs.c @@ -195,15 +195,13 @@ static int compare_relocs(const void *a, const void *b) int main(int argc, char *argv[]) { unsigned int i, j, i_rel_shdr, sh_type, sh_entsize, sh_entries; - size_t rel_size, rel_actual_size, load_sz; + size_t rel_size, rel_actual_size; const char *shstrtab, *sh_name, *rel_pfx; int (*parse_fn)(const void *rel); uint8_t *buf_start, *buf; const Elf32_Ehdr *ehdr32; const Elf64_Ehdr *ehdr64; uintptr_t sh_offset; - Elf32_Phdr *phdr32; - Elf64_Phdr *phdr64; Elf32_Shdr *shdr32; Elf64_Shdr *shdr64; struct stat st; @@ -285,8 +283,6 @@ int main(int argc, char *argv[]) goto out_free_relocs; } - phdr32 = elf + ehdr_field(e_phoff); - phdr64 = elf + ehdr_field(e_phoff); shdr32 = elf + ehdr_field(e_shoff); shdr64 = elf + ehdr_field(e_shoff); shstrtab = elf + shdr_field(ehdr_field(e_shstrndx), sh_offset); @@ -295,7 +291,7 @@ int main(int argc, char *argv[]) for (i = 0; i < ehdr_field(e_shnum); i++) { sh_name = shstr(shdr_field(i, sh_name)); - if (!strcmp(sh_name, ".rel")) { + if (!strcmp(sh_name, ".data.reloc")) { i_rel_shdr = i; continue; } @@ -397,22 +393,12 @@ int main(int argc, char *argv[]) rel_size = shdr_field(i_rel_shdr, sh_size); rel_actual_size = buf - buf_start; if (rel_actual_size > rel_size) { - fprintf(stderr, "Relocs overflowed .rel section\n"); - return -ENOMEM; - } - - /* Update the .rel section's size */ - set_shdr_field(i_rel_shdr, sh_size, rel_actual_size); - - /* Shrink the PT_LOAD program header filesz (ie. shrink u-boot.bin) */ - for (i = 0; i < ehdr_field(e_phnum); i++) { - if (phdr_field(i, p_type) != PT_LOAD) - continue; - - load_sz = phdr_field(i, p_filesz); - load_sz -= rel_size - rel_actual_size; - set_phdr_field(i, p_filesz, load_sz); - break; + fprintf(stderr, "Relocations overflow available space of 0x%lx (required 0x%lx)!\n", + rel_size, rel_actual_size); + fprintf(stderr, "Please adjust CONFIG_MIPS_RELOCATION_TABLE_SIZE to at least 0x%lx\n", + (rel_actual_size + 0x100) & ~0xFF); + err = -ENOMEM; + goto out_free_relocs; } /* Make sure data is written back to the file */ -- 2.19.1

1 0