summaryrefslogtreecommitdiffstats
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* partitions: dos: fix memory leak in nt disk signatureSascha Hauer2013-06-191-0/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/of'Sascha Hauer2013-06-021-6/+15
|\
| * bootm: print Kernel commandline in verbose modeSascha Hauer2013-05-311-0/+15
| | | | | | | | | | | | | | Without devicetree support we print the Kernel commandline in verbose mode. Do the same with devicetree boot aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * of: remove unused defineSascha Hauer2013-05-311-6/+0
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/block'Sascha Hauer2013-06-025-11/+122
|\ \
| * | partition: DOS: Add parameter for the NT disk SignatureSascha Hauer2013-06-021-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NT disk Signature is a unique 32-bit value in the MBR allowing to identify a MSDOS partitioned disk. The signature can be used to specify the Linux rootfs. This patch adds support for the NT disk Signature in the form of a device parameter which can both be read and written. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | partitions: Add missing depends on BLOCKSascha Hauer2013-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | The disk partitions use blockdevice functions, so add the corresponding depends on BLOCK. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | block: implement block_read/block_write functionsSascha Hauer2013-05-313-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers use blk->ops->read/write. This bypasses the caching block layer and was never intended like this. The upper API to the block layer is the cdev layer. This patch adds block_read and block_write functions and uses them where appropriate. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | block: rename file operation functionsSascha Hauer2013-05-311-8/+8
| | | | | | | | | | | | | | | | | | | | | block_read and block_write collide with a to-be-introduced global function, so rename the file operation functions. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2013-06-022-3/+3
|\ \ \ | |/ / |/| |
| * | treewide: Fix typo seperate -> separateSascha Hauer2013-05-212-3/+3
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / make: Add barebox_default_env.* to targetsSascha Hauer2013-05-251-0/+2
|/ | | | | | Otherwise it gets rebuilt everytime. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/param'Sascha Hauer2013-05-061-18/+8
|\ | | | | | | | | Conflicts: drivers/mci/mci-core.c
| * console: Use dev_add_param_int for baudrate parameterSascha Hauer2013-04-111-18/+8
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/memory-commands'Sascha Hauer2013-05-062-0/+65
|\ \
| * | memory commands: move memory_display to separate fileSascha Hauer2013-04-172-0/+65
| |/ | | | | | | | | | | | | | | memory_display is a function which should generally be available. Currently it depends on memory command support being compiled in, so move the function to a separate file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | common/partition: check only for partition table typesHubert Feurstein2013-04-291-2/+2
| | | | | | | | | | | | | | | | The detection of the partition table fails when we have a barebox image in the MBR. So check only for partition table types. Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | common/filetype: move partition-table detection into own functionHubert Feurstein2013-04-291-12/+24
|/ | | | | Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/relocate'Sascha Hauer2013-04-041-1/+1
|\ | | | | | | | | Conflicts: arch/arm/lib/barebox.lds.S
| * ARM: Add relocatable binary supportSascha Hauer2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For making the same binary executable on different SoCs which have different DRAM addresses we have to be independent of the compile time link address. This patch adds relocatable binary support for the ARM architecture. With this two new functions are available. relocate_to_current_adr will fixup the binary to continue executing from the current position. relocate_to_adr will copy the binary to a given address, fixup the binary and continue executing from there. For the PBL and the real image relocatable support can be enabled independently. This is done to (hopefully) better cope with setups where the PBL runs from SRAM or ROM and the real binary does not. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/pr_print'Sascha Hauer2013-04-043-11/+11
|\ \
| * | barebox_banner: switch to pr_infoJean-Christophe PLAGNIOL-VILLARD2013-03-091-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | startup: switch to pr_xxxJean-Christophe PLAGNIOL-VILLARD2013-03-091-4/+4
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | meminfo: switch to pr_xxxJean-Christophe PLAGNIOL-VILLARD2013-03-091-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | startup: switch to pr_xxxJean-Christophe PLAGNIOL-VILLARD2013-03-091-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/oftree'Sascha Hauer2013-04-042-340/+44
|\ \ \
| * | | of: remove unused libfdtSascha Hauer2013-03-062-176/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we are completely independent of libfdt remove the unused code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM bootm: Switch initrd support to unflattened treeSascha Hauer2013-03-061-66/+0
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of: memory: Use of_write_numberSascha Hauer2013-03-061-19/+6
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of: fixup unflattened devicetreeSascha Hauer2013-03-062-82/+36
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of: Pass barebox internal format devicetree to of_get_fixed_treeSascha Hauer2013-03-061-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With this every devicetree is first converted to the barebox internal format before it's converted back to dtb again. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of: make flatten independent of libfdtSascha Hauer2013-03-061-1/+7
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/misc-arm'Sascha Hauer2013-04-042-2/+2
|\ \ \ \
| * | | | include asm/sections.h instead of asm-generic/sections.hSascha Hauer2013-03-102-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | To let the architectures override asm-generic/sections.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/misc'Sascha Hauer2013-04-041-2/+0
|\ \ \ \
| * | | | tlsf_malloc: drop duplicate includeJean-Christophe PLAGNIOL-VILLARD2013-03-071-2/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | config.h is not need and already inclued by Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | bootsource: add definition for i2c-eeprom, spi-nor, spi-eeprom and usbMarc Kleine-Budde2013-04-041-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | bootsource: add support for bootsource instance informationMarc Kleine-Budde2013-04-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a C interface to set and get the bootsource instance: int bootsource_get_instance(void); void bootsource_set_instance(int instance); Also export the shell variable "bootsource_instance". Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | bootsource: use initcall to export bootsource location to environmentMarc Kleine-Budde2013-04-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the bootsource is exported to the environment, even if unknown. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | bootsource: create arch independent bootsource frameworkMarc Kleine-Budde2013-04-042-0/+54
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch seperates the imx independent from the arch independent code. The following functions and enums are renamed: - imx_bootsource() -> bootsource_get() - imx_set_bootsource() -> bootsource_set() - enum imx_bootsource -> enum bootsource Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | dummy malloc: Add licence headerSascha Hauer2013-03-081-0/+23
|/ / | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / defaultenv-2: add boot sequenceJean-Christophe PLAGNIOL-VILLARD2013-03-051-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to boot a sequence of boot entries until one succeeds. boot sources can be passed in $global.boot.default, which is now treated as a list. Also a list of boot entries can be specified as arguments to the boot script. The entries can be: - a plain filename from /env/boot/ - a full path to an arbitrary file - a directory containing boot entries With this this command: boot net nand-ubi /env/boot.d would first use the /env/boot/net entry, if this fails the /env/boot/nand-ubi entry and if this also fails the files from /env/boot.d/ (which could also be links to boot scripts) To make the above the default, global.boot.default would be specified as: global.boot.default="net nand-ubi /env/boot.d" 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 Hauer2013-03-041-0/+40
|\
| * env: add register_persistent_environmentEric Bénard2013-02-211-0/+40
| | | | | | | | | | | | | | | | - heavily copied from register_persistant_environment which was Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/misc'Sascha Hauer2013-03-041-1/+23
|\ \
| * | hush: implement $*Sascha Hauer2013-02-261-0/+21
| | | | | | | | | | | | | | | | | | To get all arguments a script is called with. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | hush: add getopt only if it enabledAlexander Aring2013-02-111-1/+2
| |/ | | | | | | | | | | | | | | | | This patch add getopt to the command list if it enabled via Kconfig. With this patch we get a 'command not found' error. Otherwise getopt doing nothing. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/highbank'Sascha Hauer2013-03-041-0/+27
|\ \
| * | of: add do_fixup_by_compatible with u32 and string versionJean-Christophe PLAGNIOL-VILLARD2013-03-031-0/+27
| | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/gpt'Sascha Hauer2013-03-0410-108/+906
|\ \ \