February 2016 - U-Boot

[U-Boot] [PATCH v3 0/3] ARM: at91: add PLLB handle functions
by Wenyou Yang 02 Feb '16

02 Feb '16

To reduce the duplicated code, add PLLB enable/disable functions, replace the UTMI PLL handle code with these functions. It is based on the following patch set. http://lists.denx.de/pipermail/u-boot/2016-February/244370.html http://lists.denx.de/pipermail/u-boot/2016-February/244399.html Changes in v3: - collect Reviewed-by from Andreas. Changes in v2: - add return value for timeout checking at91_pllb_clk_enable/disable(). - collect Reviewed-by from Andreas. Wenyou Yang (3): ARM: at91: clock: add PLLB enable/disable functions drivers: usb: ohci-at91: clean up the PLLB code board: atmel: siemens: clean up PLLB code arch/arm/mach-at91/arm926ejs/clock.c | 38 +++++++++++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/clk.h | 2 ++ board/siemens/smartweb/smartweb.c | 6 +----- board/siemens/taurus/taurus.c | 6 +----- drivers/usb/host/ohci-at91.c | 22 ++++++------------- 5 files changed, 49 insertions(+), 25 deletions(-) -- 1.7.9.5

3 7

[U-Boot] [PATCH] doc: uniphier: update U-Boot file names
by Masahiro Yamada 02 Feb '16

02 Feb '16

Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree") and commit 03c25bcd263a ("fdt: Build an SPL binary without device tree"), we can use shorter file names for the output images. The default configuration for UniPhier SoCs enables CONFIG_OF_SEPARATE and CONFIG_SPL_OF_CONTROL. In this case, spl/u-boot-spl-dtb.bin is the same as spl/u-boot-spl.bin. Likewise, u-boot-dtb.img is the same as u-boot.img. So, this change of the flow has no impact. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- doc/README.uniphier | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/README.uniphier b/doc/README.uniphier index bce70cf..bcf0ac3 100644 --- a/doc/README.uniphier +++ b/doc/README.uniphier @@ -68,8 +68,8 @@ Burn U-Boot images to NAND -------------------------- Write two files to the NAND device as follows: - - spl/u-boot-spl-dtb.bin at the offset address 0x00000000 - - u-boot-dtb.img at the offset address 0x00010000 + - spl/u-boot-spl.bin at the offset address 0x00000000 + - u-boot.img at the offset address 0x00010000 If a TFTP server is available, the images can be easily updated. Just copy the u-boot-spl-dtb.bin and u-boot-dtb.img to the TFTP public @@ -145,4 +145,4 @@ newer SoCs. Even if it is, EA[25] is not connected on most of the boards. -- Masahiro Yamada <yamada.masahiro(a)socionext.com> -Aug. 2015 +Feb. 2016 -- 1.9.1

1 0

[U-Boot] patch for 64bit access issue found in FDT
by Terry Zhou 02 Feb '16

02 Feb '16

Hi all: I found a bug in FDT, which will cause system crash when calling "fdtdec_get_uint64" if the fdt item is not on 8bytes boundary, here is the patch. Thanks. Best Regards, Terry

2 3

[U-Boot] [PATCH v3 0/7] fdt: Replace u-boot-dtb.bin with u-boot.bin
by Simon Glass 02 Feb '16

02 Feb '16

At present u-boot.bin holds the plain U-Boot binary without the device tree. This is somewhat annoying since you need either u-boot.bin or u-boot-dtb.bin depending on whether device tree is used. This series adjusts the build such that u-boot.bin includes a device tree if enabled, and the plain binary is in u-boot-nodtb.bin. For now u-boot-dtb.bin remains the same. This should be acceptable since: - without OF_CONTROL, u-boot.bin still does not include a device tree - with OF_CONTROL, u-boot-dtb.bin does not change The main impact is to build systems which are set up to use u-boot.bin as the output file and then add a device tree. These will have to change to use u-boot-nodtb.bin instead. The original decision to use a separate u-boot-dtb.bin was aimed at allowing any device tree file to be concatenated to the u-boot.bin image after the build. However this no-longer seems so important. More important is the convenience of using the same output file regardless of the setting for OF_CONTROL. Changes in v3: - Fix build error when CONFIG_OF_EMBED is used - Drop unnecessary ifdef around Makefile rule - Adjust rules based on Masahiro's expert comments - Use cmd_copy instead of cmd_cat - Drop an unnecessary rule - Update commit message to say OF_SEPARATE instead of OF_CONTROL - Rewrite the commit message for clarity Changes in v2: - Rewrite this commit based on tegra feedback - Update based on previous changes - Fix the update_filename in MCV - Tweak the tegra rule slightly Simon Glass (7): tegra: Clarify generation of -nodtb file with OF_CONTROL fdt: Build a U-Boot binary without device tree fdt: Build an SPL binary without device tree tegra: Always build a boot image with the same filename socfpga: Simplify Makefile filenames Makefile: Make u-boot.img the same as u-boot-dtb.img Makefile: Drop unnecessary -dtb suffixes Makefile | 89 +++++++++++++++++++--------------------- include/configs/socfpga_mcvevk.h | 2 +- scripts/Makefile.spl | 31 ++++++++------ 3 files changed, 63 insertions(+), 59 deletions(-) -- 2.7.0.rc3.207.g0ac5344

