February 2015 - U-Boot

[U-Boot] [PATCH v3 0/25] tegra: Add eDP support for nyan-big
by Simon Glass 11 Feb '15

11 Feb '15

This series adds eDP support for nyan-big so that the display works. Nyan-big is based on tegra124. Some support is added for new clocks to make this work. The drm_dp_helper.h file is brought in from Linux since many of the DisplayPort constants are generic. A very simple uclass is added for DisplayPort, and the Tegra driver makes use of that. The U-Boot EDID support is enhanced to read some additional information (detailed timings). There is existing video support for Tegra20, but I don't think it works for Tegra30/114 (is this correct?). This series relies on detecting the display at run-time as I cannot find a good device tree binding for things like display depth. But if we could resolve that then it might be possible to move Tegra20 over to use the same driver, etc. There is clearly a lot in common with the display controllers - I have exploited this with the header file but not with the C file. HDMI is not supported at present. If this is easy and there is an existing driver to follow along with then I might be able to incorporate it later. This series is available at u-boot-dm/nyan-working Changes in v3: - Add full link training support - Change parameters of update_display_mode() - Fix 64-bit maths error - Fix trainging typo - Reorder parameters to tegra_dc_sor_attach() - Set scramble_ena to 1 on start-up so that link training succeeds - Simplify timouts to remove repeated multiplication by 1000 - Use real error return values in tegra_dc_dpaux_write_chunk() and others - Use sor pointer in struct tegra_dp_priv Changes in v2: - Rebase on top of u-boot-dm Simon Glass (25): dm: gpio: Add error handling and a function to claim vector GPIOs fdt: Add binding decode function for display-timings tegra: Move the pwm into tegra-common tegra: pwm: Allow the clock rate to be left as is tegra: Move checkboard() into the board code tegra: Add a board ID function power: Export register access functions from as3722 tegra: Provide a function to allow LCD PMIC setup tegra: Add support for setting up a as3722 PMIC tegra: nyan-big: Add LCD PMIC init and board ID tegra124: dts: Add host1x node to provide display information tegra: config: Use CONFIG_LCD to detect LCD presence tegra: clock: Add checking for invalid clock IDs tegra: clock: Split the clock source code into a separate function tegra124: clock: Add display clocks and functions tegra: Move display controller header into common video: Add drm_dp_helper.h edid: Add a function to read detailed monitor timings dm: video: Add a uclass for display port tegra: dts: nyan-big: Add definitions for eDP display tegra: video: Support serial output resource (SOR) on tegra124 tegra: video: Add Embedded DisplayPort driver tegra: video: support eDP displays on Tegra124 devices tegra: config: nyan-big: Enable LCD tegra124: video: Add full link training for eDP arch/arm/cpu/armv7/tegra-common/Makefile | 1 + arch/arm/cpu/armv7/{tegra20 => tegra-common}/pwm.c | 5 +- arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/display.c | 2 +- arch/arm/cpu/tegra-common/board.c | 8 - arch/arm/cpu/tegra-common/clock.c | 83 +- arch/arm/cpu/tegra124-common/clock.c | 141 +- arch/arm/dts/tegra124-nyan-big.dts | 47 + arch/arm/dts/tegra124.dtsi | 84 + arch/arm/include/asm/arch-tegra/clk_rst.h | 15 +- arch/arm/include/asm/arch-tegra/clock.h | 14 + .../include/asm/{arch-tegra20 => arch-tegra}/dc.h | 67 +- arch/arm/include/asm/arch-tegra/pwm.h | 60 + arch/arm/include/asm/arch-tegra/sys_proto.h | 19 +- arch/arm/include/asm/arch-tegra124/clock-tables.h | 3 +- arch/arm/include/asm/arch-tegra124/clock.h | 21 + arch/arm/include/asm/arch-tegra124/display.h | 58 + arch/arm/include/asm/arch-tegra124/pwm.h | 14 + arch/arm/include/asm/arch-tegra20/display.h | 2 +- arch/arm/include/asm/arch-tegra20/pwm.h | 54 +- board/nvidia/common/board.c | 40 +- board/nvidia/nyan-big/nyan-big.c | 34 +- common/edid.c | 105 ++ configs/nyan-big_defconfig | 2 + .../gpu/nvidia,tegra20-host1x.txt | 372 +++++ doc/device-tree-bindings/video/display-timing.txt | 110 ++ drivers/gpio/gpio-uclass.c | 38 +- drivers/power/as3722.c | 16 +- drivers/video/Kconfig | 15 + drivers/video/Makefile | 6 + drivers/video/dp-uclass.c | 34 + drivers/video/tegra124/Makefile | 10 + drivers/video/tegra124/display.c | 472 ++++++ drivers/video/tegra124/displayport.h | 412 +++++ drivers/video/tegra124/dp.c | 1599 ++++++++++++++++++++ drivers/video/tegra124/sor.c | 1019 +++++++++++++ drivers/video/tegra124/sor.h | 922 +++++++++++ drivers/video/tegra124/tegra124-lcd.c | 94 ++ include/asm-generic/gpio.h | 15 +- include/configs/nyan-big.h | 13 + include/configs/tegra-common-post.h | 2 +- include/displayport.h | 60 + include/dm/uclass-id.h | 1 + include/edid.h | 19 + include/fdtdec.h | 83 + include/linux/drm_dp_helper.h | 406 +++++ include/power/as3722.h | 3 + lib/fdtdec.c | 95 ++ 48 files changed, 6569 insertions(+), 127 deletions(-) rename arch/arm/cpu/armv7/{tegra20 => tegra-common}/pwm.c (95%) rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/dc.h (89%) create mode 100644 arch/arm/include/asm/arch-tegra/pwm.h create mode 100644 arch/arm/include/asm/arch-tegra124/display.h create mode 100644 arch/arm/include/asm/arch-tegra124/pwm.h create mode 100644 doc/device-tree-bindings/gpu/nvidia,tegra20-host1x.txt create mode 100644 doc/device-tree-bindings/video/display-timing.txt create mode 100644 drivers/video/dp-uclass.c create mode 100644 drivers/video/tegra124/Makefile create mode 100644 drivers/video/tegra124/display.c create mode 100644 drivers/video/tegra124/displayport.h create mode 100644 drivers/video/tegra124/dp.c create mode 100644 drivers/video/tegra124/sor.c create mode 100644 drivers/video/tegra124/sor.h create mode 100644 drivers/video/tegra124/tegra124-lcd.c create mode 100644 include/displayport.h create mode 100644 include/linux/drm_dp_helper.h -- 2.2.0.rc0.207.ga3a616c

