summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Release v2012.05.0v2012.05.0Sascha Hauer2012-05-031-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* uimage/file_to_sdram: fix resource allocationSascha Hauer2012-05-021-1/+5
| | | | | | | | | | | file_to_sdram is used to load an initrd. The resource size is then used to pass the initrd size to Linux. This means that the resource size must exactly match the initrd size. Currently this is not the case since we request the sdram region in chunks of 8 Kbytes. Fix this by adjusting the resource size when the file is loaded. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* hush: bail out of scripts on syntax errorSascha Hauer2012-05-021-1/+3
| | | | | | | | | | | | | | On a systax error we have to bail out of the shell instead of setting inp->p to NULL and crash barebox with a NULL pointer deref. This only happened in scripts. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> This fixes the problem I had (i.e. a boot loop caused by a stray fi in /env/bin/init). Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* bootm: fix initrd handlingSascha Hauer2012-05-021-14/+10
| | | | | | | | bootm_initrd tests for data->initrd, but this never becomes true because the setting of data->initrd is inside a if(bootm_initrd()). Fix this. Also, do not support the initrd options when initrd is disabled. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge tag 'j-master-fixes' of git://git.jcrosoft.org/bareboxSascha Hauer2012-04-305-11/+18
|\ | | | | | | | | | | | | | | Master Fixes usb driver name (driver_d) Menu fixes
| * menu: fix menu alloc initJean-Christophe PLAGNIOL-VILLARD2012-04-251-0/+1
| | | | | | | | | | | | The auto_select is supposed to be set to -1. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * menu: fix support for "\n", "\n\r" and "\r"Jean-Christophe PLAGNIOL-VILLARD2012-04-251-1/+7
| | | | | | | | | | | | If "\n\r" or "\r\n" is ignore one. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * menu: fix non command management supportJean-Christophe PLAGNIOL-VILLARD2012-04-251-8/+9
| | | | | | | | | | | | the auto select is always available Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * menu: fix double action when "\n\r" or "\r\n" is receivedJean-Christophe PLAGNIOL-VILLARD2012-04-251-2/+1
| | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * usb: fix driver nameJean-Christophe PLAGNIOL-VILLARD2012-04-252-1/+1
| | | | | | | | | | | | | | | | use the usb_driver name otherwise we will have a NULL driver entry in devinfo Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | common: memory: fix off-by-one in tlsf_createMarc Kleine-Budde2012-04-241-1/+1
|/ | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* tny-a926x: fix MOB-TNY-MD2 Motherboard supportJean-Christophe PLAGNIOL-VILLARD2012-04-245-37/+17
| | | | | | | | | | | | | | | | | The MD2 add: - uart 2 - ethernet - usb - spi - i2c so fix just add uart and ethernet update defconfig always enable the motherboard and drop the SHA256 support (to fix in the 256KiB). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* at91: at91_register_uart use number instead of IDsJean-Christophe PLAGNIOL-VILLARD2012-04-245-45/+20
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* mtd: docg3 fixes backport from Linux kernelRobert Jarzmik2012-04-171-13/+23
| | | | | | | | | | | | | | Backport 2 fixes back from Linux kernel (title verbatim from Linux kernel log) : - docg3 fix in-middle of blocks reads - docg3 reduce read alignment burden These 2 enable partial reads from the MTD (ie. read only the 111 first bytes), which enable linux kernel booting or UBIFS from barebox. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci poweron ramp delayRobert Jarzmik2012-04-171-0/+1
| | | | | | | | | | | | As per MMC spec, once power has been applied to an SD card, the card can take as much as 250ms to complete its power-up cycle, and become responsive to CMD0. When this delay was not in place, activating the SD card in the env init failed sometimes. With it, no more failure are observed. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci fix R1b responsesRobert Jarzmik2012-04-171-2/+6
| | | | | | | | | | | | | The pxamci driver was not waiting for the BUSY line to be deasserted. This was specifically breaking the CMD12 at the end of block multiple writes, when the SD card had not time enough to commit the last write. Fix it by waiting for PRG_DONE bit (which is actually the busy signal end condition). Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci fix CMD12 handlingRobert Jarzmik2012-04-172-0/+4
| | | | | | | | | | The pxamci requires a bit to be set in the command control register when a CMD12 is sent. Set it, as required in the PXA Developer Manuel, chapter "Stop Data Transmission Command (CMD12 or IO/Abort with CMD52)". Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci fix response typeRobert Jarzmik2012-04-171-4/+5
| | | | | | | | | When preparing a command, apply a mask so that only the command part will be used for the switch case. This will be more robust for future command response types. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci change clocks handlingRobert Jarzmik2012-04-171-4/+3
| | | | | | | | | | | Fix clock handling accordingly to PXA manual : - enable the MMC controller clock once and for all - only disable the MMC bus clock when changing the MMCLK by adjusting the clock ratio, else let the controller and SD card shut down the clock as the see fit. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mci: pxamci define timeoutsRobert Jarzmik2012-04-171-8/+13
| | | | | | | | | Instead of using hard encoded values in the code, use defines to setup the timeouts of reads/writes/commands. Fix the read timeout as defined in the PXA Developer Manual. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* filetype: Make it work on files < 512 bytesSascha Hauer2012-04-171-2/+2
| | | | | | | This is a brown paper bag type of bugs. Do not assume that a file has to be at minimun 512 bytes to be detectable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* addpart: remove duplicate line in help textSascha Hauer2012-04-141-1/+0
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* menuconfig: Show "Barebox", not "Linux" at the top.Uwe Hermann2012-04-131-1/+1
| | | | | | | | The menuconfig configures Barebox, not the Linux kernel, so no reason to print "Linux" there. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* defaultenv/update: fix dhcp-barebox supportJean-Christophe PLAGNIOL-VILLARD2012-04-111-1/+1
| | | | | | | call dhcp when ip mode is dhcp-barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Define barebox_loc magic variable only onceAlexander Shiyan2012-04-101-3/+1
| | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'work/cfi-fixes'Sascha Hauer2012-04-101-6/+14
|\
| * cfi flash: Fix alignment problemSascha Hauer2012-04-051-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intel cfi buffer write has a problem with writing when the alignment of the buffer in memory is smaller than the flash bus width. This patch fixes a alignment problem which may show during this scenario: - 32 or 64 attached NOR flash - flashing an image directly from network to the nor flash The involved network driver is "smc9111.c". The data that comes from the network stack and should be written into the flash isn't 32 bit aligned (at least with this network driver). This is probably due to the 48 bit wide ethernet addresses. However the "cfi_flash.c" driver doesn't handle this situation, and accesses the not-aligned address with a 32 bit pointer. This patch fixes the problem by reducing the access width if an aligment problem between source and destination is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * cfi flash: Fix loop count calculationSascha Hauer2012-04-051-1/+1
| | | | | | | | | | | | | | | | 'reduce the number of loops by the width of the port' means a simple len / width. Do not try to be clever by shifting and doing it wrong. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | at91rm9200ek: set maximum nor flash sizeJean-Christophe PLAGNIOL-VILLARD2012-04-101-1/+2
| | | | | | | | | | | | | | it's 8MiB. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Fixup DRIVER_VIDEO_S3C24XX usage.Uwe Hermann2012-04-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | From c67445d601c9332fabb71df8e41367fc104e1ac1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann <uwe@hermann-uwe.de> Date: Fri, 6 Apr 2012 20:07:12 +0200 DRIVER_VIDEO_S3C was renamed to DRIVER_VIDEO_S3C24XX recently. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Juergen Beisert <jbe@pengutronix.de>
* | PCM-038: fix SRAM device nameAlexander Shiyan2012-04-101-1/+1
| | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | at91sam9g45_devices: fix warningEric Bénard2012-04-051-2/+2
| | | | | | | | | | | | | | | | | | this patch fix the following warnings : arch/arm/mach-at91/at91sam9g45_devices.c:305:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] arch/arm/mach-at91/at91sam9g45_devices.c:309:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | fix mxs iomux error in mx23 caseEric Bénard2012-04-051-0/+4
| | | | | | | | | | | | | | | | | | | | e62edd3 mxs: Fix support for BITKEEPER() macro added this macro in iomux-imxc.c but the macro is not present in the i.MX23 case. Adding it in iomux-imx23.h fix both imx23evk_defconfig and chumbyone_defconfig Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | imx27-regs: fix .h usage in assembly fileEric Bénard2012-04-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | 7ab0a0a i.MX27: Added helper for setup chipselect control register added an helper which triggers the following error : arch/arm/mach-imx/include/mach/imx27-regs.h:243: Error: bad instruction `static inline void imx27_setup_weimcs(size_t cs,unsigned upper,unsigned lower,unsigned addional)' This patch fix this problem. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'next'Sascha Hauer2012-04-05177-1225/+5676
|\|
| * net: ping: do not retry endlesslyWolfram Sang2012-04-051-0/+7
| | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: tftp: do not retry endlesslyWolfram Sang2012-04-051-0/+10
| | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: arp_request: do not retry endlesslyWolfram Sang2012-04-052-0/+7
| | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: tftp: check for error when retryingWolfram Sang2012-04-051-1/+3
| | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: ping: remove unneeded initializationWolfram Sang2012-04-051-1/+1
| | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: ping: send PING packets with 1-second intervalWolfram Sang2012-04-051-1/+2
| | | | | | | | | | | | | | Like standard ping does by default. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX5x: Unused pll definitions removedAlexander Shiyan2012-04-041-39/+0
| | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX51: Removed 1000 MHz pll definitionAlexander Shiyan2012-04-041-1/+0
| | | | | | | | | | | | | | i.MX51 operates at speeds up to 800 MHz. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX51: Use register names for imx_gpio_baseAlexander Shiyan2012-04-041-4/+4
| | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * net: env: getenv_ip use resolvJean-Christophe PLAGNIOL-VILLARD2012-04-033-5/+12
| | | | | | | | | | | | | | Introduce getenv_ip_dns to be able to do not do the resolv when using it in resolv for the nameserver (Do not loop). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * net: dhcp: allow to set transmitted user classJean-Christophe PLAGNIOL-VILLARD2012-04-031-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For net boot setups it is useful to submit boot params like server or bootfile over dhcp. To distinguish diffrent type of OS running on the same hardware, a custom vendor id can be sent in dhcp discover/request messages. E.g. the ISC dhcp server can be configured with | option client-uuid code 97 = { unsigned integer 8, string }; | class "at91sam9x5ek" { | match if substring (option vendor-class-identifier,0,20) = "barebox-at91sam9x5ek"; | | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage"; | if substring (option dhcp-client-identifier,0,7) = "ser2net" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net"; | } | if substring (option client-uuid,0,7) = "test" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net"; | } | if substring (option user-class,0,4) = "toto" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-toto"; | } | option tftp-server-name "192.168.200.98"; | option option-150 192.168.200.98; | next-server 192.168.200.98; | option root-path "192.168.200.98:/opt/work/buildroot/build/sam9x5/target"; | } Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * net: dhcp: allow to set transmitted client uuidJean-Christophe PLAGNIOL-VILLARD2012-04-031-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For net boot setups it is useful to submit boot params like server or bootfile over dhcp. To distinguish diffrent type of OS running on the same hardware, a custom client uuid can be sent in dhcp discover/request messages. E.g. the ISC dhcp server can be configured with | option client-uuid code 97 = { unsigned integer 8, string }; | class "at91sam9x5ek" { | match if substring (option vendor-class-identifier,0,20) = "barebox-at91sam9x5ek"; | | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage"; | if substring (option dhcp-client-identifier,0,7) = "ser2net" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net"; | } | if substring (option client-uuid,0,7) = "test" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net"; | } | option tftp-server-name "192.168.200.98"; | option option-150 192.168.200.98; | next-server 192.168.200.98; | option root-path "192.168.200.98:/opt/work/buildroot/build/sam9x5/target"; | } Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * net: dhcp: allow to set transmitted client idJean-Christophe PLAGNIOL-VILLARD2012-04-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For net boot setups it is useful to submit boot params like server or bootfile over dhcp. To distinguish diffrent type of OS running on the same hardware, a custom client id can be sent in dhcp discover/request messages. E.g. the ISC dhcp server can be configured with | class "at91sam9x5ek" { | match if substring (option vendor-class-identifier,0,20) = "barebox-at91sam9x5ek"; | | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage"; | if substring (option dhcp-client-identifier,0,7) = "ser2net" { | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage-ser2net"; | } | option tftp-server-name "192.168.200.98"; | option option-150 192.168.200.98; | next-server 192.168.200.98; | option root-path "192.168.200.98:/opt/work/buildroot/build/sam9x5/target"; | } Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * net: dhcp: factorise setting option codeJean-Christophe PLAGNIOL-VILLARD2012-04-031-34/+87
| | | | | | | | | | | | This will allow to add more easly new option with less impact in the binary. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * net: dhcp: add support of tftp name serverJean-Christophe PLAGNIOL-VILLARD2012-04-031-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the DNS is enable resolve it. The server ip will be set if no server ip it is set in the bootp. Export it via env dhcp_tftp_server_name. E.g. the ISC dhcp server can be configured with | class "at91sam9x5ek" { | match if substring (option vendor-class-identifier,0,20) = "barebox-at91sam9x | | filename "/tftpboot/atmel/at91sam9x5/sam9x5ek/zImage"; | option tftp-server-name "192.168.200.98"; | option root-path "192.168.200.98:/opt/work/buildroot/build/sam9x5/target"; | } | } Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 08:39:03 +0000