summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/misc'Sascha Hauer2015-02-0413-58/+21
|\
| * 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>
| * 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>
| * 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>
| * 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>
| * 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>
| * kbuild: add KBUILD_DEFCONFIGMasahiro Yamada2015-01-143-0/+5
| | | | | | | | | | | | | | | | | | | | This allows "make ARCH=... defconfig". Fox example, you can type "make defconfig" instead of "make sandbox_defconfig". Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * kbuild: arm: Do not define "comma" twiceMasahiro Yamada2015-01-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The definition of "comma" exists in scripts/Kbuild.include. We should not double it. Note: This was already fixed in Linux Kernel too. See commit 226422d08c33 of Linux Kernel. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * powerpc: include <linux/stringify.h> to avoid dupulicated definesMasahiro Yamada2015-01-131-3/+1
| | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/imx'Sascha Hauer2015-02-0411-37/+133
|\ \
| * | imx53: add uart3Jan Luebbe2015-01-302-0/+6
| | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: use generic calculation in nand bbu handlerStefan Christ2015-01-292-22/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameters ECC Strength, BadBlockMarkerByte and BadBlockMarkerStartBit in the FCB structure depends on the nand chip's pagesize and oobsize. Instead of hardcoding these values into the imx6 bbu handler calculate these values on the fly. Therefore we export the necessary functions from the nand_mxs driver to use them in the bbu handler. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | imx6: add partitions on SPI NOR for PFLA02Stefan Christ2015-01-281-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Add partitions oftree and kernel on SPI NOR and increase size of barebox and barebox-environment partition. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: Fix bad block marker in imx6-bbu-nand handlerStefan Christ2015-01-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX6 NAND update handler sets all bytes of OOB data to 0x00 in pages that contain the FCB structure currently. So the first and second byte which is used as the manufacturers bad block marker is in the 'bad block' state. A scan for factory bad blocks will detect these blocks as bad while they are still ok. The barebox issues a scan for factory bad blocks to rebuild the bad block table if the NAND is brand new or the last four blocks of flash are erased. To fix this problem set the first two bytes of OOB data to 0xFF explicitly. There is a potential chance that the bbu handler will mark a real bad block as factory good. That's not a problem for the ROM Loader, because the FCB is protected by a checksum and the hamming_13_8 encoding. Additionally the current implementation of the bbu handler does not check the bad block table or the factory bad block marker before writing the FCB at the first page of the first and second block. Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02: Align nand partitions by 512kDmitry Lavnikevich2015-01-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NAND chip used on phyFLEX-i.MX6 with 4GB NAND (MT29F32G08AFACAWP) has 512k eraseblock size. Align NAND partitions by 512k to fix erase fails. Also increase barebox-environment and oftree partitions to be two eraseblocks. This will ensure safety in case of bad block. Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: phyFLEX-i.MX6: Add support for 1GB on 1 bankChristian Hemp2015-01-282-0/+9
| | | | | | | | | | | | | | | | | | | | | Add support phyFLEX-i.MX6 SOM with 1GB on one ram bank Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: IMX: Embedsky E9: Choose right environment when booting from SD or EMMC.Andrey Panov2015-01-193-4/+40
| | | | | | | | | | | | | | | Signed-off-by: Andrey Panov <rockford@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX6: phytec: Allow multiple MMC devices to contain boot environmentAndrey Smirnov2015-01-162-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | Add code so that when booting from different SDHCI controllers barebox would correctly set up where to look for bootloader environment. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX6: phytec: Check environment path selection for errorsAndrey Smirnov2015-01-161-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Add code to explicitly check for success of of_device_enable_path() when selecting which media is expected to contain barebox environment. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX6: phytec: Separate SoM specific codeAndrey Smirnov2015-01-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate SoM(designator PFLA02) specific and base board(designator PBAB0x) code into two distinct functions. PHYTEC default environment for PHYFLEX references peripherals that may or may not be used on custom baseboards used with SoMs. Move the code appending it into a separate function that would have effect only for boards explicitly claiming compatibility with PHYTEC baseboards. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/arm'Sascha Hauer2015-02-0415-23/+551
|\ \ \
| * | | ARM: use an easier way to create the empty built-in.oMasahiro Yamada2015-02-022-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not have to build an unneeded file to create the built-in.o. Just add a dummy string to "obj-". (dummy.c does not need to exist.) Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: delete useless and wrong commentsMasahiro Yamada2015-01-302-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These comments are wrong. Anyway, they do not carry useful information. Delete. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: atmel: sama5d3xek: let gmac auto detect phy idBo Shen2015-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the SAMA5D33 and SAMA5D35 the GMAC PHY ID is 1 while not 7. So, let the GMAC auto detect phy id, or else hard code to 7, it can not work on these two boards. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: atmel: sama5d3xek: let emac auto detect phy addrBo Shen2015-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the SAMA5D35 the EMAC phy addr is 1 while not 0. So, let the EMAC auto detect phy addr, or else hard code to 0, the ethernet can not work on SAMA5D35 board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | add support for the haba-knx-lite controllerGregory Hermant2015-01-167-0/+533
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: atmel: sama5d4ek: correct the typoBo Shen2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: atmel: sama5d4 xplained: correct the nameBo Shen2015-01-161-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the function and board name for sama5d4 xplained board. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: include some headers from barebox-arm.hMasahiro Yamada2015-01-141-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENTRY_FUNCTION() references __barebox_arm_head(), so <asm/barebox-arm-head.h> should be included from barebox-arm.h to avoid implicit declaration warning/error. ENTRY_FUNCTION() uses __naked, so <linux/compiler.h> should also be included. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/am335x'Sascha Hauer2015-02-042-0/+61
|\ \ \
| * | | ARM: dts: am335x-phytec-phyflex: Add USB host supportWadim Egorov2015-01-201-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB host support for the phyflex-som. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: dts: am335x-phytec-phycore-som: Add USB host supportWadim Egorov2015-01-201-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add USB host support for all phycore-som based boards. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | ARM: atmel: at91sam9n12ek: correct udc device nameBo Shen2015-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The created device name for atmel udc is at91_udc while not at91_udc0. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | ARM: atmel: sama5d4: nand: add has_pmecc parameterBo Shen2015-01-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the missing has_pmecc parameter for sama5d4 based boards. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | boards: remove hardcoded MAC addressesSascha Hauer2015-01-286-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be no hardcoded MAC addresses in the default environments. Remove them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | ARM: atmel: sama5d3xek: fix conflict between w1 and ledBo Shen2015-01-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the 1-wire and LED d2 use the same pin (PE25) on the EK board. So, make LED enable only when the 1-wire is disabled. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | ARM: atmel: sama5d4 xplained: fix mci1 power pinBo Shen2015-01-211-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Correct the mci1 power pin from PE15 to PE4. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / / arm: board: virt2real: build lowlevel in proper targetLucas Stach2015-01-191-1/+2
|/ / | | | | | | | | | | | | Fixes build with PBL enabled. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / defaultenv-2: fix misplace NV dir in envJean-Christophe PLAGNIOL-VILLARD2015-01-133-0/+0
|/ | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/mxs'Sascha Hauer2015-01-0944-254/+3759
|\
| * ARM: imx233-olinuxino: update defconfigJan Luebbe2015-01-071-28/+72
| | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: imx233-olinuxino: update defaultenvJan Luebbe2015-01-0711-87/+15
| | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: imx233-olinuxino: use LED1 as heartbeatJan Luebbe2015-01-071-0/+11
| | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: imx233-olinuxino: generate complete bootstreamJan Luebbe2015-01-053-63/+170
| | | | | | | | | | | | | | | | | | | | - Enable multi-image support to generate bootstream, sd-card and 2nd stage images. - Handle pin-mux in lowlevel.c only. - Use fine-tuned memory setup from u-boot. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm: mxs: fix pin voltage register value for EMIJan Luebbe2015-01-051-1/+1
| | | | | | | | | | | | | | | | The EMI pins are documented in the reference manual as using value 0 for both 1.8V and 2.5V. Value 1 is reserved. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MXS: Update Karo TX28 board supportSascha Hauer2015-01-054-68/+117
| | | | | | | | | | | | | | | | | | - enable multiimage support to generate bootstream, sd-card and 2nd stage images - Enable new defaultenv support - Enable more features Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MXS: Add multiimage supportSascha Hauer2015-01-052-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Freescale MXS SoCs have a multi staged boot process which needs different images composed out of different binaries. The ROM executes a so called bootstream which contains multiple executables. The first one is executed in SRAM and the purpose of this binary is to setup the internal PMIC and the SDRAM. The second image is usually the bootloader itself. In case of barebox the bootstream is composed out of the self extracting barebox image (pblx) and the prepare stage for setting up the SDRAM. The bootstream image itself is useful for USB boot, but for booting from SD cards or NAND a BCB header has to be prepended to the image. In case of SD boot the image has the .mxssd file extension in barebox. Since the bootstream images are encrypted they are not suitable for 2nd stage execution. For this purpose the 2nd stage images are generated. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MXS: Enable iomux support for pblSascha Hauer2015-01-051-0/+1
| | | | | | | | | | | | Upcoming lowlevel code for MXS needs the iomux setup functions Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MXS: Add more base address definesSascha Hauer2015-01-052-0/+6
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: Add get_sp() and get_lr() functionsSascha Hauer2015-01-051-0/+26
| | | | | | | | | | | | In case it's needed for some early code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 12:44:45 +0000