1 25

[U-Boot] relocation on freescale mx35 doesn't work after update to 2015.01
by Priebe, Sebastian 11 Feb '15

11 Feb '15

Hello, I'm using a custom board with iMX35 CPU (ARM1136). After I updated to version 2015.01 the relocation doesn't work anymore. I turned on CONFIG_DEBUG and the last output I saw was: Relocating to 83f89000, new gd at 83e84ec8, sp at 83e84ea0 I recognized the new function "relocate_vectors". I copied the special handling (strong function) from mx25, which is just skipping the relocation of the vectors and with that the U-Boot is booting again on my board. Do I need some special handling for mx35, too? Does anyone have the same problem? Any advice? Thanks, Sebastian CADCON Ingenieurgesellschaft mbH & Co. KG Geschaeftsfuehrer: Robert Bauer, Andreas Gundel Sitz der Gesellschaft: D-86368 Gersthofen Registergericht: Amtsgericht Augsburg HRA 14521 [CADCON]

5 6

[U-Boot] [Q] Why does SPL use uImage load address as entry point?
by Phil Edworthy 11 Feb '15

11 Feb '15

Hi, I'm doing some work with U-Boot SPL, and noticed the following code in the spl_parse_image_header function (common/spl/spl.c): if (image_get_magic(header) == IH_MAGIC) { if (spl_image.flags & SPL_COPY_PAYLOAD_ONLY) { ... } else { spl_image.entry_point = image_get_load(header); /* Load including the header */ spl_image.load_addr = spl_image.entry_point - header_size; ... } Could anyone tell me why SPL uses the load address from the header as the entry point address, and then calculates the entry point, rather than just use the ones in the uImage header? Thanks Phil

1 0

[U-Boot] [PATCH v5 0/3] pmic:pfuze support buck regulator mode switch
by Peng Fan 11 Feb '15

11 Feb '15

This patch set is to support buck regulator can working in different switching modes. To improve system efficiency the buck regulators can operate in different switching modes. patch 1/3 is to add related bit definitions and registers. patch 2/3 is to implement the switching mode init function. patch 3/3 is to add related mode init function in board code. mx6slevk board is not included in this patch set, since power and i2c interface are not implemented for it. These patches are at: https://patchwork.ozlabs.org/patch/426961/ https://patchwork.ozlabs.org/patch/426962/ https://patchwork.ozlabs.org/patch/426963/ Added "Acked-by: Przemyslaw Marczak <p.marczak(a)samsung.com>" in this patch set. Added "Reviewed-by: Stefano Babic <sbabic(a)denx.de>" for patch 1/3. There is no major changes for this patch version. Only defined a macro SWITCH_SIZE to replace the constant in patch 2/3. Peng Fan (3): pmic:pfuz100 add switch mode and more registers pmic:pfuze implement pmic_mode_init imx:mx6 set normal APS and standby PFM mode board/freescale/common/pfuze.c | 37 ++++++++++++++++++ board/freescale/common/pfuze.h | 1 + board/freescale/mx6qsabreauto/mx6qsabreauto.c | 6 +++ board/freescale/mx6sabresd/mx6sabresd.c | 6 ++- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 6 ++- include/power/pfuze100_pmic.h | 55 +++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 2 deletions(-) -- 1.8.4

3 9

[U-Boot] [RFC/PATCH] tools: New 'spl-stackusage' script
by Siarhei Siamashka 11 Feb '15

11 Feb '15

