diff options
| -rw-r--r-- | CHANGELOG | 783 | ||||
| -rw-r--r-- | board/a3000/a3000.c | 1 | ||||
| -rw-r--r-- | board/amirix/ap1000/ap1000.c | 1 | ||||
| -rw-r--r-- | board/ap325rxa/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/mucmc52/mucmc52.c | 68 | ||||
| -rw-r--r-- | board/purple/purple.c | 1 | ||||
| -rw-r--r-- | board/samsung/smdk6400/lowlevel_init.S | 32 | ||||
| -rw-r--r-- | board/sh7785lcr/config.mk | 1 | ||||
| -rw-r--r-- | board/sh7785lcr/lowlevel_init.S | 1 | ||||
| -rw-r--r-- | board/sh7785lcr/rtl8169.h | 1 | ||||
| -rw-r--r-- | board/sh7785lcr/rtl8169_mac.c | 1 | ||||
| -rw-r--r-- | board/sh7785lcr/selfcheck.c | 1 | ||||
| -rw-r--r-- | board/sh7785lcr/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/sl8245/sl8245.c | 1 | ||||
| -rw-r--r-- | board/stxssa/stxssa.c | 1 | ||||
| -rw-r--r-- | cpu/mcf52x2/cpu.c | 1 | ||||
| -rw-r--r-- | cpu/mpc8xxx/ddr/main.c | 30 | ||||
| -rw-r--r-- | doc/README.mx31 | 2 | ||||
| -rw-r--r-- | doc/README.qemu_mips | 8 | ||||
| -rw-r--r-- | doc/README.sh7785lcr | 1 | ||||
| -rw-r--r-- | include/linux/list.h | 22 | ||||
| -rw-r--r-- | include/netdev.h | 1 | ||||
| -rw-r--r-- | include/tsec.h | 2 | ||||
| -rw-r--r-- | lib_generic/lzma/LGPL.txt | 22 | ||||
| -rw-r--r-- | lib_generic/lzma/history.txt | 86 | ||||
| -rw-r--r-- | lib_generic/lzma/lzma.txt | 128 |
26 files changed, 981 insertions, 217 deletions
@@ -1,3 +1,721 @@ +commit 0c32565f536609d78feef35c88bbc39d3ac53a73 +Author: Peter Tyser <ptyser@xes-inc.com> +Date: Wed Sep 10 09:18:34 2008 -0500 + + Update mailing list email and archive addresses + + Signed-off-by: Peter Tyser <ptyser@xes-inc.com> + +commit fb661ea444ae61de60520f66ae84cdb5dd5a3246 +Author: u-boot@bugs.denx.de <u-boot@bugs.denx.de> +Date: Thu Sep 11 15:40:01 2008 +0200 + + 85xx: socrates: autoprobe Lime chip + + This patch is an attempt to implement autoprobing for the Lime + presence on the bus. + Configure GPCM for Lime CS2 and try to access chip ID registers. + Second read atempt delivers register values if the chip is present. + + Signed-off-by: Anatolij Gustschin <agust@denx.de> + +commit e99b607a5ec56ce66e0bcccb78480d5e16fb7bc5 +Author: u-boot@bugs.denx.de <u-boot@bugs.denx.de> +Date: Thu Sep 11 15:40:01 2008 +0200 + + 85xx: socrates: Add support for new image format. + + Signed-off-by: Detlev Zundel <dzu@denx.de> + +commit 3c094b652d4107b34641f300a8e9fe16ca15e3d8 +Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> +Date: Thu Sep 11 17:28:18 2008 +0900 + + sh: Fix compile error for r2dplus + + netdev.h was not include by r2dplus. + + Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> + +commit 56844a22b76c719e600047e23b80465a44d76abd +Author: Heiko Schocher <hs@denx.de> +Date: Thu Sep 11 08:11:23 2008 +0200 + + powerpc: Fix bootm to boot up again with a Ramdisk + + Commit 2a1a2cb6 didnt remove the dummy mem reservation in fdt_chosen, + and this stopped Linux from booting with a Ramdisk. This patch fixes + this, by deleting the useless dummy mem reservation. + + When booting with a Ramdisk, a fix offset FDT_RAMDISK_OVERHEAD is now + added to of_size, so we dont need anymore a dummy mem reservation. + + I measured the value of FDT_RAMDISK_OVERHEAD on a MPC8270 based + system (=0x44 bytes) and rounded it up to 0x80). + + Signed-off-by: Heiko Schocher <hs@denx.de> + Acked-by: Kumar Gala <galak@kernel.crashing.org> + +commit fc9c1727b5b3483ce49c3cb668e8332fb001b8a7 +Author: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com> +Date: Mon Sep 8 02:46:13 2008 +0200 + + Add support for LZMA uncompression algorithm. + + Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com> + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 0008b6d968160abe2bfd936493f3a516a7c8da20 +Author: Anton Vorontsov <avorontsov@ru.mvista.com> +Date: Fri Jun 27 23:04:20 2008 +0400 + + fsl_elbc_nand: ecclayout cleanups + + This patch deletes oobavail assignments, they're calculated by the nand + core code in nand_scan_tail, plus current oobavail values are wrong for + the LP NANDs. + + Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> + Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> + Signed-off-by: Scott Wood <scottwood@freescale.com> + +commit 8f42bf1c393d53a70c2545e9f329d11c46d74794 +Author: Anton Vorontsov <avorontsov@ru.mvista.com> +Date: Fri Jun 27 23:04:13 2008 +0400 + + fsl_elbc_nand: implement support for flash-based BBT + + This patch implements support for flash-based BBT for chips working + through ELBC NAND controller, so that NAND core will not have to re-scan + for bad blocks on every boot. + + Because ELBC controller may provide HW-generated ECCs we should adjust + bbt pattern and bbt version positions in the OOB free area. + + Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> + Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> + Signed-off-by: Scott Wood <scottwood@freescale.com> + +commit 97ae023648e764f794ffb9c52da109d6caf09c47 +Author: Anton Vorontsov <avorontsov@ru.mvista.com> +Date: Fri Jun 27 23:04:04 2008 +0400 + + fsl_elbc_nand: fix OOB workability for large page NAND chips + + For large page chips, nand_bbt is looking into OOB area, and checking + for "0xff 0xff" pattern at OOB offset 0. That is, two bytes should be + reserved for bbt means. + + But ELBC driver is specifying ecclayout so that oobfree area starts at + offset 1, so only one byte left for the bbt purposes. + + This causes problems with any OOB users, namely JFFS2: after first mount + JFFS2 will fill all OOBs with "erased marker", so OOBs will contain: + + OOB Data: ff 19 85 20 03 00 ff ff ff 00 00 08 ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + + And on the next boot, NAND core will rescan for bad blocks, then will + see "0xff 0x19" pattern, and will mark all blocks as bad ones. + + To fix the issue we should implement our own bad block pattern: just one + byte at OOB start. Though, this will work only for x8 chips. For x16 + chips two bytes must be checked. Since ELBC driver does not support x16 + NANDs (yet), we're safe for now. + + Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> + Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> + Signed-off-by: Scott Wood <scottwood@freescale.com> + +commit 7238ada313057a85409485b8ee21515dc10c07a5 +Author: Wolfgang Denk <wd@denx.de> +Date: Fri Sep 12 13:52:21 2008 +0200 + + MPC512x: reduce timeout waiting for Ethernet autonegotiation to 2.5s + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit b18410e508a12ba0a177dfc2a386857c806fa96d +Author: Stefan Roese <sr@denx.de> +Date: Thu Sep 11 13:05:56 2008 +0200 + + ppc4xx: Enable device tree (FDT) support in zeus board port + + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 7bf5ecfa50722a9feb45ea8f04da75f5d406f20b +Author: Stefan Roese <sr@denx.de> +Date: Wed Sep 10 16:53:47 2008 +0200 + + ppc4xx: Fix SDRAM inititialization of multiple 405 based board ports + + This patch fixes a problem introdiced with patch + bbeff30c [ppc4xx: Remove superfluous dram_init() call or replace it by + initdram()]. + + The boards affected are: + - PCI405 + - PPChameleonEVB + - quad100hd + - taihu + - zeus + + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 61737c59a3285f6fadf96a5836879898c04ec28d +Author: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> +Date: Thu Sep 11 19:41:26 2008 -0400 + + ppc4xx: Add .gitignore file to xilinx-ppc440 boards + + Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 2bec498ed1164a58cd8437b561bdc4551d69f9bf +Author: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> +Date: Thu Sep 11 19:41:25 2008 -0400 + + ppc4xx: Fix compilation of v5fx30teval_flash + + Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 4bed9deebbd7ee6f0ba746b44d47a922156f7404 +Author: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> +Date: Wed Sep 10 17:44:30 2008 -0400 + + ppc4xx: Fix in-tree build for ppc440-generic boards + + Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@uam.es> + Signed-off-by: Stefan Roese <sr@denx.de> + +commit 06c4ab50f5ccfb55ea2dd324aa28b2b06102e416 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Fri Sep 12 02:20:47 2008 +0200 + + ARM: synchronize mach-types.h with linux 2.6.27-rc6 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 3ee9f03f588ad605e3fd10530237f9e3e2e7ab4c +Author: Jens Scharsig <esw@bus-elektronik.de> +Date: Fri Sep 12 02:20:47 2008 +0200 + + at91rm9200: fix errors with CONFIG_CMD_I2C_TREE + + This patch prevents linker error on AT91RM9200 boards, if + CONFIG_CMD_I2_TREE is set. + It implements i2c_set_bus_speed and i2c_get_bus_speed as a dummy function. + + Signed-off-by: Jens Scharsig <esw@bus-elektronik.de> + +commit b5b0344957d32e3d07a8dd72fce64fb48e680ba4 +Author: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> +Date: Fri Sep 12 02:20:47 2008 +0200 + + ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c + + ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c + + Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> + +commit 03db53335c8eba656a7c44d1555b1a4514383e33 +Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> +Date: Fri Sep 12 02:20:46 2008 +0200 + + make: Remove redundant __ARM__ addition when cross-compiling on *BSD + + __ARM__ is given by arm_config.mk automatically. + + Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> + +commit 8cc62a7d9c77f8ef5166fb57322c4a6ddac320b4 +Author: Claudio Scordino <claudio@evidence.eu.com> +Date: Fri Sep 12 02:20:46 2008 +0200 + + Fix MACH_TYPE for the AT91RM9200DK board. + + Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> + +commit 274737e5eb25b2bcd3af3a96da923effd543284f +Author: Andrew Dyer <adyer@righthandtech.com> +Date: Fri Sep 12 02:20:46 2008 +0200 + + i.mx change get_timer(base) to return time since base + + This patch changes get_timer() for i.MX to return the time since + 'base' instead of the time since the counter was at zero. + + Symptom seen is flash timeout errors when erasing or programming a + sector using the common cfi flash code. + + Signed-off-by: Andrew Dyer <adyer@righthandtech.com> + +commit 48fed40575b3e8eae960eb0141509ddd9a73012a +Author: Andrew Dyer <adyer@righthandtech.com> +Date: Fri Sep 12 02:20:46 2008 +0200 + + i.MX use u-boot baud rate and don't assume UART master clock + + 1) Change the i.MX serial driver to use the baud rate set in the + u-boot environment + + 2) don't assume a 16MHz value for PERCLK1 in baud rate calculations + + 3) don't write a 1 to the RDR bit in the USR2 reg. (bit is not "write + one to clear" like other status bits in the reg.) + + Signed-off-by: Andrew Dyer <adyer@righthandtech.com> + +commit 6e1551a870d360805b9d172dc56d935064abe71d +Author: Andrew Dyer <adyer@righthandtech.com> +Date: Fri Sep 12 02:20:46 2008 +0200 + + arm920t fix constant error in start.S + + Code in cpu/arm920t/start.S will die with a compilation error if + CONFIG_STACKSIZE + CFG_MALLOC_LEN works out to an invalid constant for + the ARM sub instruction. Change the code so that each is subtracted + independently to avoid the error. + + Signed-off-by: Andrew Dyer <adyer@righthandtech.com> + +commit b23253835f871cd9bd8e955b9a971d18a7d4ff56 +Author: Gururaja Hebbar K R <gururajakr@sanyo.co.in> +Date: Fri Sep 12 02:20:40 2008 +0200 + + ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & omap730.h + + - Correct Invalid #define of MPUTIM_PTV_MASK for + omap1510 & omap730 register definition + + MPUTIM_PTV_MASK is defined as + #define MPUTIM_PTV_MASK (0x7<<PTV_BIT) + + while it should have been + #define MPUTIM_PTV_MASK (0x7<<MPUTIM_PTV_BIT) + + - Below Patch corrects the same + + Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in> + +commit c455d07396dddc9864fd8dbb965ee10fe95ce8cf +Author: Adrian Filipi <adrian.filipi@eurotech.com> +Date: Fri Jul 18 11:52:02 2008 -0400 + + Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v. + + Signed-off-by: Adrian Filipi <adrian.filipi@eurotech.com> + +commit eb16135df20535b0d19969f50fb5bd17f95e9c25 +Author: Guennadi Liakhovetski <lg@denx.de> +Date: Thu Aug 28 12:25:11 2008 +0200 + + i.MX31: document timer precision option + + Signed-off-by: Guennadi Liakhovetski <lg@denx.de> + +commit 1a6337b01351b82a45b0defa76f08744511c580b +Author: Magnus Lilja <lilja.magnus@gmail.com> +Date: Fri Aug 29 10:36:18 2008 +0200 + + i.MX31: Make the SPI bus and chip select configurable for MC13783 + + The i.MX31 has three SPI buses and each bus has several chip selects + and the MC13783 chip can be connected to any of these. The current + RTC driver for MC13783 is hardcoded for CSPI2/SS2. + + This patch makes make MC13783 SPI bus and chip select configurable + via CONFIG_MC13783_SPI_BUS and CONFIG_MC13783_SPI_CS. + + Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> + +commit 8c4ebec25b21e355b8488698ec1594da9701fff4 +Author: Magnus Lilja <lilja.magnus@gmail.com> +Date: Fri Aug 29 10:36:17 2008 +0200 + + i.MX31: Add reset_timer() and modify get_timer_masked(). + + This patch adds the reset_timer() function (needed by nand_base.c) and + modifies the get_timer_masked() to work in the same way as the omap24xx + function. + + Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> + +commit deeec4991a55de243787002ede24d2331d234fc8 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:09 2008 +0200 + + ap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVER + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit a3a08c0cedd329edf5256e1d6b2bad0fca002725 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:09 2008 +0200 + + bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 0e8d158664a913392cb01fb11a948d83f72e105e +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:06 2008 +0200 + + rename CFG_ENV macros to CONFIG_ENV + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:05 2008 +0200 + + nvedit: rename error comment to CONFIG_ENV_IS_IN_ + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit b64b775e7546ed138df360ceb3a71ee358cb9a01 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:05 2008 +0200 + + cmd_mem: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 8a40fb148efa442d6526eac46a2001e4c64d28ff +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:05 2008 +0200 + + move cmd_get_data_size to command.c + + add CMD_DATA_SIZE macro to enable it + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 507641d2491980531932b9f25dab37fe5e6c3a1a +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:04 2008 +0200 + + env_flash: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 5a1aceb0689e2f731491838970884a673ef7e7d3 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:04 2008 +0200 + + rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 7d9b5bae5ba558c7464d89d033aca04acaf01172 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:03 2008 +0200 + + cleanup use of CFG_ENV_IS_IN_FLASH + + - #if CFG_ENV_IS_IN_FLASH + - #if (CFG_ENV_IS_IN_FLASH == 1) + - #define CFG_ENV_IS_IN_FLASH 0 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 0cf4fd3cf8d0e00605bec5fc56f89c6415015a46 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:01 2008 +0200 + + rename environment.c in env_embedded.c to reflect is functionality + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit c0878af6e32f0fd8e13a6ca315b9add64441115a +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:01 2008 +0200 + + env_nowhere: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 93f6d72544da4510a146bc4c93d609b0116cde37 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:00 2008 +0200 + + rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 2556ef78113b5f089dfcac5da90bf31dd568397b +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:00 2008 +0200 + + env_sf: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 0b5099a8419bf9c828df5e3e2c6878dc300d98e3 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:00 2008 +0200 + + rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 55c5f49910ec8225347aa1d211352a84de6649b4 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:48:00 2008 +0200 + + env_onenand: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 9656138ff1a34d4c4768db6b490deffc40ee674b +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:59 2008 +0200 + + rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 957a0e69575683efd70ace147746bbb3d8e7c501 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:59 2008 +0200 + + env_nvram: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 9314cee6917444ab88bd4e758da7a30975120187 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:59 2008 +0200 + + rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 06f61354397911a4c121dfa51b6ccbf7e300d48b +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:59 2008 +0200 + + env_nand: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 51bfee192099206a4397f15f3b93516e01f58ab0 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:58 2008 +0200 + + rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:58 2008 +0200 + + env_dataflash: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 057c849c45b9ee19df8ff3acdeee66be52819962 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:58 2008 +0200 + + rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit d1034bc8db60fa6bd419328baf6a75cb0645cee8 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Wed Sep 10 22:47:52 2008 +0200 + + cmd_eeprom: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Fri Sep 5 09:19:54 2008 +0200 + + env_eeprom: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit bb1f8b4f8bb0bfce52e0faa4637b975b745824b3 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Fri Sep 5 09:19:30 2008 +0200 + + rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 32628c5008105a732212003d83b75f05e5243bb2 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Sat Aug 30 23:54:58 2008 +0200 + + cmd_mac: Move conditional compilation to Makefile + + finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM + start in commit ad8f8687b78c3e917b173f038926695383c55555 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit e5648acab153f0f429bfc714902c5aaa7879f71b +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Sat Aug 30 23:47:41 2008 +0200 + + cmd_fdc: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 2d02d91d530e831f2dab228085963fc1d5b71cb0 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Sat Aug 30 23:47:38 2008 +0200 + + common/Makefile: add core command section + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 0d92d4a699fb1a39381d98571dc51fb97e5bcf9e +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +Date: Sat Aug 30 23:29:57 2008 +0200 + + cmd_vfd: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + +commit 6644641d072aee3087da129d8443187196a4d8a9 +Author: Scott Wood <scottwood@freescale.com> +Date: Wed Sep 10 11:48:49 2008 -0500 + + delta, zylonite: Update nand_oobinfo to nand_ecclayout. + + This is part of the switch to newer upstream MTD code. + + Signed-off-by: Scott Wood <scottwood@freescale.com> + +commit 9b05aa788bfdd3264ff1bc9418cb19550a7234e4 +Author: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> +Date: Sat Aug 30 17:06:55 2008 -0400 + + ARM DaVinci: Fix broken HW ECC for large page NAND. + + Based on original patch by Bernard Blackham <bernard@largestprime.net> + + U-boot's HW ECC support for large page NAND on Davinci is completely + broken. Some kernels, such as the 2.6.10 one supported by + MontaVista for DaVinci, rely upon this broken behaviour as they + share the same code for ECCs. In the existing scheme, error + detection *might* work on large page, but error correction + definitely does not. Small page ECC correction works, but the + format is not compatible with the mainline git kernel. + + This patch adds ECC code that matches what is currently in the + Davinci git repository (since NAND support was added in 2.6.24). + This makes the ECC and OOB layout written by u-boot compatible with + Linux for both small page and large page devices and fixes ECC + correction for large page devices. + + The old behaviour can be restored by defining the macro + CFG_DAVINCI_BROKEN_ECC, which is undefined by default. + + Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> + Acked-by: Sergey Kubushyn <ksi@koi8.net> + Signed-off-by: Scott Wood <scottwood@freescale.com> + +commit 0b7c5639891f4103a0e31ec7ae0beb3e97ed3836 +Author: Heiko Schocher <hs@denx.de> +Date: Wed Sep 10 11:15:28 2008 +0200 + + muas3001: update BR4 settings + + Also set up the port pins for using I2C. + + Signed-off-by: Heiko Schocher <hs@denx.de> + +commit 3591293509e0c0bcf244b0f974775bff2e25697e +Author: Petri Lehtinen <petri.lehtinen@inoi.fi> +Date: Wed Sep 10 09:43:49 2008 +0300 + + autoscr: Fix one-character lines and non-newline terminated scripts + + When not using hush, the autoscr command now executes lines that are + only one character long. It also runs the last line of scripts even if + it does not end in a newline. + + Signed-off-by: Petri Lehtinen <petri.lehtinen@inoi.fi> + +commit 9ebbb54f7a25055010fa6668eba40c72a4c4f985 +Author: Victor Gallardo <vgallardo@amcc.com> +Date: Tue Sep 9 15:13:29 2008 -0700 + + ppc4xx: Allow DTT_I2C_DEV_CODE configured by CFG_I2C_DTT_ADDR + + On AMCC Arches board DTT_I2C_DEV_CODE is different then canyonlands + and glacier. + + Signed-off-by: Victor Gallardo <vgallardo@amcc.com> + +commit 245f6ef3e11828cb46188e396fb1e67f7b07cd03 +Author: Heiko Schocher <hs@denx.de> +Date: Mon Sep 8 10:21:11 2008 +0200 + + muas3001: added support for the LM75 sensor. + + Signed-off-by: Heiko Schocher <hs@denx.de> + +commit 4a02a2dca82aeab8f839db9dd35fda9d5412dacb +Author: Heiko Schocher <hs@denx.de> +Date: Mon Sep 8 10:20:19 2008 +0200 + + muas3001: activate WDT for the muas3001 board. + + Signed-off-by: Heiko Schocher <hs@denx.de> + +commit a55d074dac24dc941f1afb5b4e94b1509bfdda4e +Author: Heiko Schocher <hs@denx.de> +Date: Mon Sep 8 10:19:36 2008 +0200 + + muas3001: added 64MB SDRAM autodetection. + + Signed-off-by: Heiko Schocher <hs@denx.de> + +commit 5251469943895de4bb9a04d5053352cc22acb7d5 +Author: Andrew Klossner <andrew@cesa.opbu.xerox.com> +Date: Thu Aug 21 07:12:26 2008 -0700 + + Fix printf errors under -DDEBUG + + Fix printf format-string/arg mismatches under -DDEBUG. + + These warnings occur with DEBUG defined for a platform using + cpu/mpc85xx. Users of other architectures can unearth similar + problems by adding the line "CFLAGS += -DDEBUG=1" in config.mk right + after "CFLAGS += $(call cc-option,-fno-stack-protector)". + + Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com> + Signed-off-by: Andy Fleming <afleming@freescale.com> + +commit 8b9e4787641719d709bfa2ebeb72e8bd4952bee7 +Author: Wolfgang Denk <wd@denx.de> +Date: Tue Sep 9 23:55:18 2008 +0200 + + Update CHANGELOG, prepare 2008-10-rc1 release + + Signed-off-by: Wolfgang Denk <wd@denx.de> + +commit e0ff3d350d6b7960deb5a881dfc5acf3a63ef676 +Author: Kumar Gala <galak@kernel.crashing.org> +Date: Mon Sep 8 08:51:29 2008 -0500 + + 85xx: Ensure timebase is zero on secondary cores + + The e500um says the timebase is volatile out of reset. To ensure + TB sync works we need to make sure its zero. + + Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + commit 54b4ab3c961a2012a1c2a09c259a6343323ec551 Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Date: Tue Sep 9 22:18:24 2008 +0200 @@ -56,6 +774,16 @@ Date: Wed Aug 6 16:08:41 2008 -0500 Signed-off-by: Jason McMullan <mcmullan@netapp.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> +commit 4bc07c368076560ed7fa4c9f987c71a8521488a9 +Author: Wolfgang Denk <wd@denx.de> +Date: Tue Sep 9 17:55:31 2008 +0200 + + trab: fix build problem after change to use do_div() + + We must link with libgeneric now. + + Signed-off-by: Wolfgang Denk <wd@denx.de> + commit 3b20fd83c73c22acfcb0c6663be747bd5c8b7011 Author: Ryan CHEN <ryan.chen@st.com> Date: Wed Aug 20 13:00:17 2008 -0400 @@ -351,6 +1079,48 @@ Date: Tue Sep 9 10:03:47 2008 +0200 Signed-off-by: Wolfgang Denk <wd@denx.de> +commit 6cc64f9b5f69239c8b1969572b5a3a4aab7de5b9 +Author: Sergei Poselenov <sposelenov@emcraft.com> +Date: Fri Aug 15 15:42:11 2008 +0200 + + Removed hardcoded MxMR loop value from upmconfig() for MPC85xx. + + Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> + +commit 36241ca29d4804a1006fb3f26069effda5202581 +Author: Anatolij Gustschin <agust@denx.de> +Date: Fri Aug 15 15:42:13 2008 +0200 + + 85xx: socrates: Enable Lime support. + + This patch adds Lime GDC support together with support for the PWM + backlight control through the w83782d chip. The reset pin of the + latter is attached to GPIO, so we need to reset it in + early_board_init_r. + + Signed-off-by: Anatolij Gustschin <agust@denx.de> + +commit 7a47753ddcaebbf2142809842f70c5f723bd9ddb +Author: Detlev Zundel <dzu@denx.de> +Date: Fri Aug 15 15:42:12 2008 +0200 + + 85xx: Socrates: Major code update. + + - Update the local bus ranges in the FDT for Linux for the various + devices connected to the local bus via chip-select. + + - Set the LCRR_DBYP bit in the LCRR for local bus frequencies + lower than 66 MHz and uses I/O accessor functions consequently. + + - UPM data update. + + - Update of default environment and configuration. Use I2C multibus + as we do have two I2C buses. Also enable sdram and ext2 commands. + + Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> + Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> + Signed-off-by: Detlev Zundel <dzu@denx.de> + commit 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Date: Tue Sep 9 01:22:39 2008 +0200 @@ -409,6 +1179,19 @@ Date: Thu Aug 14 14:08:28 2008 +0200 Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de> +commit 8febd13c69cb68652577d1a9fcbde954bf784155 +Author: Timur Tabi <timur@freescale.com> +Date: Fri Jul 18 16:52:23 2008 +0200 + + Update Freescale 85xx boards to sys_eeprom.c + + The new sys_eeprom.c supports both the old CCID EEPROM format and the new NXID + format, and so it obsoletes board/freescale/common/cds_eeprom.c. Freescale + 86xx boards already use sys_eeprom.c, so this patch migrates the remaining + Freescale 85xx boards to use it as well. cds_eeprom.c is deleted. + + Signed-off-by: Timur Tabi <timur@freescale.com> + commit 1055171ed05b7c4885737463d52b8d6c013bcb5d Author: Wolfgang Denk <wd@denx.de> Date: Mon Sep 8 23:26:22 2008 +0200 diff --git a/board/a3000/a3000.c b/board/a3000/a3000.c index 040ba89..1ba21ed 100644 --- a/board/a3000/a3000.c +++ b/board/a3000/a3000.c @@ -115,4 +115,3 @@ int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } - diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c index 8f30ed9..e9f80ff 100644 --- a/board/amirix/ap1000/ap1000.c +++ b/board/amirix/ap1000/ap1000.c @@ -703,4 +703,3 @@ int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } - diff --git a/board/ap325rxa/u-boot.lds b/board/ap325rxa/u-boot.lds index 015f58b..e9f8dc0 100644 --- a/board/ap325rxa/u-boot.lds +++ b/board/ap325rxa/u-boot.lds @@ -103,4 +103,3 @@ SECTIONS PROVIDE (_end = .); } - diff --git a/board/mucmc52/mucmc52.c b/board/mucmc52/mucmc52.c index ae3ca24..74417c4 100644 --- a/board/mucmc52/mucmc52.c +++ b/board/mucmc52/mucmc52.c @@ -192,22 +192,22 @@ phys_size_t initdram (int board_type) #endif /* CFG_RAMBOOT */ /* - * On MPC5200B we need to set the special configuration delay in the - * DDR controller. Please refer to Freescale's AN3221 "MPC5200B SDRAM - * Initialization and Configuration", 3.3.1 SDelay--MBAR + 0x0190: - * - * "The SDelay should be written to a value of 0x00000004. It is - * required to account for changes caused by normal wafer processing - * parameters." - */ - svr = get_svr(); - pvr = get_pvr(); - if ((SVR_MJREV(svr) >= 2) && - (PVR_MAJ(pvr) == 1) && (PVR_MIN(pvr) == 4)) { - - out_be32 ((unsigned __iomem *)MPC5XXX_SDRAM_SDELAY, 0x04); - __asm__ volatile ("sync"); - } + * On MPC5200B we need to set the special configuration delay in the + * DDR controller. Please refer to Freescale's AN3221 "MPC5200B SDRAM + * Initialization and Configuration", 3.3.1 SDelay--MBAR + 0x0190: + * + * "The SDelay should be written to a value of 0x00000004. It is + * required to account for changes caused by normal wafer processing + * parameters." + */ + svr = get_svr(); + pvr = get_pvr(); + if ((SVR_MJREV(svr) >= 2) && + (PVR_MAJ(pvr) == 1) && (PVR_MIN(pvr) == 4)) { + + out_be32 ((unsigned __iomem *)MPC5XXX_SDRAM_SDELAY, 0x04); + __asm__ volatile ("sync"); + } return dramsize + dramsize2; } @@ -339,14 +339,14 @@ int misc_init_r (void) free (str); #endif /* CONFIG_PREBOOT */ - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x38), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x39), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3A), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3B), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3C), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3D), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3E), ' '); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3F), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x38), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x39), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3A), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3B), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3C), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3D), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3E), ' '); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3F), ' '); return 0; } @@ -365,16 +365,16 @@ int board_early_init_r (void) int last_stage_init (void) { - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x38), 'M'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x39), 'U'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3A), 'C'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3B), '.'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3C), 'M'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3D), 'C'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3E), '5'); - out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3F), '2'); - - return 0; + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x38), 'M'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x39), 'U'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3A), 'C'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3B), '.'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3C), 'M'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3D), 'C'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3E), '5'); + out_8 ((volatile uchar *)(CFG_DISPLAY_BASE + 0x3F), '2'); + + return 0; } #if defined(CONFIG_HW_WATCHDOG) diff --git a/board/purple/purple.c b/board/purple/purple.c index c129d7a..900e66f 100644 --- a/board/purple/purple.c +++ b/board/purple/purple.c @@ -282,4 +282,3 @@ int board_eth_init(bd_t *bis) return plb2800_eth_initialize(bis); } #endif - diff --git a/board/samsung/smdk6400/lowlevel_init.S b/board/samsung/smdk6400/lowlevel_init.S index 034c810..e0119a7 100644 --- a/board/samsung/smdk6400/lowlevel_init.S +++ b/board/samsung/smdk6400/lowlevel_init.S @@ -2,7 +2,7 @@ * Memory Setup stuff - taken from blob memsetup.S * * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) and - * Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) + * Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) * * Modified for the Samsung SMDK2410 by * (C) Copyright 2002 @@ -73,8 +73,8 @@ lowlevel_init: ldr r1, [r0] str r1, [r0] - ldr r0, =ELFIN_VIC0_BASE_ADDR @0x71200000 - ldr r1, =ELFIN_VIC1_BASE_ADDR @0x71300000 + ldr r0, =ELFIN_VIC0_BASE_ADDR @0x71200000 + ldr r1, =ELFIN_VIC1_BASE_ADDR @0x71300000 /* Disable all interrupts (VIC0 and VIC1) */ mvn r3, #0x0 @@ -107,11 +107,11 @@ lowlevel_init: bl mem_ctrl_asm_init /* Wakeup support. Don't know if it's going to be used, untested. */ - ldr r0, =(ELFIN_CLOCK_POWER_BASE + RST_STAT_OFFSET) - ldr r1, [r0] - bic r1, r1, #0xfffffff7 - cmp r1, #0x8 - beq wakeup_reset + ldr r0, =(ELFIN_CLOCK_POWER_BASE + RST_STAT_OFFSET) + ldr r1, [r0] + bic r1, r1, #0xfffffff7 + cmp r1, #0x8 + beq wakeup_reset 1: mov lr, r12 @@ -124,10 +124,10 @@ wakeup_reset: ldr r1, [r0] str r1, [r0] - /* LED test */ - ldr r0, =ELFIN_GPIO_BASE - ldr r1, =0x3000 - str r1, [r0, #GPNDAT_OFFSET] + /* LED test */ + ldr r0, =ELFIN_GPIO_BASE + ldr r1, =0x3000 + str r1, [r0, #GPNDAT_OFFSET] /* Load return address and jump to kernel */ ldr r0, =(ELFIN_CLOCK_POWER_BASE + INF_REG0_OFFSET) @@ -201,7 +201,7 @@ wait_for_async: str r1, [r0, #MPLL_LOCK_OFFSET] /* Set Clock Divider */ - ldr r1, [r0, #CLK_DIV0_OFFSET] + ldr r1, [r0, #CLK_DIV0_OFFSET] bic r1, r1, #0x30000 bic r1, r1, #0xff00 bic r1, r1, #0xff @@ -252,7 +252,7 @@ uart_asm_init: /* set GPIO to enable UART */ ldr r0, =ELFIN_GPIO_BASE ldr r1, =0x220022 - str r1, [r0, #GPACON_OFFSET] + str r1, [r0, #GPACON_OFFSET] mov pc, lr #endif @@ -265,11 +265,11 @@ nand_asm_init: ldr r1, [r0, #NFCONF_OFFSET] orr r1, r1, #0x70 orr r1, r1, #0x7700 - str r1, [r0, #NFCONF_OFFSET] + str r1, [r0, #NFCONF_OFFSET] ldr r1, [r0, #NFCONT_OFFSET] orr r1, r1, #0x07 - str r1, [r0, #NFCONT_OFFSET] + str r1, [r0, #NFCONT_OFFSET] mov pc, lr #endif diff --git a/board/sh7785lcr/config.mk b/board/sh7785lcr/config.mk index 93761ee..20807df 100644 --- a/board/sh7785lcr/config.mk +++ b/board/sh7785lcr/config.mk @@ -23,4 +23,3 @@ # NOTE: Must match value used in u-boot.lds (in this directory). # TEXT_BASE = 0x0ff80000 - diff --git a/board/sh7785lcr/lowlevel_init.S b/board/sh7785lcr/lowlevel_init.S index 8126296..50e1789 100644 --- a/board/sh7785lcr/lowlevel_init.S +++ b/board/sh7785lcr/lowlevel_init.S @@ -315,4 +315,3 @@ CS_I2C_WCR_D: .long 0x00000003 CCR_A: .long 0xff00001c CCR_D: .long 0x0000090b - diff --git a/board/sh7785lcr/rtl8169.h b/board/sh7785lcr/rtl8169.h index d1c0d64..ca9c0bd 100644 --- a/board/sh7785lcr/rtl8169.h +++ b/board/sh7785lcr/rtl8169.h @@ -55,4 +55,3 @@ const unsigned short EEPROM_W_Data_8169_B[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; - diff --git a/board/sh7785lcr/rtl8169_mac.c b/board/sh7785lcr/rtl8169_mac.c index 2bc873b..bf0ba14 100644 --- a/board/sh7785lcr/rtl8169_mac.c +++ b/board/sh7785lcr/rtl8169_mac.c @@ -346,4 +346,3 @@ U_BOOT_CMD( "\n" " - print MAC address for RTL8110\n" ); - diff --git a/board/sh7785lcr/selfcheck.c b/board/sh7785lcr/selfcheck.c index 9c228e5..d924595 100644 --- a/board/sh7785lcr/selfcheck.c +++ b/board/sh7785lcr/selfcheck.c @@ -170,4 +170,3 @@ U_BOOT_CMD( "hwtest sata - check SiI3512 ID\n" "hwtest pci - output PCI slot device ID\n" ); - diff --git a/board/sh7785lcr/u-boot.lds b/board/sh7785lcr/u-boot.lds index 8dcc6c7..231769f 100644 --- a/board/sh7785lcr/u-boot.lds +++ b/board/sh7785lcr/u-boot.lds @@ -94,4 +94,3 @@ SECTIONS PROVIDE (_end = .); } - diff --git a/board/sl8245/sl8245.c b/board/sl8245/sl8245.c index e66272e..25adc28 100644 --- a/board/sl8245/sl8245.c +++ b/board/sl8245/sl8245.c @@ -77,4 +77,3 @@ int board_eth_init(bd_t *bis) #endif return rc; } - diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 71e9b08..4d4dc06 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -407,4 +407,3 @@ int board_eth_init(bd_t *bis) cpu_eth_init(bis); /* Initialize TSECs first */ return pci_eth_init(bis); } - diff --git a/cpu/mcf52x2/cpu.c b/cpu/mcf52x2/cpu.c index 167097a..c25670d 100644 --- a/cpu/mcf52x2/cpu.c +++ b/cpu/mcf52x2/cpu.c @@ -334,4 +334,3 @@ int cpu_eth_init(bd_t *bis) return mcffec_initialize(bis); } #endif - diff --git a/cpu/mpc8xxx/ddr/main.c b/cpu/mpc8xxx/ddr/main.c index ac4b80c..c340d56 100644 --- a/cpu/mpc8xxx/ddr/main.c +++ b/cpu/mpc8xxx/ddr/main.c @@ -44,10 +44,10 @@ extern void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd, * * memory controller/documention |industry |this code |signals * -------------------------------|-----------|-----------|----------------- - * physical bank/bank |rank |rank |chip select (CS) - * logical bank/sub-bank |bank |bank |bank address (BA) - * page/row |row |page |row address - * ??? |column |column |column address + * physical bank/bank |rank |rank |chip select (CS) + * logical bank/sub-bank |bank |bank |bank address (BA) + * page/row |row |page |row address + * ??? |column |column |column address * * The naming confusion is further exacerbated by the descriptions of the * memory controller interleaving feature, where accesses are interleaved @@ -55,24 +55,24 @@ extern void fsl_ddr_get_spd(generic_spd_eeprom_t *ctrl_dimms_spd, * CS0_CONFIG[INTLV_CTL] of each memory controller. * * memory controller documentation | number of chip selects - * | per memory controller supported + * | per memory controller supported * --------------------------------|----------------------------------------- - * cache line interleaving | 1 (CS0 only) - * page interleaving | 1 (CS0 only) - * bank interleaving | 1 (CS0 only) - * superbank interleraving | depends on bank (chip select) - * | interleraving [rank interleaving] - * | mode used on every memory controller + * cache line interleaving | 1 (CS0 only) + * page interleaving | 1 (CS0 only) + * bank interleaving | 1 (CS0 only) + * superbank interleraving | depends on bank (chip select) + * | interleraving [rank interleaving] + * | mode used on every memory controller * * Even further confusing is the existence of the interleaving feature * _WITHIN_ each memory controller. The feature is referred to in * documentation as chip select interleaving or bank interleaving, * although it is configured in the DDR_SDRAM_CFG field. * - * Name of field | documentation name | this code + * Name of field | documentation name | this code * -----------------------------|-----------------------|------------------ - * DDR_SDRAM_CFG[BA_INTLV_CTL] | Bank (chip select) | rank interleaving - * | interleaving + * DDR_SDRAM_CFG[BA_INTLV_CTL] | Bank (chip select) | rank interleaving + * | interleaving */ #ifdef DEBUG @@ -270,7 +270,7 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int start_step) generic_spd_eeprom_t *spd = &(pinfo->spd_installed_dimms[i][j]); dimm_params_t *pdimm = - &(pinfo->dimm_params[i][j]); + &(pinfo->dimm_params[i][j]); retval = compute_dimm_parameters(spd, pdimm, i); if (retval == 2) { diff --git a/doc/README.mx31 b/doc/README.mx31 index f912b66..291c2f3 100644 --- a/doc/README.mx31 +++ b/doc/README.mx31 @@ -1,4 +1,3 @@ - U-Boot for Freescale i.MX31 This file contains information for the port of U-Boot to the Freescale @@ -16,4 +15,3 @@ to setup the bus and chip select used for a particular board. CONFIG_MC13783_SPI_BUS -- defines the SPI bus the MC13783 is connected to. Note that 0 is CSPI1, 1 is CSPI2 and 2 is CSPI3. CONFIG_MC13783_SPI_CS -- define the chip select the MC13783 s connected to. - diff --git a/doc/README.qemu_mips b/doc/README.qemu_mips index 472469f..2fdd2b0 100644 --- a/doc/README.qemu_mips +++ b/doc/README.qemu_mips @@ -42,7 +42,7 @@ This GDB was configured as "--host=i486-linux-gnu --target=mipsel-unknown-linux- (gdb) target remote localhost:1234 Remote debugging using localhost:1234 _start () at start.S:64 -64 RVECENT(reset,0) /* U-boot entry point */ +64 RVECENT(reset,0) /* U-boot entry point */ Current language: auto; currently asm (gdb) b board.c:289 Breakpoint 1 at 0xbfc00cc8: file board.c, line 289. @@ -50,7 +50,7 @@ Breakpoint 1 at 0xbfc00cc8: file board.c, line 289. Continuing. Breakpoint 1, board_init_f (bootflag=<value optimized out>) at board.c:290 -290 relocate_code (addr_sp, id, addr); +290 relocate_code (addr_sp, id, addr); Current language: auto; currently c (gdb) p/x addr $1 = 0x87fa0000 @@ -68,7 +68,7 @@ No symbol table is loaded. Use the "file" command. No symbol file now. (gdb) add-symbol-file u-boot 0x87fa0000 add symbol table from file "u-boot" at - .text_addr = 0x87fa0000 + .text_addr = 0x87fa0000 (y or n) y Reading symbols from /private/u-boot-arm/u-boot...done. Breakpoint 1 at 0x87fa0cc8: file board.c, line 289. @@ -77,4 +77,4 @@ Continuing. Program received signal SIGINT, Interrupt. 0xffffffff87fa0de4 in udelay (usec=<value optimized out>) at time.c:78 -78 while ((tmo - read_c0_count()) < 0x7fffffff) +78 while ((tmo - read_c0_count()) < 0x7fffffff) diff --git a/doc/README.sh7785lcr b/doc/README.sh7785lcr index 0770276..c8d8ccd 100644 --- a/doc/README.sh7785lcr +++ b/doc/README.sh7785lcr @@ -80,4 +80,3 @@ This command writes MAC address of this board. i.e) => setmac 00:00:87:**:**:** - diff --git a/include/linux/list.h b/include/linux/list.h index aeeeb21..b78851c 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -344,7 +344,7 @@ static inline void list_splice_tail_init(struct list_head *list, */ #define list_for_each(pos, head) \ for (pos = (head)->next; prefetch(pos->next), pos != (head); \ - pos = pos->next) + pos = pos->next) /** * __list_for_each - iterate over a list @@ -366,7 +366,7 @@ static inline void list_splice_tail_init(struct list_head *list, */ #define list_for_each_prev(pos, head) \ for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \ - pos = pos->prev) + pos = pos->prev) /** * list_for_each_safe - iterate over a list safe against removal of list entry @@ -397,7 +397,7 @@ static inline void list_splice_tail_init(struct list_head *list, */ #define list_for_each_entry(pos, head, member) \ for (pos = list_entry((head)->next, typeof(*pos), member); \ - prefetch(pos->member.next), &pos->member != (head); \ + prefetch(pos->member.next), &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) /** @@ -408,7 +408,7 @@ static inline void list_splice_tail_init(struct list_head *list, */ #define list_for_each_entry_reverse(pos, head, member) \ for (pos = list_entry((head)->prev, typeof(*pos), member); \ - prefetch(pos->member.prev), &pos->member != (head); \ + prefetch(pos->member.prev), &pos->member != (head); \ pos = list_entry(pos->member.prev, typeof(*pos), member)) /** @@ -458,7 +458,7 @@ static inline void list_splice_tail_init(struct list_head *list, * * Iterate over list of given type, continuing from current position. */ -#define list_for_each_entry_from(pos, head, member) \ +#define list_for_each_entry_from(pos, head, member) \ for (; prefetch(pos->member.next), &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) @@ -472,7 +472,7 @@ static inline void list_splice_tail_init(struct list_head *list, #define list_for_each_entry_safe(pos, n, head, member) \ for (pos = list_entry((head)->next, typeof(*pos), member), \ n = list_entry(pos->member.next, typeof(*pos), member); \ - &pos->member != (head); \ + &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) /** @@ -486,7 +486,7 @@ static inline void list_splice_tail_init(struct list_head *list, * safe against removal of list entry. */ #define list_for_each_entry_safe_continue(pos, n, head, member) \ - for (pos = list_entry(pos->member.next, typeof(*pos), member), \ + for (pos = list_entry(pos->member.next, typeof(*pos), member), \ n = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) @@ -501,7 +501,7 @@ static inline void list_splice_tail_init(struct list_head *list, * Iterate over list of given type from current point, safe against * removal of list entry. */ -#define list_for_each_entry_safe_from(pos, n, head, member) \ +#define list_for_each_entry_safe_from(pos, n, head, member) \ for (n = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) @@ -519,7 +519,7 @@ static inline void list_splice_tail_init(struct list_head *list, #define list_for_each_entry_safe_reverse(pos, n, head, member) \ for (pos = list_entry((head)->prev, typeof(*pos), member), \ n = list_entry(pos->member.prev, typeof(*pos), member); \ - &pos->member != (head); \ + &pos->member != (head); \ pos = n, n = list_entry(n->member.prev, typeof(*n), member)) /* @@ -665,9 +665,9 @@ static inline void hlist_add_after(struct hlist_node *n, * @head: the head for your list. * @member: the name of the hlist_node within the struct. */ -#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \ +#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \ for (pos = (head)->first; \ - pos && ({ n = pos->next; 1; }) && \ + pos && ({ n = pos->next; 1; }) && \ ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \ pos = n) diff --git a/include/netdev.h b/include/netdev.h index 8b181f7..87d578c 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -107,4 +107,3 @@ static inline int pci_eth_init(bd_t *bis) } #endif /* _NETDEV_H_ */ - diff --git a/include/tsec.h b/include/tsec.h index 2db4deb..f7e5857 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -50,8 +50,6 @@ x.flags = TSEC##num##_FLAGS;\ } - - #define MAC_ADDR_LEN 6 /* #define TSEC_TIMEOUT 1000000 */ diff --git a/lib_generic/lzma/LGPL.txt b/lib_generic/lzma/LGPL.txt index c56f383..9e76f5b 100644 --- a/lib_generic/lzma/LGPL.txt +++ b/lib_generic/lzma/LGPL.txt @@ -1,16 +1,16 @@ GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts +[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -96,7 +96,7 @@ software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in +free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. @@ -277,7 +277,7 @@ engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work +this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one @@ -366,7 +366,7 @@ the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further +subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. @@ -378,7 +378,7 @@ otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent +may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to @@ -415,7 +415,7 @@ versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Library +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by @@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -455,9 +455,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that diff --git a/lib_generic/lzma/history.txt b/lib_generic/lzma/history.txt index 4b5807f..dad1858 100644 --- a/lib_generic/lzma/history.txt +++ b/lib_generic/lzma/history.txt @@ -1,63 +1,63 @@ HISTORY of the LZMA SDK ----------------------- - 4.57 2007-12-12 + 4.57 2007-12-12 ------------------------- - Speed optimizations in Ñ++ LZMA Decoder. - Small changes for more compatibility with some C/C++ compilers. - 4.49 beta 2007-07-05 + 4.49 beta 2007-07-05 ------------------------- - .7z ANSI-C Decoder: - - now it supports BCJ and BCJ2 filters - - now it supports files larger than 4 GB. - - now it supports "Last Write Time" field for files. + - now it supports BCJ and BCJ2 filters + - now it supports files larger than 4 GB. + - now it supports "Last Write Time" field for files. - C++ code for .7z archives compressing/decompressing from 7-zip was included to LZMA SDK. - 4.43 2006-06-04 + 4.43 2006-06-04 ------------------------- - Small changes for more compatibility with some C/C++ compilers. - 4.42 2006-05-15 + 4.42 2006-05-15 ------------------------- - Small changes in .h files in ANSI-C version. - 4.39 beta 2006-04-14 + 4.39 beta 2006-04-14 ------------------------- - Bug in versions 4.33b:4.38b was fixed: C++ version of LZMA encoder could not correctly compress files larger than 2 GB with HC4 match finder (-mfhc4). - 4.37 beta 2005-04-06 + 4.37 beta 2005-04-06 ------------------------- - Fixes in C++ code: code could no be compiled if _NO_EXCEPTIONS was defined. - 4.35 beta 2005-03-02 + 4.35 beta 2005-03-02 ------------------------- - Bug was fixed in C++ version of LZMA Decoder: If encoded stream was corrupted, decoder could access memory outside of allocated range. - 4.34 beta 2006-02-27 + 4.34 beta 2006-02-27 ------------------------- - Compressing speed and memory requirements for compressing were increased - LZMA now can use only these match finders: HC4, BT2, BT3, BT4 - 4.32 2005-12-09 + 4.32 2005-12-09 ------------------------- - Java version of LZMA SDK was included - 4.30 2005-11-20 + 4.30 2005-11-20 ------------------------- - Compression ratio was improved in -a2 mode - Speed optimizations for compressing in -a2 mode @@ -77,52 +77,52 @@ HISTORY of the LZMA SDK ISequentialOutStream::Write now works as old WritePart - 4.27 2005-08-07 + 4.27 2005-08-07 ------------------------- - Bug in LzmaDecodeSize.c was fixed: if _LZMA_IN_CB and _LZMA_OUT_READ were defined, decompressing worked incorrectly. - 4.26 2005-08-05 + 4.26 2005-08-05 ------------------------- - Fixes in 7z_C code and LzmaTest.c: previous versions could work incorrectly, if malloc(0) returns 0 - 4.23 2005-06-29 + 4.23 2005-06-29 ------------------------- - Small fixes in C++ code - 4.22 2005-06-10 + 4.22 2005-06-10 ------------------------- - Small fixes - 4.21 2005-06-08 + 4.21 2005-06-08 ------------------------- - Interfaces for ANSI-C LZMA Decoder (LzmaDecode.c) were changed - New additional version of ANSI-C LZMA Decoder with zlib-like interface: - - LzmaStateDecode.h - - LzmaStateDecode.c - - LzmaStateTest.c + - LzmaStateDecode.h + - LzmaStateDecode.c + - LzmaStateTest.c - ANSI-C LZMA Decoder now can decompress files larger than 4 GB - 4.17 2005-04-18 + 4.17 2005-04-18 ------------------------- - New example for RAM->RAM compressing/decompressing: LZMA + BCJ (filter for x86 code): - - LzmaRam.h - - LzmaRam.cpp - - LzmaRamDecode.h - - LzmaRamDecode.c - - -f86 switch for lzma.exe + - LzmaRam.h + - LzmaRam.cpp + - LzmaRamDecode.h + - LzmaRamDecode.c + - -f86 switch for lzma.exe - 4.16 2005-03-29 + 4.16 2005-03-29 ------------------------- - Bug was fixed in LzmaDecode.c (ANSI-C LZMA Decoder): If _LZMA_OUT_READ was defined, and if encoded stream was corrupted, @@ -135,49 +135,49 @@ HISTORY of the LZMA SDK - Simplified version of .7z ANSI-C Decoder was included - 4.06 2004-09-05 + 4.06 2004-09-05 ------------------------- - Bug in v4.05 was fixed: - LZMA-Encoder didn't release output stream in some cases. + LZMA-Encoder didn't release output stream in some cases. - 4.05 2004-08-25 + 4.05 2004-08-25 ------------------------- - Source code of filters for x86, IA-64, ARM, ARM-Thumb and PowerPC code was included to SDK - Some internal minor changes - 4.04 2004-07-28 + 4.04 2004-07-28 ------------------------- - More compatibility with some C++ compilers - 4.03 2004-06-18 + 4.03 2004-06-18 ------------------------- - "Benchmark" command was added. It measures compressing and decompressing speed and shows rating values. Also it checks hardware errors. - 4.02 2004-06-10 + 4.02 2004-06-10 ------------------------- - C++ LZMA Encoder/Decoder code now is more portable and it can be compiled by GCC on Linux. - 4.01 2004-02-15 + 4.01 2004-02-15 ------------------------- - Some detection of data corruption was enabled. - LzmaDecode.c / RangeDecoderReadByte - ..... - { - rd->ExtraBytes = 1; - return 0xFF; - } + LzmaDecode.c / RangeDecoderReadByte + ..... + { + rd->ExtraBytes = 1; + return 0xFF; + } - 4.00 2004-02-13 + 4.00 2004-02-13 ------------------------- - Original version of LZMA SDK @@ -186,7 +186,7 @@ HISTORY of the LZMA SDK HISTORY of the LZMA ------------------- 2001-2007: Improvements to LZMA compressing/decompressing code, - keeping compatibility with original LZMA format + keeping compatibility with original LZMA format 1996-2001: Development of LZMA compression format Some milestones: diff --git a/lib_generic/lzma/lzma.txt b/lib_generic/lzma/lzma.txt index c40d133..5f1a0c9 100644 --- a/lib_generic/lzma/lzma.txt +++ b/lib_generic/lzma/lzma.txt @@ -117,10 +117,10 @@ LIB = -lm -static Files --------------------- -C - C source code -CPP - CPP source code -CS - C# source code -Java - Java source code +C - C source code +CPP - CPP source code +CS - C# source code +Java - Java source code lzma.txt - LZMA SDK description (this file) 7zFormat.txt - 7z Format description 7zC.txt - 7z ANSI-C Decoder description (this file) @@ -139,16 +139,16 @@ C - C files Lz - files related to LZ (Lempel-Ziv) compression algorithm Lzma - ANSI-C compatible LZMA decompressor - LzmaDecode.h - interface for LZMA decoding on ANSI-C - LzmaDecode.c - LZMA decoding on ANSI-C (new fastest version) - LzmaDecodeSize.c - LZMA decoding on ANSI-C (old size-optimized version) - LzmaTest.c - test application that decodes LZMA encoded file - LzmaTypes.h - basic types for LZMA Decoder - LzmaStateDecode.h - interface for LZMA decoding (State version) - LzmaStateDecode.c - LZMA decoding on ANSI-C (State version) - LzmaStateTest.c - test application (State version) + LzmaDecode.h - interface for LZMA decoding on ANSI-C + LzmaDecode.c - LZMA decoding on ANSI-C (new fastest version) + LzmaDecodeSize.c - LZMA decoding on ANSI-C (old size-optimized version) + LzmaTest.c - test application that decodes LZMA encoded file + LzmaTypes.h - basic types for LZMA Decoder + LzmaStateDecode.h - interface for LZMA decoding (State version) + LzmaStateDecode.c - LZMA decoding on ANSI-C (State version) + LzmaStateTest.c - test application (State version) - Branch - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code + Branch - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code Archive - files related to archiving 7z_C - 7z ANSI-C Decoder @@ -158,7 +158,7 @@ CPP -- CPP files Common - common files for C++ projects Windows - common files for Windows related code - 7zip - files related to 7-Zip Project + 7zip - files related to 7-Zip Project Common - common files for 7-Zip @@ -166,12 +166,12 @@ CPP -- CPP files LZ - files related to LZ (Lempel-Ziv) compression algorithm - Copy - Copy coder + Copy - Copy coder RangeCoder - Range Coder (special code of compression/decompression) - LZMA - LZMA compression/decompression on C++ + LZMA - LZMA compression/decompression on C++ LZMA_Alone - file->file LZMA compression/decompression - Branch - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code + Branch - Filters for x86, IA-64, ARM, ARM-Thumb, PowerPC and SPARC code Archive - files related to archiving @@ -180,13 +180,13 @@ CPP -- CPP files Bundles - Modules that are bundles of other modules - Alone7z - 7zr.exe: Standalone version of 7z.exe that supports only 7z/LZMA/BCJ/BCJ2 - Format7zR - 7zr.dll: Reduced version of 7za.dll: extracting/compressing to 7z/LZMA/BCJ/BCJ2 - Format7zExtractR - 7zxr.dll: Reduced version of 7zxa.dll: extracting from 7z/LZMA/BCJ/BCJ2. + Alone7z - 7zr.exe: Standalone version of 7z.exe that supports only 7z/LZMA/BCJ/BCJ2 + Format7zR - 7zr.dll: Reduced version of 7za.dll: extracting/compressing to 7z/LZMA/BCJ/BCJ2 + Format7zExtractR - 7zxr.dll: Reduced version of 7zxa.dll: extracting from 7z/LZMA/BCJ/BCJ2. - UI - User Interface files + UI - User Interface files - Client7z - Test application for 7za.dll, 7zr.dll, 7zxr.dll + Client7z - Test application for 7za.dll, 7zr.dll, 7zxr.dll Common - Common UI files Console - Code for console archiver @@ -197,15 +197,15 @@ CS - C# files Common - some common files for 7-Zip Compress - files related to compression/decompression LZ - files related to LZ (Lempel-Ziv) compression algorithm - LZMA - LZMA compression/decompression + LZMA - LZMA compression/decompression LzmaAlone - file->file LZMA compression/decompression RangeCoder - Range Coder (special code of compression/decompression) Java - Java files SevenZip Compression - files related to compression/decompression - LZ - files related to LZ (Lempel-Ziv) compression algorithm - LZMA - LZMA compression/decompression + LZ - files related to LZ (Lempel-Ziv) compression algorithm + LZMA - LZMA compression/decompression RangeCoder - Range Coder (special code of compression/decompression) C/C++ source code of LZMA SDK is part of 7-Zip project. @@ -251,7 +251,7 @@ How To Use Using LZMA encoder/decoder executable -------------------------------------- -Usage: LZMA <e|d> inputFile outputFile [<switches>...] +Usage: LZMA <e|d> inputFile outputFile [<switches>...] e: encode file @@ -272,52 +272,52 @@ Usage: LZMA <e|d> inputFile outputFile [<switches>...] -a{N}: set compression mode 0 = fast, 1 = normal - default: 1 (normal) + default: 1 (normal) d{N}: Sets Dictionary size - [0, 30], default: 23 (8MB) - The maximum value for dictionary size is 1 GB = 2^30 bytes. - Dictionary size is calculated as DictionarySize = 2^N bytes. - For decompressing file compressed by LZMA method with dictionary - size D = 2^N you need about D bytes of memory (RAM). + The maximum value for dictionary size is 1 GB = 2^30 bytes. + Dictionary size is calculated as DictionarySize = 2^N bytes. + For decompressing file compressed by LZMA method with dictionary + size D = 2^N you need about D bytes of memory (RAM). -fb{N}: set number of fast bytes - [5, 273], default: 128 - Usually big number gives a little bit better compression ratio - and slower compression process. + Usually big number gives a little bit better compression ratio + and slower compression process. -lc{N}: set number of literal context bits - [0, 8], default: 3 - Sometimes lc=4 gives gain for big files. + Sometimes lc=4 gives gain for big files. -lp{N}: set number of literal pos bits - [0, 4], default: 0 - lp switch is intended for periodical data when period is - equal 2^N. For example, for 32-bit (4 bytes) - periodical data you can use lp=2. Often it's better to set lc0, - if you change lp switch. + lp switch is intended for periodical data when period is + equal 2^N. For example, for 32-bit (4 bytes) + periodical data you can use lp=2. Often it's better to set lc0, + if you change lp switch. -pb{N}: set number of pos bits - [0, 4], default: 2 - pb switch is intended for periodical data - when period is equal 2^N. + pb switch is intended for periodical data + when period is equal 2^N. -mf{MF_ID}: set Match Finder. Default: bt4. - Algorithms from hc* group doesn't provide good compression - ratio, but they often works pretty fast in combination with - fast mode (-a0). + Algorithms from hc* group doesn't provide good compression + ratio, but they often works pretty fast in combination with + fast mode (-a0). - Memory requirements depend from dictionary size - (parameter "d" in table below). + Memory requirements depend from dictionary size + (parameter "d" in table below). - MF_ID Memory Description + MF_ID Memory Description - bt2 d * 9.5 + 4MB Binary Tree with 2 bytes hashing. - bt3 d * 11.5 + 4MB Binary Tree with 3 bytes hashing. - bt4 d * 11.5 + 4MB Binary Tree with 4 bytes hashing. - hc4 d * 7.5 + 4MB Hash Chain with 4 bytes hashing. + bt2 d * 9.5 + 4MB Binary Tree with 2 bytes hashing. + bt3 d * 11.5 + 4MB Binary Tree with 3 bytes hashing. + bt4 d * 11.5 + 4MB Binary Tree with 4 bytes hashing. + hc4 d * 7.5 + 4MB Hash Chain with 4 bytes hashing. -eos: write End Of Stream marker. By default LZMA doesn't write - eos marker, since LZMA decoder knows uncompressed size - stored in .lzma file header. + eos marker, since LZMA decoder knows uncompressed size + stored in .lzma file header. - -si: Read data from stdin (it will write End Of Stream marker). - -so: Write data to stdout + -si: Read data from stdin (it will write End Of Stream marker). + -so: Write data to stdout Examples: @@ -392,10 +392,10 @@ For some ISAs (for example, for MIPS) it's impossible to get gain from such filt LZMA compressed file format --------------------------- Offset Size Description - 0 1 Special LZMA properties for compressed data - 1 4 Dictionary size (little endian) - 5 8 Uncompressed size (little endian). -1 means unknown size - 13 Compressed data + 0 1 Special LZMA properties for compressed data + 1 4 Dictionary size (little endian) + 5 8 Uncompressed size (little endian). -1 means unknown size + 13 Compressed data ANSI-C LZMA Decoder @@ -629,18 +629,18 @@ _LZMA_IN_CB - Use callback for input data _LZMA_OUT_READ - Use read function for output data _LZMA_LOC_OPT - Enable local speed optimizations inside code. - _LZMA_LOC_OPT is only for LzmaDecodeSize.c (size-optimized version). - _LZMA_LOC_OPT doesn't affect LzmaDecode.c (speed-optimized version) - and LzmaStateDecode.c + _LZMA_LOC_OPT is only for LzmaDecodeSize.c (size-optimized version). + _LZMA_LOC_OPT doesn't affect LzmaDecode.c (speed-optimized version) + and LzmaStateDecode.c _LZMA_PROB32 - It can increase speed on some 32-bit CPUs, - but memory usage will be doubled in that case + but memory usage will be doubled in that case _LZMA_UINT32_IS_ULONG - Define it if int is 16-bit on your compiler - and long is 32-bit. + and long is 32-bit. _LZMA_SYSTEM_SIZE_T - Define it if you want to use system's size_t. - You can use it to enable 64-bit sizes supporting + You can use it to enable 64-bit sizes supporting |