summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* ARM: imx6: add caam clksSteffen Trumtrar2016-02-121-0/+4
| | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/regmap'Sascha Hauer2016-02-082-179/+169
|\
| * ARM: i.MX: ocotp: Switch to regmap supportSascha Hauer2016-02-051-89/+56
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX: ocotp: Fix error bit handlingSascha Hauer2016-02-051-13/+10
| | | | | | | | | | | | | | | | | | Instead of returning an error when a locked region is read, fill the result with 0xbadabada to indicate a locked region is read. This way a md -s /dev/imx-ocotp does not abort when it encounters locked regions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX: ocotp: make priv the first argument of functionsSascha Hauer2016-02-051-16/+16
| | | | | | | | | | | | | | Throughout our codebase the private context pointer is the first argument to a function. Do this for the ocotp driver aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX: ocotp: Explicitly access control registerSascha Hauer2016-02-051-7/+8
| | | | | | | | | | | | | | | | Even when the control register has offset 0x0 it's still nice to use a register define for it. Accessing priv->base directly just looks wrong. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX: ocotp: Fix fusebox sizeSascha Hauer2016-02-051-1/+23
| | | | | | | | | | | | | | All i.MX6 SoCs except the i.MX6SL have 4kbit fuses. The i.MX6SL has 2kbit fuses. Fix the device size accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX: iim: Switch to regmap supportSascha Hauer2016-02-051-59/+62
| | | | | | | | | | | | To provide consumers easier access to the IIM. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/linux-headers'Sascha Hauer2016-02-082-0/+4
|\ \
| * | x86: Add missing typedef for umode_tSascha Hauer2016-02-011-0/+2
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | nios2: Add missing typedef for umode_tSascha Hauer2016-02-011-0/+2
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/input'Sascha Hauer2016-02-085-17/+21
|\ \
| * | input: gpio-keys: Use KEY_* keycodesSascha Hauer2016-01-134-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | The gpio-keys driver takes ascii key codes from platform_data and Linux keycodes from device tree. Convert the ascii keys over to Linux keycodes to get rid of the special cases in the driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | input: move matrix_keypad_build_keymap() to C fileSascha Hauer2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Future additions will make the function too big to live as a static inline function. Move to a C file and while at it, move matrix_keypad.h to include/input/ where it belongs to. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/hab'Sascha Hauer2016-02-084-1/+122
|\ \ \
| * | | Make: i.MX: Allow to pass config file to cmd_imx_imageSascha Hauer2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the config file to cmd_imx_image as arguments to make it more flexible. Also add the possibility for another arg containing additional options. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | scripts: imx: Generate signed images with imx-imageSascha Hauer2016-02-042-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imx-image tool can now generate signed images itself, so we can switch to this mechanism: - Move the CSF templates to header files which can be included by the flash config files - remove images/Makefile.imxhabv4 which is no longer necessary. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | scripts: imx-image: Support adding a Super Root Key to the imageSascha Hauer2016-02-041-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | imx: hab: rename driver dir to hab/Sascha Hauer2016-02-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's not only HABv4 but also HABv3. No need to put the corresponding code in separate directories, so rename the habv4 directory to hab. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: Add HABv3 Kconfig variablesSascha Hauer2016-02-021-0/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | For signing i.MX images with HABv3 we need several certificates. Add their pathes to Kconfig variables to make them available to the build system. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/fit'Sascha Hauer2016-02-089-34/+50
|\ \ \
| * | | bootm: add initial FIT supportJan Luebbe2016-01-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation is inspired by U-Boot's FIT support. Instead of using libfdt (which does not exist in barebox), configuration signatures are verified by using a simplified DT parser based on barebox's own code. Currently, only signed configurations with hashed images are supported, as the other variants are less useful for verified boot. Compatible FIT images can be created using U-Boot's mkimage tool. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | crypto: add digest_alloc_by_algo()Sascha Hauer2016-01-262-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In barebox the function digest_alloc() allocates a digest based on a string. When a subsystem already uses an integer value to identify a digest it makes no sense to create a string and pass it to digest_alloc(), where it is parsed again. This patch adds the possibility to get a digest by an enum. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bootm: move initrd code togetherSascha Hauer2016-01-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The initrd code is distributed in several places in the bootm code. Move it all together in bootm_load_initrd(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bootm: Push dryrun to handlersSascha Hauer2016-01-267-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can make the dryrun option more useful by calling into the handlers. With this we can detect more cases that can go wrong during boot. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: bootm: Use kernel handler to start barebox imageSascha Hauer2016-01-221-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | barebox can be called with the kernel calling convention, so we can reuse the handler instead of creating a barebox specific handler. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bootm: introduce bootm_get_os_sizeSascha Hauer2016-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARM do_bootm_linux is not only called with uImages but also with raw images, so we can't use uimage_get_size() here. Introduce bootm_get_os_size() which handles the different image types. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: zImage: add missing free() in appended device tree codeSascha Hauer2016-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | oftree must be freed when the tree is successfully unflattened. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/dts'Sascha Hauer2016-02-082-2/+314
|\ \ \ \
| * | | | ARM: i.MX53: CCXMX53: Move device tree out of dts/Sascha Hauer2016-02-042-2/+314
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The dts files accidently have been added to dts/. Move them to a proper place. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/arm'Sascha Hauer2016-02-0824-72/+143
|\ \ \ \ | |/ / / |/| | |
| * | | ARM: i.MX25: fixup broken DryIce GPRSteffen Trumtrar2016-02-041-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup the DryIce Non-Non-Volatile-Memory GPR register. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: am33xx: Master Osc clock speed handlingDaniel Schultz2016-01-265-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup the plls with Master Osc. clock speed from the SYSBOOT Configuration Pin. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Teresa Remmet <t.remmet@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: am33xx: Move function to read from Master OSCDaniel Schultz2016-01-263-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the function to read the Master OSC speed from the SYSBOOT Configuration Pin for reuse. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Teresa Remmet <t.remmet@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Add initial support for Netgear ReadyNAS 104Uwe Kleine-König2016-01-229-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only second stage booting from the vendor U-Boot is tested. I don't want to flash barebox into NAND yet because UART-booting for recovery doesn't work for me. Working so far are: - UART - networking - nand flash Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: cm-fx6: set proper hostnamePhilipp Zabel2016-01-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the hostname to "utilite" or "cm-fx6". Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: tegra: clean up lowlevel entryLucas Stach2016-01-187-47/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lowlevel startup function jumps directly to the main cluster if we are already running there. This allows for a significant cleanup of the board startup code by directly using the FDT address available there. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm: imx53-guf-vincell-lt: dts: do not specfiy fixed memory informationEnrico Jorns2016-01-262-8/+0
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a fixed memory size prevents from using the different board variants with different memories equipped. barebox is able to read RAM size informations from the imx53 RAM controller and thus does not require this information passed via dts. Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | ARM: PXA: move HAVE_CLK selectLucas Stach2016-01-192-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Claiming that all of PXA has CLK implemented, while only PXA3XX selects the relevant clock implementations causes lots of build failures for the other PXA architectures. Fix it by moving the HAVE_CLK select to the one PXA arch, that actually has it. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / imx233-olinuxino: Fix mx23_power_init() argumentsFabio Estevam2016-01-121-1/+1
|/ | | | | | | | | | | | | Commit 4d70da6 ("ARM: MXS: power-init: Add parameters to mx28_power_init()") causes imx233-olinuxino to not boot anymore. imx233-olinuxino is commonly powered from external input supply, so adjust the mx23_power_init() arguments to reflect that. Reported-by: Peter Mamonov <pmamonov@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Peter Mamonov <pmamonov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/socfpga'Sascha Hauer2016-01-112-5/+7
|\
| * socfpga: Allow setting partition xloader boots from for mmcTrent Piepho2015-12-142-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xloader boots the 2nd stage barebox from socfpga_barebox_part when using NOR. But when using MMC it boots from a hardcoded "disk0.1". Add the mmc device name to the partition description and use it for mmc booting. Add an extern declaration of socfpga_barebox_part to the socfpga header so that a board can change it to use a different partition. Initialize socfpga_barebox_part to the default value instead of NULL to avoid the NULL check later. Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/pstore'Sascha Hauer2016-01-115-66/+119
|\ \
| * | arm: Add RAMOOPS memory areaMarkus Pargmann2015-12-102-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RAMOOPS is a driver that uses a reserved static memory region to store the data from the last panic or boot. This helps to debug crashes at the next boot while preserving the boot messages. To guarantee a memory area that is not altered by barebox or the kernel, this area is located at the end of the RAM right after barebox and before the STACK. This ensures that changing barebox sizes do not interfere with RAMOOPS. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: start: Add visible sdram region for barebox board dataMarkus Pargmann2015-12-101-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to understand and find problems with the memory layout of barebox. It adds another entry for the board data that barebox allocated. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: Clarify memory layout calculationMarkus Pargmann2015-12-104-65/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory calculations used are all hardcoded into three different files, start-pbl.c, uncompress.c and start.c. To make this more readable and reliable, this patch gathers these information in barebox-arm.h with static inline functions for the calculation of the memory offsets. This patch also adds proper handling of different barebox/board data sizes. Currently only 1MB+Alignment of RAM is reserved for Barebox and board data. This could be too small for bigger devicetrees and barebox. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: boards: karo-tx6x remove definition of DIV_ROUND_UPMarkus Pargmann2015-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | DIV_ROUND_UP is defined in include/linux/kernel.h. Use that instead. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2016-01-116-42/+12
|\ \ \
| * | | OF: Fix fixups to fix Linux DT instead of Barebox DTTrent Piepho2016-01-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OF fixups cm_cogent_fixup() and hb_fixup() are supposed to modify the Linux device tree. And they did originally, but commit e520a8cc463760d21890b35218e4dac817e7c7e7 changed them to use for_each_compatible_node(), which iterates through the Barebox DT. Use new for_each_compatible_node_from() to specify the Linux DT root as the start point. Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | socfpga: Find partition with environment via device treeTrent Piepho2016-01-083-38/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | socfpga would load the environment from a file named "barebox.env" located on the device "/dev/mmc0.1". Both those names are hard-coded in the socfpga code and can't be changed. Barebox supports selecting the location of the environment using a "barebox,environment" node in device tree's "chosen" node. And recently supports specifying that the env should come from a file on this device. Change socfpga to use this mechanism by adding the appropriate device node. Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>