This is a script, which tries to provide a pessimistic estimate of the stack usage in the SPL binary. A more detailed description about how it works and some example pictures are available in an earlier e-mail: http://lists.denx.de/pipermail/u-boot/2015-January/201713.html In fact, I have done nothing with it since that old status update and the code is still very much just at the proof of concept stage and can be only treated as a somewhat working prototype. It only supports 32-bit ARM so far. An example of trying it: 1. First compile u-boot for some ARM board. For example: make CROSS_COMPILE=arm-none-linux-gnueabi- Cubieboard_defconfig make CROSS_COMPILE=arm-none-linux-gnueabi- -j8 2. Run the script: tools/spl-stackusage/spl-stackusage 3. Look at the (slightly reformatted) output: Execution path with maximized stack usage (3152 bytes): entry > _main > board_init_f > board_init_r > spl_mmc_load_image > mmc_init > mmc_startup > mmc_switch.isra.1 > mmc_send_status > printf > puts > console_puts ? mmc_bread > mmc_set_blocklen > mmc_send_cmd ? sunxi_mmc_getcd > gpio_get_value > axp_gpio_get_value > axp209_read > i2c_read ? twsi_i2c_read > i2c_begin > twsi_wait > udelay > __udelay The '>' symbols indicate normal calls. The '?' symbols indicate a suspected indirect call. Now we can see that the 'console_puts ? mmc_bread' indirect call does not make any sense. So we can run the script again, now indicating that a call from 'console_puts' to 'mmc_bread' is impossible: 4. Run the script again as: tools/spl-stackusage/spl-stackusage \ remove_arrow[console_puts,mmc_bread] 5. Look at the new output: Execution path with maximized stack usage (3152 bytes): entry > _main > board_init_f > board_init_r > spl_mmc_load_image > mmc_init > mmc_startup > mmc_switch.isra.1 > mmc_send_status > printf > puts > console_puts ? sunxi_mmc_getcd > gpio_get_value > axp_gpio_get_value > axp209_read > i2c_read ? mmc_bread > mmc_set_blocklen > mmc_send_cmd ? twsi_i2c_read > i2c_begin > twsi_wait > udelay > __udelay Now it tries to guess that there is an indirect call from 'console_puts' to 'sunxi_mmc_getcd'. This also does not make sense. We add it to the black list too. And repreat the whole process iteratively. Eventually we end up with something like 6. Run the script as: tools/spl-stackusage/spl-stackusage \ remove_arrow[console_puts,mmc_bread] \ remove_arrow[console_puts,sunxi_mmc_getcd] \ remove_arrow[i2c_read,sunxi_mmc_set_ios] \ remove_arrow[console_puts,twsi_i2c_read] \ remove_arrow[i2c_read,mmc_bread] \ remove_arrow[serial_puts,mmc_bread] \ remove_arrow[serial_puts,sunxi_mmc_getcd] \ remove_arrow[console_puts,twsi_i2c_write] \ remove_arrow[console_puts,sunxi_mmc_send_cmd] \ remove_arrow[console_puts,twsi_i2c_probe] \ remove_arrow[serial_puts,twsi_i2c_read] \ remove_arrow[console_puts,twsi_i2c_init] \ remove_arrow[serial_puts,twsi_i2c_write] \ remove_arrow[serial_puts,sunxi_mmc_send_cmd] \ remove_arrow[serial_puts,twsi_i2c_probe] \ remove_arrow[console_puts,sunxi_mmc_set_ios] \ remove_arrow[serial_puts,twsi_i2c_init] 7. And look at the final report: Execution path with maximized stack usage (3064 bytes): entry > _main > board_init_f > board_init_r > spl_mmc_load_image > mmc_init > mmc_startup > mmc_set_clock > mmc_set_ios ? mmc_bread > mmc_set_blocklen > mmc_send_cmd ? sunxi_mmc_getcd > gpio_get_value > axp_gpio_get_value > axp209_read > i2c_read > i2c_get_adapter > printf > vsprintf > vsnprintf_internal.isra.6 > number.isra.4 > put_dec > __div64_32 > __aeabi_uidiv > __aeabi_idiv0 The process of blacklisting impossible caller->callee pairs made the stack usage report less pessimistic (from 3152 to 3064 bytes) and the execution path makes a little bit more sense. But that's the whole point. Even the initial stack usage number is supposed to be usable, because it is just overestimating the stack usage and should never underestimate it (unless confused by tricks in the assembly code). Also there is a 'spl-stackusage.png' file with the whole callgraph generated by the graphviz 'dot' tool. It may looks like this (a different picture, not generated by following the steps above): http://people.freedesktop.org/~siamashka/files/20150116-spl-stackgraph/spl-… This is surely not intended to be pushed as-is yet. And still needs some cleanups. However I would like to get some feedback, just to get a better sense of direction where it should be moving. Also, formally, the merge window is still open. So, I guess, this tool might have a very slim theoretical chance to get into v2015.04 :-) --- tools/spl-stackusage/spl-stackusage | 1 + tools/spl-stackusage/spl-stackusage.rb | 471 +++++++++++++++++++++++++++++++++ 2 files changed, 472 insertions(+) create mode 120000 tools/spl-stackusage/spl-stackusage create mode 100755 tools/spl-stackusage/spl-stackusage.rb diff --git a/tools/spl-stackusage/spl-stackusage b/tools/spl-stackusage/spl-stackusage new file mode 120000 index 0000000..eb10b9e --- /dev/null +++ b/tools/spl-stackusage/spl-stackusage @@ -0,0 +1 @@ +spl-stackusage.rb \ No newline at end of file diff --git a/tools/spl-stackusage/spl-stackusage.rb b/tools/spl-stackusage/spl-stackusage.rb new file mode 100755 index 0000000..a135d6c --- /dev/null +++ b/tools/spl-stackusage/spl-stackusage.rb @@ -0,0 +1,471 @@ +#!/usr/bin/env ruby +# +# Copyright © 2015 Siarhei Siamashka <siarhei.siamashka(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +############################################################################### +# This is a u-boot SPL stack usage analysis script. Needs to be run # +# from the root of the u-boot source tree after a successful SPL build. # +# # +# Produces 'spl-stackusage.png' file as the output. # +############################################################################### + +require 'find' + +############################################################################### +# Process command line arguments +# +# add_node[node_name, stack_usage] +# remove_node[node_name, stack_usage] +# add_arrow[node_name1, node_name2] +# remove_arrow[node_name1, node_name2] +# +############################################################################### + +$removed_arrows = {} + +ARGV.each {|a| + a.split(";").each {|a| + if a =~ /remove_arrow[$\[]\s*(\S+)\s*\,\s*(\S+)\s*[$\]]/ + $removed_arrows[[$1, $2]] = 1 + end + } +} + +############################################################################### + +if !File.directory?("spl") + abort("Error: can't find the 'spl' directory.\n" + + "Please ensure that you are in the root of the u-boot source tree.\n") +end + +def tool_exists(tool_name) + `which #{tool_name} > /dev/null 2>&1` + return $?.to_i == 0 +end + +if !tool_exists("dot") + abort("Please install the graphviz dot tool.\n") +end + +############################################################################### +# Get objdump log # +############################################################################### + +# Get the information from the environment +$toolchain = ENV["CROSS_COMPILE"] + +# Try to guess the ARM toolchain automatically +if !$toolchain && `file spl/u-boot-spl` =~ / ARM, / + toolchain_list = [ + "arm-none-linux-gnueabi-", + "armv7a-hardfloat-linux-gnueabi-", + "arm-linux-gnueabihf-" + ] + toolchain_list.each {|toolchain| + if tool_exists("#{toolchain}objdump") + $toolchain = toolchain + break + end + } +end + +if !$toolchain + abort("Error: can't find a usable toolchain.\n" + + "Try to set the CROSS_COMPILE environment variable.\n") +end + +$objdump_dis_log = `#{$toolchain}objdump -d -M reg-names-raw spl/u-boot-spl` +$objdump_sym_log = `#{$toolchain}objdump -t spl/u-boot-spl` +$size_log = `#{$toolchain}size spl/u-boot-spl` + +File.open("spl-stackusage.dis", "w").write($objdump_dis_log) +File.open("spl-stackusage.sym", "w").write($objdump_sym_log) + +############################################################################### +# Read the *.su files (generated by GCC with '-fstack-usage' option) # +############################################################################### + +$dynamic_stack_size = {} +$self_stack_size = {} +$total_stack_size = {} + +Find.find("spl") { |filename| + next unless filename =~ /.*\.su$/ + File.open(filename).each_line {|l| + if l =~ /\:([^\:\s]+)\s+(\d+)\s+(\S+)$/ + case $3 + when "dynamic" + $dynamic_stack_size[$1] = true + when "static" + $self_stack_size[$1] = [$2.to_i, ($self_stack_size[$1] || 0)].max + else + abort("Unsupported stack usage type #{$3} in #{filename}\n") + end + end + } +} + +if $self_stack_size.size == 0 + abort("Error: could not load anything from *.su files in 'spl' directory.\n" + + "Please ensure that you are using '-fstack-usage' GCC option.\n") +end + +############################################################################### +# Parse the objdump log # +############################################################################### + +$detected_cycles = {} +$labels = {} +$arrows = {} +$functions = {} +$func_code = {} +$datastructs = {} +$refs = {} +$xrefs = {} +$max_stack_size = 0 +$critical_path = {} +$shortest_cycle = nil +$indirect_targets = {} +$indirect_sources = {} +$blue_arrows = {} + +# Stack usage, based on inspecting disassembly listing in objdump log +def guess_func_stack_usage(func_name) + func_code = $func_code[func_name] + if !func_code + printf("No function code for '%s'\n", func_name) + return nil + end + stack_usage = 0 + func_code.each_line { |l| + # 'push {reglist}' instruction + if l =~ /push\s+\{\s*(.*?)\s*\}/ + reglist = $1.split(",") + abort("Register ranges are not supported") if $1 =~ /\-/ + stack_usage += reglist.size * 4 + end + # 'sub sp, sp, #imm' instruction + if l =~ /sub\s+r13\s*\,\s*(r13\s*)\,\s*\#(\d+)/ + stack_usage += $2.to_i + end + } + return stack_usage +end + +# Stack usage, based on parsing *.su files +def get_func_stack_usage(func_name) + stack_usage = $self_stack_size[func_name] + stack_usage = guess_func_stack_usage(func_name) if !stack_usage + return stack_usage +end + +$objdump_sym_log.each_line {|l| + # 000034c8 l F .text 000000c8 twsi_i2c_read + next unless l =~ /^(\h+)\s+\S+\s+(\S+)\s+(\.\S+)\s+\h+.*?\s+(\S+)\s*$/ + addr = $1 + type = $2 + sect = $3 + name = $4 + if type == "F" && sect == ".text" + $functions[name] = addr.to_i(16) + else + $datastructs[name] = addr.to_i(16) + end +} + +$functions.each { |func, _| + if $dynamic_stack_size.has_key?(func) + abort("dynamic stack size in #{func}") + end +} + +Find.find("spl") { |filename| + next unless filename =~ /.*\.o$/ + skipflag = false + current_section = "" + `#{$toolchain}objdump -r #{filename}`.each_line {|l| + if l =~ /RELOCATION RECORDS FOR/ + if l =~ /\[\.text\.(.*?)\]/ + skipflag = !$functions.has_key?($1) + elsif l =~ /\[\.(data|rodata)\.(.*?)\]/ + skipflag = !$datastructs.has_key?($2) + else + skipflag = false + end + end + + next if skipflag + + if l =~ /(\S+)\s+(\S+)\s+(\S+)/ + reltype = $2 + name = $3 + next if !$functions.has_key?(name) + next if reltype == "R_ARM_CALL" || reltype == "R_ARM_JUMP24" + next if reltype == "R_ARM_THM_CALL" || reltype == "R_ARM_THM_JUMP24" + $indirect_targets[name] = 1 + end + } +} + +def add_ref(current_func, func_name) + return if $removed_arrows.has_key?([current_func, func_name]) + + $arrows[[current_func, func_name]] = 1 + $refs[current_func] = {} if !$refs.has_key?(current_func) + $refs[func_name] = {} if !$refs.has_key?(func_name) + $refs[current_func][func_name] = true + + $xrefs[current_func] = {} if !$xrefs.has_key?(current_func) + $xrefs[func_name] = {} if !$xrefs.has_key?(func_name) + $xrefs[func_name][current_func] = true +end + +# First pass, collect local aliases +current_func = "entry" +current_label = "entry" +$label_to_func_mapping = {} +$objdump_dis_log.each_line {|l| + current_label = $1 if l =~ /^\h+\s+\<(.*?)>\:$/ + current_func = $1 if l =~ /^\h+\s+\<(.*?)>\:$/ && $functions.has_key?($1) + $label_to_func_mapping[current_label] = current_func +} + +current_func = "entry" +$objdump_dis_log.each_line {|l| + current_func = $1 if l =~ /^\h+\s+\<(.*?)>\:$/ && $functions.has_key?($1) + if l =~ /(.*?)\<(.*?)(\+0x\h+)?\>/ + target_func = $label_to_func_mapping[$2] + add_ref(current_func, target_func) if target_func != current_func + end + if l =~ /\s+blx?\s+r/ + $indirect_sources[current_func] = 1 + end + if l =~ /\s+bx?\s+r/ && !(l =~ /\s+bx?\s+r14/) + $indirect_sources[current_func] = 1 + end + $func_code[current_func] = "" unless $func_code.has_key?(current_func) + $func_code[current_func] << sprintf("%s\n", l.strip) +} + +############################################################################### +# Handle indirect calls # +############################################################################### + +$functions["<indirect-call>"] = 1 +$self_stack_size["<indirect-call>"] = 0 + +$multiplexed_indirect_sources = $indirect_sources.clone +$multiplexed_indirect_targets = $indirect_targets.clone + +# A function can't indirectly call itself (that would be a recursion) +$indirect_sources.each {|src, _| + $removed_arrows[[src, src]] = 1 +} +# A function can't indirectly call its caller (that would be a recursion) +$refs.each {|src, dst_list| + dst_list.each {|dst, _| + $removed_arrows[[dst, src]] = 1 + } +} + +def impossible_indirect_call(bad_src, bad_dst) + return unless $multiplexed_indirect_sources.has_key?(bad_src) + return unless $multiplexed_indirect_targets.has_key?(bad_dst) + + if $multiplexed_indirect_sources.size < $multiplexed_indirect_targets.size + $multiplexed_indirect_sources.delete(bad_src) + $multiplexed_indirect_targets.each {|dst, _| + next if dst == bad_dst + newarrow = [bad_src, dst] + if !($removed_arrows.has_key?(newarrow)) + add_ref(newarrow[0], newarrow[1]) + $blue_arrows[newarrow] = 1 + end + } + else + $multiplexed_indirect_targets.delete(bad_dst) + $multiplexed_indirect_sources.each {|src, _| + next if src == bad_src + newarrow = [src, bad_dst] + if !($removed_arrows.has_key?(newarrow)) + add_ref(newarrow[0], newarrow[1]) + $blue_arrows[newarrow] = 1 + end + } + end +end + +$removed_arrows.each {|k, _| + impossible_indirect_call(k[0], k[1]) +} + +$multiplexed_indirect_sources.each {|src, _| + newarrow = [src, "<indirect-call>"] + add_ref(newarrow[0], newarrow[1]) + $blue_arrows[newarrow] = 1 +} + +$multiplexed_indirect_targets.each {|dst, _| + newarrow = ["<indirect-call>", dst] + add_ref(newarrow[0], newarrow[1]) + $blue_arrows[newarrow] = 1 +} + +############################################################################### + +def recursive_walk(node, visited_nodes, depth, total_stack) + $total_stack_size[node] = [total_stack, ($total_stack_size[node] || 0)].max + if $total_stack_size[node] > $max_stack_size + $critical_path = visited_nodes.clone + $max_stack_size = $total_stack_size[node] + end + $refs[node].each {|next_node, _| + func_stack = get_func_stack_usage(next_node) + if visited_nodes.has_key?(next_node) then + # Find shortest cycle + tmp = visited_nodes.sort {|a, b| a[1] <=> b[1]}.map {|a| a[0]} + idx = tmp.find_index(next_node) + tmp = tmp.slice(idx, tmp.size - idx) + $shortest_cycle = tmp if !$shortest_cycle + $shortest_cycle = tmp if tmp.size < $shortest_cycle.size + $detected_cycles[[node, next_node]] = 1 + next + end + visited_nodes[next_node] = depth if next_node != "<indirect-call>" + recursive_walk(next_node, visited_nodes, depth + 1, + total_stack + func_stack) + visited_nodes.delete(next_node) + } +end + +# Find the 'root' nodes and recursively traverse the graph starting from them +$xrefs.each {|func_name, nodes| + next if nodes.size != 0 + visited_nodes = {} + depth = 0 + visited_nodes[func_name] = depth + recursive_walk(func_name, visited_nodes, depth + 1, + get_func_stack_usage(func_name)) +} + +############################################################################### +# Generate .dot file for graphviz # +############################################################################### + +$legend = "" +$max_stack_size = $total_stack_size.map { |k, v| v }.max + +def format_path_arr(path_arr) + result = "" + (path_arr + [path_arr[0]]).each_cons(2) { |a| + normal_call = $refs[a[0]].has_key?(a[1]) && + !$blue_arrows.has_key?([a[0], a[1]]) + indirect_call = ($refs[a[0]].has_key?("<indirect-call>") && + $refs["<indirect-call>"].has_key?(a[1])) || + $blue_arrows.has_key?([a[0], a[1]]) + if normal_call + result << sprintf("%s > ", a[0]) + elsif indirect_call + result << sprintf("%s ? ", a[0]) + else + result << sprintf("%s ! ", a[0]) + end + } + return result + path_arr[0] +end + +if $size_log =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\h+)\s+spl\/u\-boot\-spl/ + text_plus_data_size = $1.to_i + $2.to_i + bss_size = $3.to_i + + $legend << sprintf("------------ u-boot SPL ------------\\l") + $legend << sprintf("text+data = %5d bytes\\l", text_plus_data_size) + $legend << sprintf("bss = %5d bytes\\l", bss_size) + $legend << sprintf("stack usage = %5d bytes\\l", $max_stack_size) +end + +if $detected_cycles.size != 0 + $legend << sprintf("--------------------------------------\\l") + $legend << sprintf("Warning, recursion suspected:\\l\\\"%s\\\"\\l", + format_path_arr($shortest_cycle)) + $legend << sprintf("\\lWhere:") + $legend << sprintf("\\l '>' - means normal function call") + $legend << sprintf("\\l '?' - indirect call (via a pointer)\\l") + $legend << sprintf("\\lBlue arrows highlight possible indirect calls") + $legend << sprintf("\\lgoing through a fake multiplexer node. Red") + $legend << sprintf("\\larrows highlight possible cases of recursion") + $legend << sprintf("\\lon the callgraph. Recursion is bad because it") + $legend << sprintf("\\lmakes stack usage estimation unpredictable.\\l") + $legend << sprintf("\\lThe recursion warnings can be eliminated by:") + $legend << sprintf("\\l 1) Fixing the SPL code if it is really broken.") + $legend << sprintf("\\l 2) Incorrectly guessed indirect calls can") + $legend << sprintf("\\l be suppressed by using one or more") + $legend << sprintf("\\l 'remove_arrow[caller,callee]' command") + $legend << sprintf("\\l line arguments passed to the script.\\l") + $legend << sprintf("\\lThe nodes on the execution path with maximized") + $legend << sprintf("\\lstack usage are orange colored.\\l") +end + +fh = File.open("spl-stackusage.dot", "w") + +$refs.each {|func_name, nodes| + $labels[func_name] = sprintf("%s\\n[total=%d, self=%d]", + func_name, + $total_stack_size[func_name], + get_func_stack_usage(func_name)) +} + +fh.printf("digraph graphname {\n") +fh.printf("rankdir=LR;\n") +fh.printf("node [shape=box,fontname=helvetica];\n") + +$total_stack_size.each { |k, v| + extra = "" + shape = "box" + shape = "octagon" if $indirect_sources.has_key?(k) + shape = "doubleoctagon" if $indirect_targets.has_key?(k) + if $critical_path.has_key?(k) + extra = ",style=filled,fillcolor=orange,group=main" + end + if k == "<indirect-call>" + shape = "oval" + extra = ",style=filled,fillcolor=lightblue" + end + fh.printf("\"%s\" [shape=#{shape}#{extra}];\n", $labels[k]) +} + +$arrows.each {|k, v| + if $detected_cycles.has_key?(k) then + fh.printf("\"%s\" -> \"%s\" [color=\"red\",penwidth=3];\n", + $labels[k[0]], $labels[k[1]]) + elsif $blue_arrows.has_key?(k) then + fh.printf("\"%s\" -> \"%s\" [color=blue];\n", + $labels[k[0]], $labels[k[1]]) + else + fh.printf("\"%s\" -> \"%s\";\n", $labels[k[0]], $labels[k[1]]) + end +} +fh.printf("legend [shape=box,style=filled,fontname=monospace,fontsize=24," + + "color=\"lightgray\",label=\"#{$legend}\"];\n") +fh.printf("}\n") +fh.close + +printf("Execution path with maximized stack usage (%d bytes):\n%s\n", + $max_stack_size, + format_path_arr($critical_path.invert.sort.map { |a| a[1] })) + +`dot -Tpng -o spl-stackusage.png spl-stackusage.dot` -- 2.0.5

