summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | mtd: nand: add mrvl-nand driverRobert Jarzmik2015-01-194-0/+1107
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver is taken from the Linux kernel, with the following changes : - all DMA removed - all asynchronous handling removed, including the interrupt handler, and the asynchronous state handling - pxa armada support removed Most the kernel structure was kept, to ease up future fixes integration from the kernel driver. The driver is tested on a pxa3xx system development board (aka. zylonite), and reading, writing, erasing, and bad block management were tested. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/net'Sascha Hauer2015-02-041-6/+3
|\ \ \
| * | | dhcp: fix request packet's seconds elapsedEric Bénard2015-01-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it's done in the discover packet so let's do it also in the request packet. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | dhcp: fix request packetEric Bénard2015-01-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we are not supposed to fill ciaddr, yiaddr and siaddr in the request packet. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | dhcp: fix request packet's requested IP optionEric Bénard2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the request packet, we are supposed to copy the IP that the DHCP server provided in the offer packet so that dhcp_extended can fill the option 50. There is actually an error in barebox as the pointer to the packet currently built is used as the source instead of the pointer to the offer packet. With this patch, barebox now sends a request packet which includes the right requested IP in option 50. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/mxs'Sascha Hauer2015-02-0436-303/+1020
|\ \ \ \
| * | | | ARM: MXS: Add duckbill board supportSascha Hauer2015-02-039-0/+292
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: power-init: Add parameters to mx28_power_init()Sascha Hauer2015-02-035-33/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of introducing new functions each time a new power supply situation is to be added, this patch adds parameters to mx28_power_init. Right now there are three parameters: - has_battery - true when this board has a battery. - use_battery_input - true when this board is supplied from the battery input, but has a DC source instead of a real battery - use_5v_input - true when this board can use the 5V input The third one is introduced with this patch and allow to boot a board from 5v (USB) source only. The main necessary change this needs is that the DC-DC converter must always be sourced from DCDC_4P2 (DROPOUT_CTRL field of HW_POWER_DCDC4P2) Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Add regulator debug printSascha Hauer2015-01-281-0/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Setup vdda in power prepSascha Hauer2015-01-282-15/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | pinctrl: Add MXS pinctrl driverSascha Hauer2015-01-283-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a device tree pinctrl driver for MXS. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | pbl: Add support for memory_displaySascha Hauer2015-01-282-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PBL has console support now, so add memory_display support aswell which can be a good debugging aid. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | of: Create platform_device when creating AMBA device failedSascha Hauer2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If creating an AMBA device failed, maybe because AMBA support is not compiled in, register the device as regular platform device. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: ocotp: Add devicetree supportSascha Hauer2015-01-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the device tree compatible strings. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Create ocotp device in SoC codeSascha Hauer2015-01-284-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ocotp device is completely SoC internal, no need to register it from boards. Register it from SoC code instead. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | serial: stm_serial: Add devicetree supportSascha Hauer2015-01-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds device tree support for the stm serial driver. This driver really is a AMBA primecell, so the amba-pl011 could be used. However, the current code tries to get the apb_pclk before the clocks are registered, so this does not work. Use the stm driver instead until a solution is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | mci: mxs: Add devicetree supportSascha Hauer2015-01-281-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device tree compatibles and allow retrieving data from device tree instead of platform_data only. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Make gpio a driverSascha Hauer2015-01-287-60/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns the MXS gpio support into a driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Do not register devices with device tree supportSascha Hauer2015-01-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a device tree is present the SoC internal devices come from it, so do not register them as platform devices. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | MXS: power-init: inline only once used functionsSascha Hauer2015-01-281-93/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mxs_power_init_4p2_params and mxs_power_init_4p2_regulator are used only once, so inline the code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: Fix vddd brownout settingSascha Hauer2015-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The brownout setting can be at maximum 7*25mV below the voltage setting of the regulator. Set it to the minimum Voltage which is 1325mV. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: imx28evk: Update environment and configSascha Hauer2015-01-203-68/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the imx28evk to new environment and updates the defconfig file for tons of new features. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: MXS: imx28evk: Add lowlevel supportSascha Hauer2015-01-203-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the imx28evk to multiimage support and adds the lowlevel initialization to make the bootlets unnecessary. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | | Merge branch 'for-next/misc'Sascha Hauer2015-02-0440-605/+123
|\ \ \ \ \
| * | | | | nios2: ignore arch/nios2/cpu/barebox.lds by gitMasahiro Yamada2015-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | defaultenv: generate force-built-in (zero) environment fileJan Luebbe2015-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | pinctrl: remove unnecessary error checkMasahiro Yamada2015-02-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file drivers/pinctrl/pinctrl.c is compiled only when CONFIG_PINCTRL is defined. "IS_ENABLED(CONFIG_PINCTRL)" is always evaluated as 1 in this function. (Although the compiler would optimize it, the source file does not look nice.) Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | commands: crc: support setting environment variablesJan Luebbe2015-02-021-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | param: add error check to __dev_add_param()Masahiro Yamada2015-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If strdup() fails with out-of-memory, __dev_add_param() should fail with -ENOMEM. (Note strdup() is always given with a non-NULL pointer. If the argument name is given with NULL, the system would already have crashed in the get_param_by_name() function.) Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | MAKEALL: do not create build directory explicitlyMasahiro Yamada2015-02-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e7554c0cb245 (kbuild: create a build directory automatically for out-of-tree build), MAKEALL does not have to create a build directory. It it done by the top Makefile. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | MAKEALL: fix do_build_allMasahiro Yamada2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, do_build_all() does nothing. Since commit 195310fd7b48 (MAKEALL: add regex support), do_build() takes two arguments. To fix do_build_all(), it must pass "*" as the second argument of do_build(). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | blackfin: fix undefined reference with CONFIG_CMD_MAGICVARMasahiro Yamada2015-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Blackfin, C symbols are prefixed with '_'. If CONFIG_CMD_MAGICVAR is enabled for Blackfin, the following error occurs: commands/built-in.o: In function `do_magicvar': commands/magicvar.c:(.text+0x3326): undefined reference to `__barebox_magicvar_start' commands/magicvar.c:(.text+0x332a): undefined reference to `__barebox_magicvar_end' commands/magicvar.c:(.text+0x332e): undefined reference to `__barebox_magicvar_start' commands/magicvar.c:(.text+0x3332): undefined reference to `__barebox_magicvar_end' make: *** [barebox] Error 1 Add '_' to __barebox_magicvar_start and __barebox_magicvar_end, like the other symbols in this linker script. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | param: add error check to dev_param_set_generic()Masahiro Yamada2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function dev_param_set_generic() may fail because of out of memory. If so, return -ENOMEM. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | blackfin: consolidate arch/blackfin/include/asm/linkage.hMasahiro Yamada2015-02-023-49/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since include/linux/linkage.h includes <asm/linkage.h>, the basic coding style we should follow is: - <linux/linkage.h> should contain default macro defines - <asm/linkage.h> can define arch-specific macros and override the default ones in <linux/linkage.h> The arch/blackfin/include/asm/linkage.h has redundant defines that are already defined in <linux/linkage.h>. Replace it with the one imported from Linux 3.19-rc6. Generally, <asm/linkage.h> should not be included directly. Fix two files to include <linux/linkage.h> instead. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | kbuild: drop $(KBUILD_DTBS) from the all targetMasahiro Yamada2015-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $(KBUILD_DTBS) is not set anywhere. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | kbuild: drop bogus "common/barebox_default_env*" from CLEAN_FILESMasahiro Yamada2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7fa10256c3f4 (defaultenv: Allow multiple defaultenvironment overlays), barebox_default_env* is created in the defaultenv/ directory. They are cleaned up when "make clean" descends into the defaultenv/ directory. We can simply delete "common/barebox_default_env*" from the top Makefile. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | gitignore: sync with Linux's .gitignoreMasahiro Yamada2015-02-021-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The top .gitignore is getting close to Linux's one. I am inclined to sync it more. - Add a missing comment block - Add missing patterns that have no impact (*.o.*, *.so.dbg) - Add prefix "/" to top-level generic files - Arrange the order for easier diff Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | gitignore: move "barebox_default_env*" to subdirectoryMasahiro Yamada2015-02-022-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "barebox_default_env*" is not "Top-level generic files" because they are generated in the defaultenv/ directory since commit 7fa10256c3f4 (defaultenv: Allow multiple defaultenvironment overlays). The comment block of the top-level .gitignore says as follows: # NOTE! Don't add files that are generated in specific # subdirectories here. Add them in the ".gitignore" file # in that subdirectory instead. Let's follow this rule. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | gitignore: simplify .gitignore file with pattern "/barebox*"Masahiro Yamada2015-02-021-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no source file prefixed "barebox" at the top directory. Generated files there can be simply ignored with "/barebox*" pattern. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | usb: abolish wait_ms() functionMasahiro Yamada2015-02-026-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is only used in drivers/usb/*. It is equivalent to mdelay(). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | ARM: fix a wrong comment about relocate_to_adrMasahiro Yamada2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The relocated_to_adr does not clear the .bss section. It is done by the setup_c routine. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | loadenv: fix typo in help textWjatscheslaw Stoljarski2015-02-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wjatscheslaw Stoljarski <wjatscheslaw.stoljarski@kiwigrid.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | memtest: fix 4GB overflow failDmitry Lavnikevich2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add condition for checking size_t overflow. This fixes memtest fail > Memtest failed. Error: -22 which appears when 4GB RAM is present. Was tested on phyFLEX-i.MX6 modules with 4GB and 1GB RAM. Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | trivial: s/flasg/flash/Uwe Kleine-König2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | memtest: Fix SDRAM size calculationsSascha Hauer2015-01-261-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating the size and end of the test region as end = PAGE_ALIGN_DOWN(bank->res->end) - 1; size = end - start + 1; is wrong. For an example resource of start = 0x80000000, end = 0x8fffffff end results in: end = PAGE_ALIGN_DOWN(0x8fffffff) - 1 = 0x8fffefff instead of 0x8fffffff. The size is then calculated to size = end - start + 1 = 0x8fffefff - 0x80000000 + 1 = 0x0ffff000 instead of 0x10000000 The correct way to do this is to calculate the real size and apply a PAGE_ALIGN_DOWN afterwards: size = PAGE_ALIGN_DOWN(bank->res->end - start + 1) = 0x10000000 Fix this in three different places. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | debug_ll: change the argument type of putc_ll()Masahiro Yamada2015-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the implementations of PUTC_LL() takes "char" (some take "int"), not "unsigned char". Moreover, puts_ll() takes an argument with "const char *" type. Let's drop "unsigned" from the prototype of putc_ll(). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | sandbox: get malloc_size from .configAntony Pavlov2015-01-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | scripts/checkpatch.pl: don't search for CREDITS when checking ↵Antony Pavlov2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | top_of_kernel_tree() The CREDITS file is removed in the commit commit 6570288f2d97d3a3dceb3e631b4e4f4305352dc8 Author: Masahiro Yamada <yamada.m@jp.panasonic.com> Date: Tue Jan 13 14:27:07 2015 +0900 Remove the CREDITS file But checkpatch.pl still trying to check it presence. There is not such CREDITS file and checkpatch.pl exits with 'Must be run from the top-level dir. of a kernel tree' message. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | gitignore: remove obsolete link method for arch specificationMasahiro Yamada2015-01-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cross_arch and cross_compile links method is obsolete and not available any more, so we remove it from the .gitignore. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | MMC: IMX: Reset MMC_BOOT register after controller reset.Andrey Panov2015-01-192-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps with EMMC detection when booting from EMMC directly. Taken from u-boot. Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>