summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/misc'Sascha Hauer2013-02-0441-81/+421
|\
| * MAKEALL: add regex supportJean-Christophe PLAGNIOL-VILLARD2013-02-041-3/+13
| | | | | | | | | | | | | | this will allow to compile only a subset of defconfig Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * commands: reset: add shutdown_barebox() before reset_cpu()Antony Pavlov2013-01-301-0/+23
| | | | | | | | | | | | | | | | | | Some of controlled by barebox peripheral devices may be not affected by CPU reset, so we need call shutdown_barebox() to stop them. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm-mmu: switch pte flags vars to lower caseAlexander Aring2013-01-251-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | Old cache/uncache pte flags were declared as defines. Since these flags are determine at runtime they are static variables. This patch switch the naming style of these variables to lower case which is typically used for variables. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * introduce console none supportJean-Christophe PLAGNIOL-VILLARD2013-01-238-11/+107
| | | | | | | | | | | | | | | | | | | | | | | | this will allow to have no console support Use full for bootstrap as we can save 6.5 KiB (barebox.bin) and 3.8 KiB (zbarebox.bin lzo) on at91sam9263 as example vs console simple As on bootstrap we have often very limited size. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * console: switch select to choiceJean-Christophe PLAGNIOL-VILLARD2013-01-237-13/+17
| | | | | | | | | | | | | | so we can add easly the console_none support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * w1: add ds28ec20 eeprom supportJean-Christophe PLAGNIOL-VILLARD2013-01-212-13/+34
| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defaultenv-2: move ps1 to base/init/ps1Jean-Christophe PLAGNIOL-VILLARD2013-01-212-6/+9
| | | | | | | | | | | | | | so we can overwrite it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * tftp: reset timer on progressSascha Hauer2013-01-201-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | When during tftp receive operation a ACK packet can't successfully be sent the timer was resetted directly after send resulting in a deadlock. This patch changes the timer reset operation in a way that it is only resetted when the actually is progress, namely in the TFTP_ACK/TFTP_DATA pathes in the tftp handler. Reported-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Antony Pavlov <antonynpavlov@gmail.com>
| * bootm: move printing of file locations outside verbose modeSascha Hauer2013-01-181-8/+8
| | | | | | | | | | | | | | | | The location of files that are booted is a precious information, so print it by default and not only in verbose mode. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Michael Olbrich <m.olbrich@pengutronix.de>
| * barebox-data: add barebox-data sectionsAlexander Aring2013-01-189-0/+16
| | | | | | | | | | | | | | | | Add barebox-data section in arm branch to get complete barebox regions in sdram regions tree. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * common: add PAGE_ALIGN_DOWN macroAlexander Aring2013-01-181-0/+1
| | | | | | | | | | | | | | | | Add PAGE_ALIGN_DOWN macro, which is like PAGE_ALIGN macro but returns the lower page boundary of address. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm-mmu: move PAGE_ALIGN macro to common.hAlexander Aring2013-01-182-2/+1
| | | | | | | | | | | | | | | | | | | | PAGE_ALIGN macro is needed to align addresses to page boundaries. Move this macro to another PAGE_* defines. Commands which uses remap_range function needs this macro. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * remap_range: make function 'remap_range' globalAlexander Aring2013-01-189-1/+158
| | | | | | | | | | | | | | | | | | | | | | | | Change function remap_range in arm architecture to make it global accessable. For example command 'memtest' can change pte flags to enable or disable cache. Add dummy function for others architectures that doesn't have mmu or pte support. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * defaultenv-2: execute init/* before timeoutJean-Christophe PLAGNIOL-VILLARD2013-01-161-2/+10
| | | | | | | | | | | | | | so we can have splash, usb serial, etc... Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mips'Sascha Hauer2013-02-046-2/+40
|\ \
| * | MIPS: dlink-dir-320: use mips_add_ram0()Antony Pavlov2013-01-272-0/+13
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MIPS: rzx50: use mips_add_ram0()Antony Pavlov2013-01-272-0/+13
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MIPS: qemu-malta: use mips_add_ram0()Antony Pavlov2013-01-271-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | MIPS: introduce ram0 regions register functionAntony Pavlov2013-01-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MIPS there are two segments in CPU address space that can be used for untranslated memory access: KSEG0 and KSEG1. KSEG0 is used for cached access and KSEG1 is used for uncached one. The instroduced mips_add_ram0() function registers two address regions for memory access: one in KSEG0 and the other one in KSEG1. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/mci'Sascha Hauer2013-02-044-39/+38
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: drivers/mci/atmel_mci.c
| * | | mci: add card_write_protectedJean-Christophe PLAGNIOL-VILLARD2013-01-272-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no common way for the mci host driver to tell that thee car is write protected. This adds a card_write_protected callback which is used by the framework to tell whether it's protected or not. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci atmel: implement card_present callbackSascha Hauer2013-01-201-6/+15
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci i.MX esdhc: implement card_present callbackSascha Hauer2013-01-201-11/+3
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci: Add card_present callbackSascha Hauer2013-01-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no common way for the mci host driver to tell that there is no card present. This adds a card_present callback which is used by the framework to tell whether it's present or not. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci: Always add probe parameter for cardsSascha Hauer2013-01-201-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add the 'probe' parameter to cards so that scripts can rely on the parameter to be present. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci: return 0 for probe parameter even when already initializedSascha Hauer2013-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the behaviour more friendly to scripts which can now set the probe parameter without checking if it has been done before. Having a succesful result now means that there is a card. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/imx-usb-chipidea'Sascha Hauer2013-02-0411-12/+168
|\ \ \ \
| * | | | ARM i.MX6: Add Chipidea supportSascha Hauer2013-01-203-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to register the USB ports for the chipidea driver. For now the otg/h1 register functions also register the corresponding USB phys. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | USB: Add usb phy driver for i.MXSascha Hauer2013-01-203-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This phy is found on i.MX6 and i.MX23/28. Currently tested only on i.MX6. For now we take the easy way out. The phy is enabled upon registration. More elaborated handling can be added later. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM i.MX6: Add usbphy clocksSascha Hauer2013-01-201-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM i.MX6: Fix usb phy base addressesSascha Hauer2013-01-202-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What we had as usb phy1 base address is really usb phy2. Fix the names and add the missing base address definition for usb phy1. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM i.MX6 USB phy: Fix phy function namesSascha Hauer2013-01-203-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The imx6_usb_phy1* functions are misnamed. It's usb phy2 that is configured here, so rename the functions accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/imx'Sascha Hauer2013-02-0442-592/+341
|\ \ \ \
| * | | | defenv-2: migrate guf-vincell to config-boardMichael Olbrich2013-01-313-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: efika-mx-smartbook: clean up whitespacesAntony Pavlov2013-01-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: ccmx51: Update defconfigAlexander Shiyan2013-01-251-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: ccmx51js: Define reset pin for USB Host1Alexander Shiyan2013-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: ccmx51: Set MAC address before FEC device registrationAlexander Shiyan2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: ccmx51: Fix ethernet devices control by MC13892 GPOsAlexander Shiyan2013-01-231-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LAN9221 is eth1, FEC is eth0, so fix power/reset control by MC13892 GPOs. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: ccmx51: Remove SDRAM size settingsAlexander Shiyan2013-01-232-23/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes SDRAM memory size setting from board due to auto detect last one by ESDCTL. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Merge branch 'pu/imx-external-nand-boot' into for-next/imxSascha Hauer2013-01-2124-450/+138
| |\ \ \ \
| | * | | | ARM i.MX boards: use helper function for external NAND bootSascha Hauer2013-01-2020-439/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use helper function for external NAND boot to get some positive diffstat. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | | | ARM i.MX: Add a common NAND entry for external boot modeSascha Hauer2013-01-202-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern for i.MX boards starting in external NAND boot mode is always the same: - Check if we are running in NFC address space, if not call board_init_lowlevel_return() - copy binary to link address - execute relocated binary - call imx_nand_load_image() Add a common function for this to make the board code easier. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | Merge branch 'pu/tx25' into for-next/imxSascha Hauer2013-01-1810-69/+67
| |\ \ \ \ \
| | * | | | | ARM Ka-Ro Tx25: Switch to new environmentSascha Hauer2013-01-187-64/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update config for supporting external NAND boot. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | | | | ARM Ka-Ro TX25: Increase NAND partitionsSascha Hauer2013-01-182-3/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | i.MX27: fix shift amount for PCCR1_PERCLK3_ENDaniel Mierswa2013-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Mierswa <d.mierswa@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | i.MX21/27: don't enable lcd bus clocks too earlyDaniel Mierswa2013-01-174-14/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the MX27 based board phycard-i.MX27 the display won't properly come up. Before removing imx-regs.h and the code that sets the register in the i.MX video driver, the PCCR registers were set _after_ the screen start (LSSAR) was set. This restores that old behaviour and makes the display come up properly again. I did not have a chance to test this on any other i.MX27 or i.MX21 hardware though I assume that the "old" order is required there too. Signed-off-by: Daniel Mierswa <d.mierswa@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | | i.MX21: Add periph. clock register name macrosDaniel Mierswa2013-01-172-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also put those names solely in the .c file as it's done with the i.MX27 code. Signed-off-by: Daniel Mierswa <d.mierswa@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 20:18:31 +0000