2 3

[U-Boot] [PATCH 0/3] sunxi: dram: More flexible dram for sun[457]i
by Siarhei Siamashka 11 Feb '15

11 Feb '15

In a nutshell, this patchset allows to use Kconfig capabilities of the current u-boot code to reproduce the old Cubietruck demo, which showcased reclocking DRAM from 432MHz to 600MHz (the old 'highspeedtruck' branch): http://lists.denx.de/pipermail/u-boot/2014-July/183981.html But now only a special customized Cubietruck defconfig is sufficient, and there is no need to patch the u-boot source code anymore. Siarhei Siamashka (3): sunxi: dram: Optionally use standard JEDEC timings for sun[457]i sunxi: dram: Support more sun[457]i dram parameters in Kconfig sunxi: dram: Allow to configure vdd-dll voltage on sun[457]i arch/arm/include/asm/arch-sunxi/dram.h | 1 + arch/arm/include/asm/arch-sunxi/dram_sun4i.h | 1 + board/sunxi/Kconfig | 83 +++++++++++ board/sunxi/board.c | 10 +- board/sunxi/dram_sun4i_auto.c | 20 ++- board/sunxi/dram_sun5i_auto.c | 20 ++- board/sunxi/dram_timings_sun4i.h | 205 +++++++++++++++++++++++++++ 7 files changed, 332 insertions(+), 8 deletions(-) create mode 100644 board/sunxi/dram_timings_sun4i.h -- 2.0.5