4 22

[U-Boot] [PULL] u-boot-mips/master
by Daniel Schwierzeck 02 Feb '16

02 Feb '16

Hi Tom, please pull some small MIPS updates and the initial Microchip PIC32 support. Thanks! The following changes since commit 8cdae1dacde7dbe74d53a8ac1a05761a53c4f191: video: Correct 'tor' typo in comment (2016-01-30 10:58:47 +0100) are available in the git repository at: git://git.denx.de/u-boot-mips.git master for you to fetch changes up to 7d514a7407756d96996960c2ae539a4b464c65bc: board: Enable ethernet, tftpboot support to pic32mzdask board. (2016-02-01 22:14:02 +0100) ---------------------------------------------------------------- Andrei Pistirica (1): drivers: mmc: add driver for Microchip PIC32 SDHCI controller. Daniel Schwierzeck (1): MIPS: start.S: fix and optimize instructions Marek Vasut (1): mips: cache: Bulletproof the code against cornercases Paul Burton (4): MIPS: Remove SLOW_DOWN_IO MIPS: Support dynamic I/O port base address malta: Set I/O port base early malta: Use I/O accessors for SuperI/O controller Paul Thacker (1): drivers: serial: add driver for Microchip PIC32 UART controller. Purna Chandra Mandal (12): MIPS: initialize board_init_f() argument to zero. MIPS: initial infrastructure for Microchip PIC32 architecture drivers: clk: Add clock driver for Microchip PIC32 Microcontroller. drivers: pinctrl: Add pinctrl driver for Microchip PIC32. drivers: gpio: add driver for Microchip PIC32 GPIO controller. drivers: ddr: Add DDR2 SDRAM controller driver for Microchip PIC32. MIPS: Add support for Microchip PIC32MZ[DA] SoC family. board: Add Microchip PIC32MZ[DA]-Starter-Kit board. board: add SDHCI support for PIC32MZDASK board. drivers: net: phy: add SMSC LAN8740 Phy support. drivers: net: Add ethernet driver for Microchip PIC32. board: Enable ethernet, tftpboot support to pic32mzdask board. arch/mips/Kconfig | 10 + arch/mips/Makefile | 1 + arch/mips/cpu/start.S | 22 +-- arch/mips/dts/Makefile | 2 +- arch/mips/dts/pic32mzda.dtsi | 174 ++++++++++++++++ arch/mips/dts/pic32mzda_sk.dts | 55 ++++++ arch/mips/include/asm/global_data.h | 3 + arch/mips/include/asm/io.h | 82 +++----- arch/mips/lib/Makefile | 1 - arch/mips/lib/cache.c | 8 + arch/mips/lib/io.c | 12 -- arch/mips/mach-pic32/Kconfig | 35 ++++ arch/mips/mach-pic32/Makefile | 7 + arch/mips/mach-pic32/cpu.c | 156 +++++++++++++++ arch/mips/mach-pic32/include/mach/ddr.h | 32 +++ arch/mips/mach-pic32/include/mach/pic32.h | 79 ++++++++ arch/mips/mach-pic32/lowlevel_init.S | 27 +++ arch/mips/mach-pic32/reset.c | 36 ++++ board/imgtec/malta/malta.c | 14 +- board/imgtec/malta/superio.c | 10 +- board/imgtec/malta/superio.h | 2 +- board/microchip/pic32mzda/Kconfig | 13 ++ board/microchip/pic32mzda/MAINTAINERS | 6 + board/microchip/pic32mzda/Makefile | 7 + board/microchip/pic32mzda/README | 22 +++ board/microchip/pic32mzda/pic32mzda.c | 31 +++ configs/pic32mzdask_defconfig | 34 ++++ doc/device-tree-bindings/clock/microchip,pic32-clock.txt | 33 ++++ doc/device-tree-bindings/serial/microchip,pic32-uart.txt | 5 + drivers/Makefile | 1 + drivers/clk/Makefile | 1 + drivers/clk/clk_pic32.c | 433 ++++++++++++++++++++++++++++++++++++++++ drivers/ddr/microchip/Makefile | 6 + drivers/ddr/microchip/ddr2.c | 278 ++++++++++++++++++++++++++ drivers/ddr/microchip/ddr2_regs.h | 148 ++++++++++++++ drivers/ddr/microchip/ddr2_timing.h | 65 ++++++ drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 2 +- drivers/gpio/pic32_gpio.c | 174 ++++++++++++++++ drivers/mmc/Kconfig | 6 + drivers/mmc/Makefile | 2 +- drivers/mmc/pic32_sdhci.c | 58 ++++++ drivers/mmc/sdhci.c | 7 + drivers/net/Kconfig | 8 + drivers/net/Makefile | 1 + drivers/net/phy/smsc.c | 10 + drivers/net/pic32_eth.c | 605 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/pic32_eth.h | 164 +++++++++++++++ drivers/net/pic32_mdio.c | 121 ++++++++++++ drivers/pinctrl/Kconfig | 10 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl_pic32.c | 363 ++++++++++++++++++++++++++++++++++ drivers/serial/Kconfig | 15 ++ drivers/serial/Makefile | 1 + drivers/serial/serial_pic32.c | 198 +++++++++++++++++++ include/configs/pic32mzdask.h | 168 ++++++++++++++++ include/dt-bindings/clock/microchip,clock.h | 29 +++ 57 files changed, 3705 insertions(+), 96 deletions(-) create mode 100644 arch/mips/dts/pic32mzda.dtsi create mode 100644 arch/mips/dts/pic32mzda_sk.dts delete mode 100644 arch/mips/lib/io.c create mode 100644 arch/mips/mach-pic32/Kconfig create mode 100644 arch/mips/mach-pic32/Makefile create mode 100644 arch/mips/mach-pic32/cpu.c create mode 100644 arch/mips/mach-pic32/include/mach/ddr.h create mode 100644 arch/mips/mach-pic32/include/mach/pic32.h create mode 100644 arch/mips/mach-pic32/lowlevel_init.S create mode 100644 arch/mips/mach-pic32/reset.c create mode 100644 board/microchip/pic32mzda/Kconfig create mode 100644 board/microchip/pic32mzda/MAINTAINERS create mode 100644 board/microchip/pic32mzda/Makefile create mode 100644 board/microchip/pic32mzda/README create mode 100644 board/microchip/pic32mzda/pic32mzda.c create mode 100644 configs/pic32mzdask_defconfig create mode 100644 doc/device-tree-bindings/clock/microchip,pic32-clock.txt create mode 100644 doc/device-tree-bindings/serial/microchip,pic32-uart.txt create mode 100644 drivers/clk/clk_pic32.c create mode 100644 drivers/ddr/microchip/Makefile create mode 100644 drivers/ddr/microchip/ddr2.c create mode 100644 drivers/ddr/microchip/ddr2_regs.h create mode 100644 drivers/ddr/microchip/ddr2_timing.h create mode 100644 drivers/gpio/pic32_gpio.c create mode 100644 drivers/mmc/pic32_sdhci.c create mode 100644 drivers/net/pic32_eth.c create mode 100644 drivers/net/pic32_eth.h create mode 100644 drivers/net/pic32_mdio.c create mode 100644 drivers/pinctrl/pinctrl_pic32.c create mode 100644 drivers/serial/serial_pic32.c create mode 100644 include/configs/pic32mzdask.h create mode 100644 include/dt-bindings/clock/microchip,clock.h

