summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | docs: fix typosUlrich Ölmann2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Convert users of PRINTF_CONVERSION_RESOURCE to %paSascha Hauer2016-01-156-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | printf now supports printing resource_size_t directly, convert all users of the previously used PRINTF_CONVERSION_RESOURCE over to %pa. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | vsprintf: Add support for %paSascha Hauer2016-01-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the %pa format specifier to print phys_addr_t, dma_addr_t and resource_size_t. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | hush: fix indentationSascha Hauer2016-01-111-17/+17
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/linux-headers'Sascha Hauer2016-02-0834-399/+681
|\ \ \ \
| * | | | dcache: add missing linux/list.h includeYegor Yefremov2016-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: import magic.h from Linux kernelYegor Yefremov2016-02-035-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/linux/magic.h provides MAGIC numbers for various file systems. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Introduce include/linux/rwsem.hYegor Yefremov2016-02-033-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move semaphore related definitions to its original place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Introduce include/linux/wait.hYegor Yefremov2016-02-034-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Linux wait queue related definitions to its original place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Introduce include/linux/mutex.hYegor Yefremov2016-02-038-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move mutex related defines to its original place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Introduce include/linux/spinlock.hYegor Yefremov2016-02-0113-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move spinlock related definitions to its original place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Introduce include/linux/sched.hYegor Yefremov2016-02-013-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move cond_resched() from barebox-wrapper.h to its original place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: ubifs: move file and file_system_type definitions to linux/fs.hYegor Yefremov2016-02-012-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: ubifs: move path definition to include/linux/path.hYegor Yefremov2016-02-012-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: ubifs: move vfsmount definition to include/linux/mount.hYegor Yefremov2016-02-012-34/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: ubifs: move dcache related definitions to include/linux/dcache.hYegor Yefremov2016-02-012-46/+78
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: move pgoff_t definition to include/linux/types.hYegor Yefremov2016-02-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: use linux/fs.h for file system related definitionsYegor Yefremov2016-02-014-91/+192
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | 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>
| * | | | fs: ubifs: remove redundant macro definesYegor Yefremov2016-01-291-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove macros, that were already defined in linux/stat.h. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: move PAGE_CACHE definitions to include/linux/pagemap.hYegor Yefremov2016-01-292-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: introduce include/linux/fs.hYegor Yefremov2016-01-292-127/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Linux file system structs from UBIFS to central place. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | fs: move struct timespec to include/linux/time.hYegor Yefremov2016-01-292-7/+5
| | |/ / | |/| | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/input'Sascha Hauer2016-02-0819-503/+629
|\ \ \ \
| * | | | input: gpio-keys: convert to input frameworkSascha Hauer2016-01-182-47/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow asking for the button states. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: gpio-keys: Use KEY_* keycodesSascha Hauer2016-01-135-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: imx-keypad: Add device tree supportSascha Hauer2016-01-131-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preparations are done in previous patches, now we only have to add the device tree compatible and drio the check for platform_data. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: Add device tree parsing support for matrix keymapSascha Hauer2016-01-133-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for parsing the "linux,keymap" property. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: imx-keypad: convert to input frameworkSascha Hauer2016-01-132-43/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible to ask for the button state. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: move matrix_keypad_build_keymap() to C fileSascha Hauer2016-01-136-28/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | input: imx-keypad: Use dev_* functionsSascha Hauer2016-01-131-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | driver should use dev_* rather than pr_* Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: usb keyboard: convert to input frameworkSascha Hauer2016-01-132-242/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conert the USB keyboard over to the new input core as a first user. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | input: Add input coreSascha Hauer2016-01-134-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently all input driver register themselves as consoles. Consoles are fine for typing text, but they do not allow to ask for the current pressed state of buttons or keypads. They also do not support non printable keys like the function keys. This patch adds a simple input core. On the driver side it supports input_report_key_event() to report events (button presses and releases). On the consumer side it allows getting the current button status via input_key_get_status(). Also an event driven interface is available which calls a callback whenever an input event is received. The input core also registers a console for all registered input devices which handles passing events to the console and stuff like key repetition, so this can be removed from the drivers once they are converted to the input core. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | keymap: Add keymap for keys with shift pressedSascha Hauer2016-01-132-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting keys to ascii for the console we also need the keymap with shift pressed. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | keymap: Add apostrophe, backslash and homeSascha Hauer2016-01-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some previously undefined keys. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | keymap: Add keypad keysSascha Hauer2016-01-131-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to use the number keypad keys. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | keymap: remove exotic and nonprintable keysSascha Hauer2016-01-131-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need these keys and they do not produce a usable result either. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | keymap: Fix bracesSascha Hauer2016-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEY_LEFTBRACE is the '[' key on an english keyboard and KEY_RIGHTBRACE is the ']' key. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | poller: Fix async pollerSascha Hauer2016-01-132-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The async poller does not work as expected since it can happen that the async poller is removed from the list of pollers while we are iterating over the list. Even list_for_each_entry_safe does not help here since we may remove the next list element, but list_for_each_entry_safe only allows to remove the current list element. Rework the async poller so that it is registered with the poller framework on registration and then is only marked as active with poller_call_async(). This way we do not have to do list manipulations while running the pollers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | Merge branch 'for-next/hab'Sascha Hauer2016-02-0854-1016/+3455
|\ \ \ \ \
| * | | | | i.MX habv4: Fix RVT address for newer SoCsSascha Hauer2016-02-051-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer i.MX SoCs have the RVT at 0x98, not at 0x94 any more. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | imx: hab: Make hab status functions SoC specificSascha Hauer2016-02-042-29/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HABv4 functions need access a part of the ROM which is located in the zero page. This must be done early, before the MMU has been configured and the zero page has been set to faulting. The HAB functions currently use cpu_is_imxxy(). At the stage where HAB is called the i.MX CPU type variable is not yet initialized, so this code only works when only one i.MX type is enabled and cpu_is_imxxy() are compile time constants. To fix HAB support when more than one i.MX type is enabled make the HAB status function SoC specific so that we can drop the use of cpu_is_imxxy(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | scripts: imx-usb-loader: Do not zero out boot_data_ptrSascha Hauer2016-02-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't be necessary. So far it didn't hurt either, but now this invalidates the signature of the image, so keep the image unmodified. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | images: imx: Add targets for signed images and signed usb imagesSascha Hauer2016-02-042-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .simximg target for signed images and .usimximg for signed images suitable for USB upload Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | Make: i.MX: Allow to pass config file to cmd_imx_imageSascha Hauer2016-02-043-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-image: Allow to create HAB signed images suitable for USB uploadSascha Hauer2016-02-041-6/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For USB upload we must execute the DCD table manually and invalidate the DCD table in the uploaded image afterwards to prevent the ROM from executing the DCD data again. Doing this changes the image and thus also invalidates the signature. To make HAB signed images suitable for USB upload possible we add an option to create HAB signed images suitable for USB upload. With this option the image is created like this: - The image is created like usual, but with already invalidated DCD data (DCD length is set to zero) - This image is then signed using the CST - After this the DCD data is made valid (Set DCD length to the real length) imx-usb-loader now finds valid DCD data, executes it and by invalidating the DCD data it restores the state the image had during signing. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | scripts: imx-image: Factor out a read_file functionSascha Hauer2016-02-041-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same code will be used a second time in a followup patch, so factor out a common function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | scripts: imx-usb-loader: Use dcd len to invalidate dcd dataSascha Hauer2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We invalidate the dcd data in the uploaded image since we already processed it manually. To do so we have set the dcd pointer to 0. Doing it this way prevents the ROM from executing the HAB code in debug mode. Use the dcd length instead to invalidate the dcd data. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | scripts: imx: Generate signed images with imx-imageSascha Hauer2016-02-047-166/+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>