2 6

[U-Boot] [PATCH 1/5] nand: Add verification functions
by Peter Tyser 11 Feb '15

11 Feb '15

Add nand_verify() and nand_verify_page_oob(). nand_verify() verifies NAND contents against an arbitrarily sized buffer using ECC while nand_verify_page_oob() verifies a NAND page's contents and OOB. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- drivers/mtd/nand/nand_util.c | 97 +++++++++++++++++++++++++++++++++++++++++++- include/nand.h | 4 ++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index afdd160..f487756 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -464,6 +464,87 @@ static size_t drop_ffs(const nand_info_t *nand, const u_char *buf, #endif /** + * nand_verify_page_oob: + * + * Verify a page of NAND flash, including the OOB. + * Reads page of NAND and verifies the contents and OOB against the + * values in ops. + * + * @param nand NAND device + * @param ops MTD operations, including data to verify + * @param ofs offset in flash + * @return 0 in case of success + */ +int nand_verify_page_oob(nand_info_t *nand, struct mtd_oob_ops *ops, loff_t ofs) +{ + int rval; + struct mtd_oob_ops vops; + size_t verlen = nand->writesize + nand->oobsize; + + memcpy(&vops, ops, sizeof(vops)); + + vops.datbuf = malloc(verlen); + + if (!vops.datbuf) + return -ENOMEM; + + vops.oobbuf = vops.datbuf + nand->writesize; + + rval = mtd_read_oob(nand, ofs, &vops); + if (!rval) + rval = memcmp(ops->datbuf, vops.datbuf, vops.len); + if (!rval) + rval = memcmp(ops->oobbuf, vops.oobbuf, vops.ooblen); + + free(vops.datbuf); + + return rval ? -EIO : 0; +} + +/** + * nand_verify: + * + * Verify a region of NAND flash. + * Reads NAND in page-sized chunks and verifies the contents against + * the contents of a buffer. The offset into the NAND must be + * page-aligned, and the function doesn't handle skipping bad blocks. + * + * @param nand NAND device + * @param ofs offset in flash + * @param len buffer length + * @param buf buffer to read from + * @return 0 in case of success + */ +int nand_verify(nand_info_t *nand, loff_t ofs, size_t len, u_char *buf) +{ + int rval = 0; + size_t verofs; + size_t verlen = nand->writesize; + uint8_t *verbuf = malloc(verlen); + + if (!verbuf) + return -ENOMEM; + + /* Read the NAND back in page-size groups to limit malloc size */ + for (verofs = ofs; verofs < ofs + len; + verofs += verlen, buf += verlen) { + verlen = min(nand->writesize, (uint32_t)(ofs + len - verofs)); + rval = nand_read(nand, verofs, &verlen, verbuf); + if (!rval || (rval == -EUCLEAN)) + rval = memcmp(buf, verbuf, verlen); + + if (rval) + break; + } + + free(verbuf); + + return rval ? -EIO : 0; +} + + + +/** * nand_write_skip_bad: * * Write image to NAND flash. @@ -501,7 +582,7 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, #ifdef CONFIG_CMD_NAND_YAFFS if (flags & WITH_YAFFS_OOB) { - if (flags & ~WITH_YAFFS_OOB) + if (flags & (~WITH_YAFFS_OOB & ~WITH_WR_VERIFY)) return -EINVAL; int pages; @@ -554,6 +635,10 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, if (!need_skip && !(flags & WITH_DROP_FFS)) { rval = nand_write(nand, offset, length, buffer); + + if ((flags & WITH_WR_VERIFY) && !rval) + rval = nand_verify(nand, offset, *length, buffer); + if (rval == 0) return 0; @@ -601,6 +686,11 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, ops.oobbuf = ops.datbuf + pagesize; rval = mtd_write_oob(nand, offset, &ops); + + if ((flags & WITH_WR_VERIFY) && !rval) + rval = nand_verify_page_oob(nand, + &ops, offset); + if (rval != 0) break; @@ -620,6 +710,11 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, rval = nand_write(nand, offset, &truncated_write_size, p_buffer); + + if ((flags & WITH_WR_VERIFY) && !rval) + rval = nand_verify(nand, offset, + truncated_write_size, p_buffer); + offset += write_size; p_buffer += write_size; } diff --git a/include/nand.h b/include/nand.h index 15e31ab..49a05dc 100644 --- a/include/nand.h +++ b/include/nand.h @@ -134,11 +134,15 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, * is a 'mode' meaning it cannot be mixed with * other flags */ #define WITH_DROP_FFS (1 << 1) /* drop trailing all-0xff pages */ +#define WITH_WR_VERIFY (1 << 2) /* verify data was written correctly */ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, size_t *actual, loff_t lim, u_char *buffer, int flags); int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts); int nand_torture(nand_info_t *nand, loff_t offset); +int nand_verify_page_oob(nand_info_t *nand, struct mtd_oob_ops *ops, + loff_t ofs); +int nand_verify(nand_info_t *nand, loff_t ofs, size_t len, u_char *buf); #define NAND_LOCK_STATUS_TIGHT 0x01 #define NAND_LOCK_STATUS_UNLOCK 0x04 -- 1.9.1