2 1

[U-Boot] [PATCH] mailmap: fix Ricardo's entry
by Masahiro Yamada 02 Feb '16

02 Feb '16

Commit df48b23428e9 (".mailmap: Add all the mail alias for Ricardo Ribalda") assigned two different proper names for the email address "ricardo.ribalda(a)uam.es". This is a completely wrong usage as the mailmap feature exists for coalescing together commits by the same person whose name is sometimes spelled differently. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- .mailmap | 1 - 1 file changed, 1 deletion(-) diff --git a/.mailmap b/.mailmap index f72fef1..5ea9f93 100644 --- a/.mailmap +++ b/.mailmap @@ -21,7 +21,6 @@ Jagan Teki <jagannadha.sutradharudu-teki(a)xilinx.com> Markus Klotzbuecher <mk(a)denx.de> Prabhakar Kushwaha <prabhakar(a)freescale.com> Rajeshwari Shinde <rajeshwari.s(a)samsung.com> -Ricardo Ribalda Delgado <ricardo.ribalda(a)uam.es> Ricardo Ribalda <ricardo.ribalda(a)uam.es> Ricardo Ribalda <ricardo.ribalda(a)gmail.com> Sandeep Paulraj <s-paulraj(a)ti.com> -- 1.9.1

2 2

[U-Boot] [PATCH] mmc: add missing prototype for mmc_get_env_dev
by Clemens Gruber 02 Feb '16

