summaryrefslogtreecommitdiffstats
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* switch all platform_bus device/driver registering to ↵Jean-Christophe PLAGNIOL-VILLARD2012-10-041-1/+1
| | | | | | | | platform_driver/device_register now register_driver and register_device are for bus only usage. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-next/defaultenv-deps'Sascha Hauer2012-10-031-12/+20
|\
| * environment generation: Fix dependenciesSascha Hauer2012-09-281-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dependencies for generating the environment do not work properly: - If files are removed from the defaultenv, a subsequent make will not update the default environment. - If CONFIG_DEFAULT_ENVIRONMENT_PATH changes, the default environment also will not be regenerated. This patch fixes this by introducing a cmd_env which has the content of $(ENV_FILES) in the command so that the if_changed mechanism recognizes a change when $(ENV_FILE) changes. This also results in a nice " ENV " string in the build process. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * environment generation: remove unused CLEAN_FILESSascha Hauer2012-09-281-4/+0
| | | | | | | | | | | | | | The CLEAN_FILES in common/Makefile are unused. All generated files are removed from the toplevel Makefile. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/arm-remove-arch-init-ll'Sascha Hauer2012-10-031-3/+0
|\ \ | | | | | | | | | | | | Conflicts: arch/arm/include/asm/barebox-arm.h
| * | ARM: remove ARCH_HAS_LOWLEVEL_INITSascha Hauer2012-09-251-3/+0
| |/ | | | | | | | | | | | | | | This is unused now and not needed. We have a board_init_lowlevel. If a board needs some architecture setup it can always call it from its board_init_lowlevel. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/remove-fsf-address'Sascha Hauer2012-10-0326-92/+0
|\ \ | | | | | | | | | | | | | | | Conflicts: drivers/net/miidev.c include/miidev.h
| * | Treewide: remove address of the Free Software FoundationSascha Hauer2012-09-1726-92/+0
| |/ | | | | | | | | | | | | The FSF address has changed in the past. Instead of updating it each time the address changes, just drop it completely treewide. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/png'Sascha Hauer2012-10-031-0/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: common/filetype.c include/filetype.h
| * | filetype: add PNG supportJean-Christophe PLAGNIOL-VILLARD2012-09-121-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | filetype: add BMP supportJean-Christophe PLAGNIOL-VILLARD2012-09-121-0/+3
| |/ | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/openrisc'Sascha Hauer2012-10-031-0/+2
|\ \
| * | Add OpenRISC Image typeFranck Jullien2012-09-141-0/+2
| |/ | | | | | | | | | | | | | | This patch sync the image type list with the kernel in order to add openrisc support. Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/omap'Sascha Hauer2012-10-031-1/+1
|\ \ | | | | | | | | | | | | Conflicts: Makefile
| * | xload: get barebox size from barebox_arm_headJan Weitzel2012-09-071-1/+1
| |/ | | | | | | | | | | | | | | | | Add functions to read the barebox_arm_head, check barebox magicword and read out the barebox image size. Create a inital partion of 1Mb to access the barebox image on nand. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2012-10-034-21/+28
|\ \
| * | common: split out meminfo output and make it optionalJan Luebbe2012-09-064-21/+28
| |/ | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/fat-detection'Sascha Hauer2012-10-031-12/+56
|\ \
| * | filetype: Improve FAT detectionFranck Jullien2012-09-201-12/+56
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We may have some disk with MBR as a first sector. In this case, the current FAT check returns an error. However, the FAT sector exist and the MBR can tell us where it is. This patch add to file_name_detect_type function the ability to find the FAT boot sector on the first sector of the first partition in case it is not on sector 0. It also introduce is_fat_or_mbr to check if a buffer is a FAT boot or MBR sector Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/boot-sequence-dhcp'Sascha Hauer2012-10-032-0/+11
|\ \ | | | | | | | | | | | | Conflicts: drivers/net/miidev.c
| * | defaultenv: enable glovalvar supportJean-Christophe PLAGNIOL-VILLARD2012-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | This will allow to do not have 2 set of var for defaultenv and the new defaultenv-2. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | globalvar: add support to set a value to of all globalvars beginning with ↵Jean-Christophe PLAGNIOL-VILLARD2012-09-141-0/+10
| |/ | | | | | | | | | | | | | | 'match' via c global_set_match and global -r Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* / of: add devicetree probing supportSascha Hauer2012-09-141-2/+2
|/ | | | | | | This adds code to probe devices from a devicetree. Most helper functions are directly imported from Linux. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/pbl'Sascha Hauer2012-09-051-0/+44
|\
| * compressed image: add gzip supportJean-Christophe PLAGNIOL-VILLARD2012-08-031-0/+4
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * Add compressed image supportJean-Christophe PLAGNIOL-VILLARD2012-08-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for creating a lzo compressed binary unsing the pbl. Only copy the piggydata if needed. Add CONFIG_PBL_FORCE_PIGGYDATA_COPY option In some case we need to copy the PIGGYDATA as the link address as example we run from SRAM and shutdown the SDRAM/DDR for reconfiguration but most of the time we just need to copy the executable code. based on Sascha Hauer Add compressed image support Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * Add pre-bootloader (pbl) image supportJean-Christophe PLAGNIOL-VILLARD2012-08-031-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for creating a pre-bootloader binary for - nand boot - mmc boot - compressed image The pbl will be incharge of the lowlevel init if needed. The barebox will skip it. Import string functions from linux 3.4 (arch/arm/boot/compressed/string.c) and implement a dummy panic. For now on introduce dummy zbarebox* targets and c code that will contain later the decompressor. This only implemeted on ARM. This patch is based on Sascha Hauer <s.hauer@pengutronix.de> Add compressed image support patch Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Merge branch 'for-next/menu'Sascha Hauer2012-09-051-0/+17
|\ \
| * | menu: add number key supportJean-Christophe PLAGNIOL-VILLARD2012-08-091-0/+17
| |/ | | | | | | | | | | | | | | Allow to use the number key to jump to entry. if already on a entry % number_key jump to the next +10 one if exit Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/link'Sascha Hauer2012-09-052-39/+113
|\ \
| * | defautenv: add support of symlinkJean-Christophe PLAGNIOL-VILLARD2012-09-051-1/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | envfs: add support of symlinkJean-Christophe PLAGNIOL-VILLARD2012-09-051-30/+73
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | envfs: add support of variable inode sizeJean-Christophe PLAGNIOL-VILLARD2012-09-051-12/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a struct envfs_inode_end with more data. Today this will just containt the file mode to be able to add the symlink support. But this is compatible with the previous envfs version as they will do not care about the extra as the previous version is just reading the filename and then consume the extra data without using them. Increase the envfs version to 1.0 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | envfs: introduce version major and minorJean-Christophe PLAGNIOL-VILLARD2012-09-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | they are store in the super block at byte 16th and 17th. set the verison at 0.1 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | Merge branch 'for-next/hush'Sascha Hauer2012-09-052-27/+38
|\ \ \
| * | | hush: catch errors from execute_binfmtSascha Hauer2012-08-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | execute_binfmt may return negative return values which hush interprets as 'exit'. Catch this and print an error message instead. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | hush: Make exit a shell builtinSascha Hauer2012-08-102-25/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'exit' used to do its job by returning value < 0. This is a sign for hush that 'exit' is executed. This has problems: - Often commands accidently return a negative value. This causes the shell to exit. - execute_binfmt returns a negative value when it does not find a binary to execute. This again causes the shell to exit. Returning a negative error value seems to be the right thing to do, but catching this in the shell would mean that the exit command does not work anymore. - if called without arguments exit is supposed to return the code of the last command. As a command exit has no access to this code. This patch changes exit to be a builtin and also fixes the last return code problem. While at it, update the help text. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | filetype: add fat filesystem supportJean-Christophe PLAGNIOL-VILLARD2012-09-041-0/+20
| |/ |/| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | uimage_laod: fix ramdisk supportJean-Christophe PLAGNIOL-VILLARD2012-08-131-1/+2
| | | | | | | | | | | | ramdisk U-Boot expect to ignore the compression type Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | uimage_sdram_flush: fix resource startJean-Christophe PLAGNIOL-VILLARD2012-08-131-1/+2
|/ | | | | | The start is the start of the previous resource nor the size of it. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'for-next/reset-source'Sascha Hauer2012-08-013-0/+53
|\
| * Enable a way to provide the reason for "being here"Juergen Beisert2012-07-183-0/+53
| | | | | | | | | | | | | | | | | | | | Many architectures support a way to detect why the bootloader is running. This patch adds a global variable to be able to use the cause in some kind of shell code to do special things on demand. For example to do an emergency boot, when the last boot fails and the watchdog reactivate the hanging system. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/randconfig'Sascha Hauer2012-08-012-2/+7
|\ \
| * | uimage: select uncompress and crc32 supportSascha Hauer2012-07-251-0/+2
| | | | | | | | | | | | | | | | | | uImage support needs both. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | uimage: introduce UIMAGE Kconfig symbolSascha Hauer2012-07-252-2/+5
| |/ | | | | | | | | | | | | Both the uimage command and the bootm command need uImage support, so add a Kconfig symbol for it to be able to select it properly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2012-08-011-0/+5
|\ \
| * | stddev: make it selectable via KconfigJean-Christophe PLAGNIOL-VILLARD2012-07-251-0/+5
| |/ | | | | | | | | | | | | | | | | | | enable is by default for simple and hush we do not need to NO_SHELL this allow to save 1KiB Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/defenv-2'Sascha Hauer2012-08-012-1/+5
|\ \
| * | defenv-2: improve boot scriptSascha Hauer2012-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add usage information - add option parsing: -v verbose -v -v more verbose -l list b´possible boot sources -d dryrun The dryrun option sets the global variables necessary for booting but does not actually boot the system. This way it is possible to make additional adjustments to the boot variables and then invoke bootm manually. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | hush getopt: shift argv argumentsSascha Hauer2012-07-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Make the nonopt arguments to a script available starting from $1 after running getopt. This allows for scripts which use option parsing but also have nonopts. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>