3 9

[U-Boot] [PATCH v2 1/3] arm: Allow lr to be saved by board code
by Simon Glass 11 Feb '15

11 Feb '15

The link register value can be required on some boards (e.g. FEL mode on sunxi) so use a branch instruction to jump to save_boot_params() instead of a branch link. This requires a branch back to save_boot_params_ret so adjust the users to deal with this. For exynos just drop the function since it doesn't do anything. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Change save_boot_params() to not use lr for return - Fix up existing save_boot_params() functions for new API arch/arm/cpu/armv7/exynos/spl_boot.c | 1 - arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/start.S | 7 +++++-- arch/arm/include/asm/system.h | 15 +++++++++++++++ board/nokia/rx51/lowlevel_init.S | 3 ++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/cpu/armv7/exynos/spl_boot.c index bc237c9..c7f943e 100644 --- a/arch/arm/cpu/armv7/exynos/spl_boot.c +++ b/arch/arm/cpu/armv7/exynos/spl_boot.c @@ -309,4 +309,3 @@ void board_init_r(gd_t *id, ulong dest_addr) while (1) ; } -void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) {} diff --git a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S index 86c0e42..e19c7ae 100644 --- a/arch/arm/cpu/armv7/omap-common/lowlevel_init.S +++ b/arch/arm/cpu/armv7/omap-common/lowlevel_init.S @@ -19,7 +19,7 @@ ENTRY(save_boot_params) ldr r1, =OMAP_SRAM_SCRATCH_BOOT_PARAMS str r0, [r1] - bx lr + b save_boot_params_ret ENDPROC(save_boot_params) ENTRY(set_pl310_ctrl_reg) diff --git a/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S index 78577b1..80cb263 100644 --- a/arch/arm/cpu/armv7/omap3/lowlevel_init.S +++ b/arch/arm/cpu/armv7/omap3/lowlevel_init.S @@ -23,7 +23,7 @@ ENTRY(save_boot_params) ldr r5, [r0, #0x4] and r5, r5, #0xff str r5, [r4] - bx lr + b save_boot_params_ret ENDPROC(save_boot_params) #endif diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 70048c1..9b49ece 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -31,9 +31,12 @@ *************************************************************************/ .globl reset + .globl save_boot_params_ret reset: - bl save_boot_params + /* Allow the board to save important registers */ + b save_boot_params +save_boot_params_ret: /* * disable interrupts (FIQ and IRQ), also set the cpu to SVC32 mode, * except if in HYP mode already @@ -96,7 +99,7 @@ ENDPROC(c_runtime_cpu_setup) * *************************************************************************/ ENTRY(save_boot_params) - bx lr @ back to my caller + b save_boot_params_ret @ back to my caller ENDPROC(save_boot_params) .weak save_boot_params diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 89f2294..7820486 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -142,6 +142,21 @@ void flush_l3_cache(void); #ifndef __ASSEMBLY__ +/** + * save_boot_params() - Save boot parameters before starting reset sequence + * + * If you provide this function it will be called immediately U-Boot starts, + * both for SPL and U-Boot proper. + * + * All registers are unchanged from U-Boot entry. No registers need be + * preserved. + * + * This is not a normal C function. There is no stack. Return by branching to + * save_boot_params_ret. + * + * void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3); + */ + #define isb() __asm__ __volatile__ ("" : : : "memory") #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t"); diff --git a/board/nokia/rx51/lowlevel_init.S b/board/nokia/rx51/lowlevel_init.S index e252909..9d4ea1b 100644 --- a/board/nokia/rx51/lowlevel_init.S +++ b/board/nokia/rx51/lowlevel_init.S @@ -37,7 +37,8 @@ ih_magic: /* IH_MAGIC in big endian from include/image.h */ .global save_boot_params save_boot_params: - + /* Get return address */ + ldr lr, =save_boot_params_ret /* Copy valid attached kernel to address KERNEL_ADDRESS */ -- 2.2.0.rc0.207.ga3a616c