02 Feb '16

This is a follow-up patch to e92029c0f4 and adds a prototype for the weak mmc_get_env_dev function. Cc: Tom Rini <trini(a)konsulko.com> Cc: Stephen Warren <swarren(a)nvidia.com> Signed-off-by: Clemens Gruber <clemens.gruber(a)pqgruber.com> --- include/mmc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mmc.h b/include/mmc.h index 465daeb..d652c14 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -479,6 +479,7 @@ void board_mmc_power_init(void); int board_mmc_init(bd_t *bis); int cpu_mmc_init(bd_t *bis); int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); +int mmc_get_env_dev(void); struct pci_device_id; -- 2.7.0

3 3

[U-Boot] [PATCH] malloc: work around some memalign fragmentation issues
by Stephen Warren 02 Feb '16

02 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> Use of memalign can trigger fragmentation issues such as: // Internally, this needs to find a free block quite bit larger than s. // Once the free region is found, any unaligned "padding" immediately // before and after the block is marked free, so that the allocation // takes only s bytes (plus malloc header overhead). p = memalign(a, s); // If there's little fragmentation so far, this allocation is likely // located immediately after p. p2 = malloc(x); free(p); // In theory, this should return the same value for p. However, the hole // left by the free() call is only s in size (plus malloc header overhead) // whereas memalign searches for a larger block in order to guarantee it // can adjust the returned pointer to the alignment requirements. Hence, // the pointer returned, if any, won't be p. If there's little or no space // left after p2, this allocation will fail. p = memalign(a, s); In practice, this issue occurs when running the "dfu" command repeatedly on NVIDIA Tegra boards, since DFU allocates a large 32M data buffer, and then initializes the USB controller. If this is the first time USB has been used in the U-Boot session, this causes a probe of the USB driver, which causes various allocations, including a strdup() of a GPIO name when requesting the VBUS GPIO. When DFU is torn down, the USB driver is left probed, and hence its memory is left allocated. If "dfu" is executed again, allocation of the 32M data buffer fails as described above. In practice, there is a memory hole exactly large enough to hold the 32M data buffer than DFU needs. However, memalign() can't know that in a general way. Given that, it's particularly annoying that the allocation fails! The issue is that memalign() tries to allocate something larger to guarantee the ability to align the returned pointer. This patch modifies memalign() so that if the "general case" over-sized allocation fails, another allocation is attempted, of the exact size the user desired. If that allocation just happens to be aligned in the way the user wants, (and in the case described above, it will be, since the free memory region is located where a previous identical allocation was located), the pointer can be returned. This patch is somewhat related to 806bd245b1ab "dfu: don't keep freeing/reallocating". That patch worked around the issue by removing repeated free/memalign within a single execution of "dfu". However, the same technique can't be applied across multiple invocations, since there's no reason to keep the DFU buffer allocated while DFU isn't running. This patch addresses the root-cause a bit more directly. This problem highlights some of the disadvantages of dynamic allocation and deferred probing of devices. This patch isn't checkpatch-clean, since it conforms to the existing coding style in dlmalloc.c, which is different to the rest of U-Boot. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- common/dlmalloc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index b5bb05191c24..2b964d16b11e 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -2829,6 +2829,28 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; nb = request2size(bytes); m = (char*)(mALLOc(nb + alignment + MINSIZE)); + /* + * The attempt to over-allocate (with a size large enough to guarantee the + * ability to find an aligned region within allocated memory) failed. + * + * Try again, this time only allocating exactly the size the user wants. If + * the allocation now succeeds and just happens to be aligned, we can still + * fulfill the user's request. + */ + if (m == NULL) { + /* + * Use bytes not nb, since mALLOc internally calls request2size too, and + * each call increases the size to allocate, to account for the header. + */ + m = (char*)(mALLOc(bytes)); + /* Aligned -> return it */ + if ((((unsigned long)(m)) % alignment) == 0) + return m; + /* Otherwise, fail */ + fREe(m); + return NULL; + } + if (m == NULL) return NULL; /* propagate failure */ p = mem2chunk(m); -- 2.7.0

