summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* ARM: bootm: Fix free_mem calculation when initrd is givenSascha Hauer2016-10-181-1/+1
| | | | | | | | | | | | | | When a initrd is given we calculate the next free memory position as: free_mem = PAGE_ALIGN(initrd_end); This is wrong when initrd_end exactly falls on a page boundary. In this case PAGE_ALIGN() does nothing and free_mem becomes initrd_end and the following bootm_load_devicetree() and thus booting fails with -ENOMEM. Fix this by correctly advancing to the next free memory position. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: i.MX Freescale Sabrelite: Use correct device tree for dl variantSascha Hauer2016-10-171-2/+2
| | | | | | | The i.MX6dl variant also uses the i.MX6q device tree which is wrong. Use the correct one. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx6: add support for Auvidea H100Lucas Stach2016-10-114-2/+97
| | | | | | | | | | | The Auvidea H100 is a baseboard for the SolidRun MicroSOM, which provides HDMI IN/OUT capabilities. Currently supported is only a combination of the H100 baseboard with a i2eX MicroSOM. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: microsom: use imx6q_barebox_entryLucas Stach2016-10-111-7/+6
| | | | | | | Instead of hardcoding the different RAM sizes. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/usb'Sascha Hauer2016-10-102-0/+4
|\
| * usb: imx-us-phy: Convert driver to generic phy supportSascha Hauer2016-09-292-0/+4
| | | | | | | | | | | | | | The generic phy layer now supports USB phys, so convert the driver over to use it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mvebu'Sascha Hauer2016-10-1010-6/+168
|\ \
| * | ARM: mvebu: add support for Netgear RN2120Uwe Kleine-König2016-10-078-0/+155
| | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mvebu: select HAVE_DEFAULT_ENVIRONMENT_NEWUwe Kleine-König2016-09-162-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | None of the available boards for mvebu has any environment additions, so this is safe. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mvebu_defconfig: enable all machines, AEABI, nand and net driverUwe Kleine-König2016-09-161-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mvebu_defconfig: oldconfigUwe Kleine-König2016-09-161-6/+6
| |/ | | | | | | | | | | | | | | | | | | | | This is the result of make mvebu_defconfig make savedefconfig mv defconfig arch/arm/configs/mvebu_defconfig . Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2016-10-102-8/+6
|\ \
| * | sandbox: Makefile: drop unused SUBARCH stuffAntony Pavlov2016-10-041-5/+0
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | convert users to %pI4Sascha Hauer2016-09-221-3/+6
| |/ | | | | | | | | | | | | Convert users of ip_to_string() and print_IPaddr() to %pI4 and remove the now unused functions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/imx'Sascha Hauer2016-10-1022-131/+588
|\ \
| * | i.MX: Register imx6_fixup_cpus() for MX6Q+ as wellAndrey Smirnov2016-10-041-1/+2
| | | | | | | | | | | | | | | | | | | | | Register imx6_fixup_cpus() for MX6Q+ as well as for MX6Q and MX6DL. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX: Introduce imx6_cpu_revision()Andrey Smirnov2016-10-042-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out CPU revision identification code from imx6_init() into a standalone inline function (similar to imx6_cpu_type()), so that it would be possible to use that functionality in PBL code. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: gate PCIe when unusedJan Luebbe2016-09-221-1/+4
| | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: fix clock gatingJan Luebbe2016-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since ce6755ca1c41b8dd3b40cf3c9d6f3a1237a92720, both IPU and OpenVG are enabled if CONFIG_DRIVER_VIDEO_IMX_IPUV3 is true, but in the other case, only OpenVG was disabled. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: remove duplicate clock initializationJan Luebbe2016-09-221-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | These registers are already set by imx6_ccm_probe (in clk-imx6.c) during core_initcall, while imx6_init_lowlevel is only called during postcore_initcall via imx_init in imx.c. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx6qp: set NoC regulator to bypassLucas Stach2016-09-222-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NoC regulator only passes the QoS signals through if it is in bypass mode. This is a safe setting to give the IPU priority over other requests. The kernel may change it to some other setting once it knows the bandwidth requirements of the use-case. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx6: don't execute IPU QoS setup on MX6 SX/SLLucas Stach2016-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | SX and SL variants only include the PXP and have no IPU, so skip any IPU related QoS setup. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx6: split out IPU QoS setupLucas Stach2016-09-221-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Split into separate function and only call it after the chip type and revision is known. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: vincell_defconfig: make smallerSascha Hauer2016-09-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | The image built with vincell_defconfig has become too big to fit into the SoC internal SRAM. Make it smaller by disabling UBIFS support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: imx_v7_defconfig: Enable Vincell supportSascha Hauer2016-09-221-1/+3
| | | | | | | | | | | | | | | | | | | | | Now that we can start images bigger than internal SRAM size we can enable the Vincell support in the imx_v7_defconfig. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53 Vincell: Add NAND xload supportSascha Hauer2016-09-222-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | The Vincell boards do the SDRAM setup from board init code, so the image size is limited to the internal SRAM size. To overcome this limitation use the NAND xload support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: Implement NAND xloadSascha Hauer2016-09-223-1/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some i.MX53 want to setup the SDRAM from C code rather than from DCD tables. The image size for these boards is limited to the internal SRAM size. To overcome this limitation for i.MX53 boards booting from NAND implement an xload mechanism to load only the PBL to SRAM and let barebox load the rest of the image itself after SDRAM has been initialized. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | mtd: imx-nand: Move v3 register definitions to include fileSascha Hauer2016-09-221-0/+49
| | | | | | | | | | | | | | | | | | | | | Move v3 register definitions to include file so that they can be reused for the early nand boot code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: Detect booting from USBSascha Hauer2016-09-221-0/+6
| | | | | | | | | | | | | | | | | | | | | The USB download mode can be detected by reading the BMOD[0|1] bits. Add support for it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Provide bootsource functions for early boot codeSascha Hauer2016-09-222-23/+72
| | | | | | | | | | | | | | | | | | | | | | | | The regular bootsource functions only work in a running barebox, provide functions for early code. This has already been done for i.MX6, this patch adds the same functions for the other SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: do not pass base address to imx*_boot_save_locSascha Hauer2016-09-228-19/+26
| | | | | | | | | | | | | | | | | | | | | The functions can determine the necessary base addresses themselves since they are SoC specific anyway. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53 Vincell: Add PBL console supportSascha Hauer2016-09-221-21/+29
| | | | | | | | | | | | | | | | | | | | | PBL console support is more useful than debug_ll. Add support for it to the Vincell Board. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53 Vincell: Adjust bbu handler partition size to real partition sizeSascha Hauer2016-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | The bootloader partition size was increased to 0xe0000, so adjust the barebox update handler partition size accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53 Vincell: Reset phy consistently from device treeSascha Hauer2016-09-222-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phy reset for the Vincell board is done from device tree whereas the Vincell-LT resets the phy from board init code. Since both boards share the same code base the regular Vincell board ends up with a duplicated phy reset, with the second reset being done after the FEC has been initialized. Fix this by removing the phy reset from the board code and adding the phy reset to the Vincell-LT dts file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: Add uart5 clock supportSascha Hauer2016-09-221-0/+1
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/defenv'Sascha Hauer2016-10-10223-93/+183
|\ \
| * | Make generic default environment type a use choiceSascha Hauer2016-10-1014-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | So far it was hardcoded for each board if defenv-1 or defenv-2 is used. Make this a user choice so that a particular board no longer enforces a defenv type. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | defaultenv: add defaultenv-1 in boards via defaultenv_append_directory()Sascha Hauer2016-10-10209-52/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it's hardcoded for each board which defaultenv version is used. This is unfortunate since some people like the other defaultenv version better and may want to select it. This patch removes the board specific environment path CONFIG_DEFAULT_ENVIRONMENT_PATH and instead adds it via: if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) defaultenv_append_directory(defaultenv_<board>); This way we can make sure that the defaultenv-1 board specific bits are only compiled in when defaultenv-1 is actually in use. The next step is to make the defaultenv version selection a user visible choice. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | defenv-1: remove unused variable kernelimage_typeSascha Hauer2016-09-142-8/+0
| | | | | | | | | | | | | | | | | | kernelimage_type is used nowwhere, remove it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/bootchooser'Sascha Hauer2016-10-101-1/+1
|\ \ \
| * | | global: Make 'global' command behaviour consistent to 'nv'Sascha Hauer2016-09-221-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'nv' command can add/remove multiple variables. Implement that for the 'global' command aswell. Also with the 'nv' command the -r option is for removal of variables, not for "set match". Looking at the users of "global -r" the only user uses the command for removal of variables and not for "Setting multiple variables to the same value" as stated in the command help text. Let "global -r" remove variables aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/arm'Sascha Hauer2016-10-1013-18/+785
|\ \ \
| * | | Add support for Baltos systemsYegor Yefremov2016-10-077-0/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnRISC Baltos devices are based on a am335x SoC and can be booted either from MMC or NAND. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: Fix calling of arm_mem_barebox_image()Sascha Hauer2016-09-154-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arm_mem_barebox_image() is used to pick a suitable place where to put the final image to. This is called from both the PBL uncompression code and also from the final image. To make it work properly it is crucial that it's called with the same arguments both times. Currently it is called with the wrong image size from the PBL uncompression code. The size passed to arm_mem_barebox_image() has to be the size of the whole uncompressed image including the BSS segment size. The PBL code calls it with the compressed image size instead and without the BSS segment. This patch fixes this by reading the uncompressed image size from the compressed binary (the uncompressed size is appended to the end of the compressed binary by our compression wrappers). The size of the BSS segment is unknown though by the PBL uncompression code, so we introduce a maximum BSS size which is used instead. The code before this patch worked by accident because the base address of the final image was aligned down to a 1MiB boundary. The alignment was sufficient already to make enough space. This breaks though when the uncompressed image including BSS becomes bigger than 1MiB while the compressed image is smaller. Fixes: 65071bd0: arm: Clarify memory layout calculation Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Add comp_copy function for use with CONFIG_IMAGE_COMPRESSION_NONESascha Hauer2016-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Makefile compression commands all append the size of the uncompressed image. With CONFIG_IMAGE_COMPRESSION_NONE simply 'shipped' is used which does not append the size. Add and use a special comp_copy function which adds the size. This helps us to get the uncompressed image size in the startup code later. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX6: Sabrelite: Add PBL console supportSascha Hauer2016-09-151-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | Add PBL console support to allow for better debugging. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm64: drop unneeded files from MakefileLucas Stach2016-10-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARM64 has native instructions for division and thus doesn't need the helper functions implemented in those files. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm64: include correct setupc file in ARM64 PBLLucas Stach2016-10-041-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm: semihosting support is not implemented for ARM64Lucas Stach2016-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow it to be selected in a ARM64 build. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm(64): don't advertise stack_dumping capabilities for ARM64Lucas Stach2016-10-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The unwind code to support this feature is not there yet. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>