3 11

[U-Boot] [PATCH 1/3] bcm2835/rpi: add SPDX license tags for some files
by Stephen Warren 11 Feb '15

11 Feb '15

Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- arch/arm/cpu/arm1176/bcm2835/Makefile | 12 ++---------- arch/arm/include/asm/arch-bcm2835/sdhci.h | 12 +----------- arch/arm/include/asm/arch-bcm2835/timer.h | 12 +----------- arch/arm/include/asm/arch-bcm2835/wdog.h | 12 +----------- board/raspberrypi/rpi/Makefile | 12 ++---------- board/raspberrypi/rpi/rpi.c | 12 +----------- include/configs/rpi.h | 12 +----------- 7 files changed, 9 insertions(+), 75 deletions(-) diff --git a/arch/arm/cpu/arm1176/bcm2835/Makefile b/arch/arm/cpu/arm1176/bcm2835/Makefile index 0ad36906dfc5..7e5dbe1fdeaf 100644 --- a/arch/arm/cpu/arm1176/bcm2835/Makefile +++ b/arch/arm/cpu/arm1176/bcm2835/Makefile @@ -1,15 +1,7 @@ # -# See file CREDITS for list of people who contributed to this -# project. +# (C) Copyright 2012 Stephen Warren # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0 # obj-y := lowlevel_init.o diff --git a/arch/arm/include/asm/arch-bcm2835/sdhci.h b/arch/arm/include/asm/arch-bcm2835/sdhci.h index a4f867b2e9a4..da4d5cd5a88f 100644 --- a/arch/arm/include/asm/arch-bcm2835/sdhci.h +++ b/arch/arm/include/asm/arch-bcm2835/sdhci.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_SDHCI_H_ diff --git a/arch/arm/include/asm/arch-bcm2835/timer.h b/arch/arm/include/asm/arch-bcm2835/timer.h index c2001b6f932a..2d7cfe5c56f8 100644 --- a/arch/arm/include/asm/arch-bcm2835/timer.h +++ b/arch/arm/include/asm/arch-bcm2835/timer.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_TIMER_H diff --git a/arch/arm/include/asm/arch-bcm2835/wdog.h b/arch/arm/include/asm/arch-bcm2835/wdog.h index 303a65f32e08..f369ab589c9a 100644 --- a/arch/arm/include/asm/arch-bcm2835/wdog.h +++ b/arch/arm/include/asm/arch-bcm2835/wdog.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BCM2835_TIMER_H diff --git a/board/raspberrypi/rpi/Makefile b/board/raspberrypi/rpi/Makefile index c53c92b1ddb7..4ce2c983b382 100644 --- a/board/raspberrypi/rpi/Makefile +++ b/board/raspberrypi/rpi/Makefile @@ -1,15 +1,7 @@ # -# See file CREDITS for list of people who contributed to this -# project. +# (C) Copyright 2012 Stephen Warren # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0 # obj-y := rpi.o diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index c18271fce823..2185b1bd029a 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -1,17 +1,7 @@ /* * (C) Copyright 2012-2013 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c94f4112026e..7075e3df7f89 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -1,17 +1,7 @@ /* * (C) Copyright 2012 Stephen Warren * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * SPDX-License-Identifier: GPL-2.0 */ #ifndef __CONFIG_H -- 1.9.1