3 5

[U-Boot] [PATCH 00/14] EFI payload / application support v2
by Alexander Graf 02 Feb '16

02 Feb '16

This is my Christmas present for my openSUSE friends :). U-Boot is a great project for embedded devices. However, convincing everyone involved that only for "a few oddball ARM devices" we need to support different configuration formats from grub2 when all other platforms (PPC, System Z, x86) are standardized on a single format is a nightmare. So we started to explore alternatives. At first, people tried to get grub2 running using the u-boot api interface. However, FWIW that one doesn't support relocations, so you need to know where to link grub2 to at compile time. It also seems to be broken more often than not. And on top of it all, it's a one-off interface, so yet another thing to maintain. That led to a nifty idea. What if we can just implement the EFI application protocol on top of U-Boot? Then we could compile a single grub2 binary for uEFI based systems and U-Boot based systems and as soon as that one's loaded, everything looks and feels (almost) the same. This patch set is the result of pursuing this endeavor. - I am successfully able to run grub2 and Linux EFI binaries with this code. - When enabled, the resulting U-Boot binary only grows by ~10kb, so it's very light weight. - It works on 32bit ARM and AArch64. - All storage devices are directly accessible - No EFI variables - Removable media booting (search for /efi/boot/boota{a64,arm}.efi) Of course, there are still a few things one could do on top: - Improve disk media detection (don't scan, use what information we have) - Add EFI variable support using NVRAM - Add GFX support - Make EFI Shell work ;) - Network device support - Support for payload exit But so far, I'm very happy with the state of the patches. They completely eliminate potential arguments against U-Boot internally and give users the chance to run with the same level of comfort on all firmware types. Version 2 was successfully tested to boot grub2 and Linux from there on a HiKey (AArch64, dcache disabled) and on a BeagleBone Black. If you read this far and want to try out the patches, feel free to grab the source from git at: https://github.com/agraf/u-boot efi-v2 or just use the readily compiled version from https://build.opensuse.org/project/show/home:algraf:branches:Base:System v1 -> v2: - move memory allocation to separate patch - limit 32/64 to hosts that support it - check 32bit optional nt header magic - switch to GPLv2+ - Fix typo s/does now/does not/ - Add #ifdefs around header to allow inclusion when efi_loader is disabled - Add stub efi_restore_gd() function when efi_loader is disabled - Disable debug - Mark runtime region as such - Fix up memory map - Allow efi_restore_gd to be called before first efi entry - Add 32bit arm cache workaround - Move memory map to separate patch - Change BTS version to 2.5 - Fix return values for a few callbacks to more EFI compliant ones - Change vendor to "Das U-Boot" - Add warning when truncating timer trigger - Add runtime detach - Enable runtime relocations - Add get_time - Fix relocation - Fix 32bit - Add am335x support - Move section definition to header - Add systab to runtime section - Add self-relocation hook table - Relocate efi_runtime section early during bootup - Fix return values for a number of callbacks to be more UEFI compliant - Move to block_drvr array - Fix header order - Document efi block object struct - Use calloc rather than malloc & memset - Default to y - New patches: - disk/part.c: Expose list of available block drivers - arm64: Allow exceptions to return - arm64: Allow EFI payload code to take exceptions - efi_loader: Add DCACHE_OFF support for arm64 - efi_loader: Add distro boot script for removable media Alex Alexander Graf (14): disk/part.c: Expose list of available block drivers include/efi_api.h: Add more detailed API definitions efi_loader: Add PE image loader efi_loader: Add boot time services efi_loader: Add console interface efi_loader: Add runtime services efi_loader: Add disk interfaces efi_loader: Add "bootefi" command efi_loader: Implement memory allocation and map arm64: Allow exceptions to return arm64: Allow EFI payload code to take exceptions efi_loader: Add DCACHE_OFF support for arm64 efi_loader: hook up in build environment efi_loader: Add distro boot script for removable media arch/arm/config.mk | 4 + arch/arm/cpu/armv8/exceptions.S | 44 ++ arch/arm/cpu/armv8/u-boot.lds | 16 + arch/arm/cpu/u-boot.lds | 30 ++ arch/arm/lib/Makefile | 3 + arch/arm/lib/interrupts_64.c | 28 ++ arch/arm/lib/sections.c | 4 + arch/arm/lib/unaligned_64.c | 284 +++++++++++++ board/ti/am335x/u-boot.lds | 30 ++ common/Makefile | 1 + common/board_r.c | 4 + common/cmd_bootefi.c | 159 +++++++ disk/part.c | 7 +- include/config_distro_bootcmd.h | 47 ++- include/efi_api.h | 197 +++++++-- include/efi_loader.h | 90 ++++ include/part.h | 8 + include/pe.h | 263 ++++++++++++ lib/Kconfig | 1 + lib/Makefile | 1 + lib/efi_loader/Kconfig | 9 + lib/efi_loader/Makefile | 11 + lib/efi_loader/efi_boottime.c | 856 ++++++++++++++++++++++++++++++++++++++ lib/efi_loader/efi_console.c | 357 ++++++++++++++++ lib/efi_loader/efi_disk.c | 218 ++++++++++ lib/efi_loader/efi_image_loader.c | 202 +++++++++ lib/efi_loader/efi_runtime.c | 300 +++++++++++++ 27 files changed, 3130 insertions(+), 44 deletions(-) create mode 100644 arch/arm/lib/unaligned_64.c create mode 100644 common/cmd_bootefi.c create mode 100644 include/efi_loader.h create mode 100644 include/pe.h create mode 100644 lib/efi_loader/Kconfig create mode 100644 lib/efi_loader/Makefile create mode 100644 lib/efi_loader/efi_boottime.c create mode 100644 lib/efi_loader/efi_console.c create mode 100644 lib/efi_loader/efi_disk.c create mode 100644 lib/efi_loader/efi_image_loader.c create mode 100644 lib/efi_loader/efi_runtime.c -- 2.1.4

3 44

[U-Boot] [PATCH] arm: use common instructions applicable to armv7m & other arm archs
by Vikas Manocha 02 Feb '16

02 Feb '16

BIC instruction to clear the SP is not allowed in armv7m & is deprecated in ARMv6T2 & above. This patch cleans the code by using instructions allowed for armv7m as well as other Arm archs. Signed-off-by: Vikas Manocha <vikas.manocha(a)st.com> --- arch/arm/lib/crt0.S | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 2f4c14e..3731d0c 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -71,18 +71,12 @@ ENTRY(_main) */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) - ldr sp, =(CONFIG_SPL_STACK) + ldr r0, =(CONFIG_SPL_STACK) #else - ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) + ldr r0, =(CONFIG_SYS_INIT_SP_ADDR) #endif -#if defined(CONFIG_CPU_V7M) /* v7M forbids using SP as BIC destination */ - mov r3, sp - bic r3, r3, #7 - mov sp, r3 -#else - bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ -#endif - mov r0, sp + bic r0, r0, #7 /* 8-byte alignment for ABI compliance */ + mov sp, r0 bl board_init_f_alloc_reserve mov sp, r0 /* set up gd here, outside any C code */ @@ -100,14 +94,9 @@ ENTRY(_main) * 'here' but relocated. */ - ldr sp, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ -#if defined(CONFIG_CPU_V7M) /* v7M forbids using SP as BIC destination */ - mov r3, sp - bic r3, r3, #7 - mov sp, r3 -#else - bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ -#endif + ldr r0, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ + bic r0, r0, #7 + mov sp, r0 /* 8-byte alignment for ABI compliance */ ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ sub r9, r9, #GD_SIZE /* new GD is below bd */ -- 1.9.1

4 5