3 6

[U-Boot] [PATCH sunxi-tools v2 0/2] Support unified u-boot SPL for SD cards and FEL mode
by Siarhei Siamashka 11 Feb '15

11 Feb '15

An updated variant of the older patch http://lists.denx.de/pipermail/u-boot/2015-February/204024.html These patches are not for the u-boot code (unless u-boot decides to cannibalize the 'fel' tool later) but still provide a glue layer between the Allwinner BROM code and the u-boot SPL code. And need to play nice with both of them. The updated 'fel' tool is supposed to be used together with u-boot v2015.04 and provide support for booting regular u-boot SPL binaries over USB via FEL mode. So that a special u-boot sunxi FEL configuration can be eventually dropped in the future. The usage instructions are in the 'New method of booting u-boot over USB (u-boot v2015.04 and later versions)' section of the linux-sunxi wiki page http://linux-sunxi.org/index.php?title=FEL/USBBoot&oldid=12979 It temporarily moves the BROM data from the first 32 KiB of SRAM into a different SRAM section before calling the SPL code. And then moves it back before returning from the SPL back to the FEL code in BROM. This provides a contiguous 32 KiB block in the beginning of SRAM for use by the SPL. And in the case if an extra SRAM section is not available, we can at least "defragmemnt" the free memory areas and still provide a contiguous ~21 KiB block to the SPL in the beginning of SRAM. This code is also available in the following branch: https://github.com/ssvb/sunxi-tools/commits/20150206-fel-large-spl-support Siarhei Siamashka (2): fel: Split 'aw_fel_get_version' into 'get' and 'print' variants fel: New command for loading U-Boot SPL binaries in eGON format fel-to-spl-thunk.S | 172 +++++++++++++++++++++++++++++++ fel-to-spl-thunk.h | 69 +++++++++++++ fel.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 510 insertions(+), 22 deletions(-) create mode 100644 fel-to-spl-thunk.S create mode 100644 fel-to-spl-thunk.h -- 2.0.5

3 6