From: Wolfgang Denk Date: Thu, 26 Oct 2006 14:24:31 +0000 (+0200) Subject: Code cleanup. X-Git-Tag: U-Boot-1_1_6~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b2a40bebbf1822506e80e631d7253e60f0e0fe6;p=oweals%2Fu-boot.git Code cleanup. --- diff --git a/CHANGELOG b/CHANGELOG index 1b8ca0439e..8f68b8e913 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,39 +1,72 @@ +commit 5e3b0bc19f07ed277d85324ad0427642c8981baf +Author: Haavard Skinnemoen +Date: Wed Oct 25 15:48:59 2006 +0200 + + Finish up support for the ATSTK1000/ATSTK1002 boards + + Add atstk1002_config target to Makefile and move the AVR32 section + down below Blackfin so that it doesn't end up in the middle of + MIPS. + + Drop the autogenerated linker script thing for now. Will have to + revisit how to handle chips with different flash and RAM layout + later. + + Signed-off-by: Haavard Skinnemoen + +commit c76f951a747cfb87ba826ef45b5aea82d5b5dbb4 +Author: Kumar Gala +Date: Tue Oct 24 23:47:37 2006 -0500 + + Added support for Multi-Image files that contain a device tree + + If a Multi-Image file contains a third image we try to use it as a + device tree. The device tree image is assumed to be uncompressed in the + image file. We automatically allocate space for the device tree in memory + and provide an 8k pad to allow more than a reasonable amount of growth. + + Additionally, a device tree that was contained in flash will now automatically + get copied to system memory as part of boot. Previously an error was + reported if one tried to boot a device tree that was in flash. + + Signed-off-by: Kumar Gala + commit 7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512 Author: Wolfgang Denk -Date: Tue Oct 24 21:35:55 2006 +0200 +Date: Tue Oct 24 21:35:55 2006 +0200 Switch to automatically generated CHANGELOG file. (use "make CHANGELOG" to update it from time to time) commit 7ade0c634a979c32fa91a74e8f5775f24651fbe6 Author: Stefan Roese -Date: Tue Oct 24 18:06:48 2006 +0200 +Date: Tue Oct 24 18:06:48 2006 +0200 Fix bug in PPC440 NAND driver cpu/ppc4xx/ndfc.c Patch by Stefan Roese, 24 Oct 2006 commit 8ae3b713b2286e0c3213b7802062e4c1599010de Author: Wolfgang Denk -Date: Tue Oct 24 17:24:55 2006 +0200 +Date: Tue Oct 24 17:24:55 2006 +0200 Merge with /home/wd/git/u-boot/master commit 47a6989c10685d2ab3efcf95228ce50d2a496d3e Author: Wolfgang Denk -Date: Tue Oct 24 15:32:57 2006 +0200 +Date: Tue Oct 24 15:32:57 2006 +0200 Code cleanup commit 3a78e3e75b633ecb6413114ffd11e2f000c4f11e Author: Wolfgang Denk -Date: Tue Oct 24 14:51:36 2006 +0200 +Date: Tue Oct 24 14:51:36 2006 +0200 Move atstk1000 files into vendor specific directory. Patch by Haavard Skinnemoen, 12 Sep 2006 commit 6ccec4492e77428fd6eafd3dfe94fbdf08e91d37 Author: Wolfgang Denk -Date: Tue Oct 24 14:42:37 2006 +0200 +Date: Tue Oct 24 14:42:37 2006 +0200 Add ATSTK1000 and ATSTK1002 board support Patch by Haavard Skinnemoen, 06 Sep 2006 @@ -55,7 +88,7 @@ Date: Tue Oct 24 14:42:37 2006 +0200 commit f93ae788c3640fcde5db383471d45548ff4060d0 Author: Wolfgang Denk -Date: Tue Oct 24 14:31:24 2006 +0200 +Date: Tue Oct 24 14:31:24 2006 +0200 Add common serial driver for Atmel AT32 and AT91 chips Patch by Haavard Skinnemoen, 06 Sep 2006 @@ -70,15 +103,15 @@ Date: Tue Oct 24 14:31:24 2006 +0200 AT32AP CPU port: * pm_get_clock_freq: Obtain the clock frequency of a given domain * gd->console_uart: A "struct device" containing information about - register mappings, gpio resources and clocks associated with the - UART device. + register mappings, gpio resources and clocks associated with the + UART device. For more information about these features, please see the "AT32AP CPU" patch. commit 72a087e04705c26cad982879ebd06b5281bf825a Author: Wolfgang Denk -Date: Tue Oct 24 14:27:35 2006 +0200 +Date: Tue Oct 24 14:27:35 2006 +0200 Add AT32AP CPU and AT32AP7000 SoC support Patch by Haavard Skinnemoen, 06 Sep 2006 @@ -103,7 +136,7 @@ Date: Tue Oct 24 14:27:35 2006 +0200 commit 7b64fef33c66be648826c0ff9758298ef13d0604 Author: Wolfgang Denk -Date: Tue Oct 24 14:21:16 2006 +0200 +Date: Tue Oct 24 14:21:16 2006 +0200 Add AVR32 architecture support Patch by Haavard Skinnemoen, 6 Sep 2006 16:23:02 +0200 @@ -115,7 +148,7 @@ Date: Tue Oct 24 14:21:16 2006 +0200 commit 2da2d9a4766063b9848f3a35ad6025499cf87265 Author: Wolfgang Denk -Date: Tue Oct 24 13:57:33 2006 +0200 +Date: Tue Oct 24 13:57:33 2006 +0200 Use -g instead of -gstabs in AFLAGS_DEBUG Patch by Haavard Skinnemoen, 30 Aug 2006 @@ -127,20 +160,20 @@ Date: Tue Oct 24 13:57:33 2006 +0200 commit 965829872169c2996023840d98e1d85ad148d629 Author: Wolfgang Denk -Date: Tue Oct 24 13:55:18 2006 +0200 +Date: Tue Oct 24 13:55:18 2006 +0200 Fix/workaround broken dependency handling with make 3.81 Based on patch by Haavard Skinnemoen, 29 Aug 2006 11:20:39 +0200 commit 8318fbf8cc30418b621ea9f39b84b4c1a08f003a Author: Marian Balakowicz -Date: Mon Oct 23 22:17:05 2006 +0200 +Date: Mon Oct 23 22:17:05 2006 +0200 Fix sequoia separate object direcory building problems. commit 3dfa9cfdcee78b30da3432318b32821ffabe974b Author: Jon Loeliger -Date: Fri Oct 20 17:16:35 2006 -0500 +Date: Fri Oct 20 17:16:35 2006 -0500 Use generic I2C register block on 85xx and 86xx. @@ -151,7 +184,7 @@ Date: Fri Oct 20 17:16:35 2006 -0500 commit f5012827df11ca0c9be1df5f8b153e188dc2fa7c Author: Jon Loeliger -Date: Fri Oct 20 15:54:34 2006 -0500 +Date: Fri Oct 20 15:54:34 2006 -0500 Fix compilation warnings on a few 85xx boards. @@ -159,7 +192,7 @@ Date: Fri Oct 20 15:54:34 2006 -0500 commit 2047672684cf85cb6f96a1fbc993180aaaf19a99 Author: Jon Loeliger -Date: Fri Oct 20 15:50:15 2006 -0500 +Date: Fri Oct 20 15:50:15 2006 -0500 Converted all 85xx boards to use a common FSL I2C driver. Introduced COFIG_FSL_I2C to select the common FSL I2C driver. @@ -170,7 +203,7 @@ Date: Fri Oct 20 15:50:15 2006 -0500 commit 4d45f69e362b05892c9e92a7907e5820995612aa Author: Jon Loeliger -Date: Thu Oct 19 12:02:24 2006 -0500 +Date: Thu Oct 19 12:02:24 2006 -0500 Rewrite a series of goto statements as a sequences of conditional expressions instead. @@ -183,7 +216,7 @@ Date: Thu Oct 19 12:02:24 2006 -0500 commit 7237c033b02fe295880435f1eb80819a0c987532 Author: Jon Loeliger -Date: Thu Oct 19 11:02:16 2006 -0500 +Date: Thu Oct 19 11:02:16 2006 -0500 Moved i2c driver out of cpu/mpc86xx/i2c.c into drivers/fsl_i2c.c @@ -194,15 +227,22 @@ Date: Thu Oct 19 11:02:16 2006 -0500 commit 13a7fcdf37f6ea9429ae04c9df67f893364cfe4b Author: Jon Loeliger -Date: Thu Oct 19 11:33:52 2006 -0500 +Date: Thu Oct 19 11:33:52 2006 -0500 * Fix a bunch of compiler warnings for gcc 4.0 Signed-off-by: Matthew McClintock +commit af9e1f5b9e6f9ce810f5e8bf2961c9542a5865c2 +Author: Stefan Roese +Date: Tue Oct 17 06:14:31 2006 +0200 + + Add monitor functions for indirect access to PPC440 DCR's + Patch by Leonid Baryudin, 12 Oct 2006 + commit 5f3249a0a168e446a4cc9669b2bce0bc456f0a09 Author: Jon Loeliger -Date: Fri Oct 13 16:47:53 2006 -0500 +Date: Fri Oct 13 16:47:53 2006 -0500 Fixed leading whitespace issues. Removed spurious LAWAR thing. @@ -211,7 +251,7 @@ Date: Fri Oct 13 16:47:53 2006 -0500 commit 0ee90cb77e01d6e8ccd37e1bd96678597875c391 Author: Jon Loeliger -Date: Thu Oct 12 10:42:36 2006 -0500 +Date: Thu Oct 12 10:42:36 2006 -0500 Remove unneeded include files and local variable. @@ -219,7 +259,7 @@ Date: Thu Oct 12 10:42:36 2006 -0500 commit 1eaf3a5ff4960a46f3a9063568ba2af7883f07c5 Author: Grant Likely -Date: Tue Oct 10 00:23:32 2006 -0600 +Date: Tue Oct 10 00:23:32 2006 -0600 Fix possible uninitialized variable compiler warning. @@ -233,7 +273,7 @@ Date: Tue Oct 10 00:23:32 2006 -0600 commit 7376eb87aaa601f728f9b8e5e9cd2711a67f529e Author: Matthew McClintock -Date: Wed Oct 11 15:13:01 2006 -0500 +Date: Wed Oct 11 15:13:01 2006 -0500 * Fix a bunch of compiler warnings for gcc 4.0 @@ -241,51 +281,51 @@ Date: Wed Oct 11 15:13:01 2006 -0500 commit bf651baa365e5447246aad6a633ccd667cf24a39 Author: Jon Loeliger -Date: Wed Oct 11 10:10:43 2006 -0500 +Date: Wed Oct 11 10:10:43 2006 -0500 Move "ar" flags to config.mk to allow for silent "make -s" commit 1fd5699a4a24f5c1dab1b32f480bace1ebb9fc3e Author: Jon Loeliger -Date: Tue Oct 10 17:19:03 2006 -0500 +Date: Tue Oct 10 17:19:03 2006 -0500 Coding style changes to remove local varible blocks and reformat a bit nicer. commit 8b283dbb3a08d1b8d406bc15f119e081b3e2606a Author: Jon Loeliger -Date: Tue Oct 10 17:16:04 2006 -0500 +Date: Tue Oct 10 17:16:04 2006 -0500 Fix whitespace issues. commit 7b382b7125f2397cce63253df62f183e3dfa2770 Author: Jon Loeliger -Date: Tue Oct 10 17:14:45 2006 -0500 +Date: Tue Oct 10 17:14:45 2006 -0500 Fix whitespace issues. commit e10390ddd736b0dad1528eec4b0fe35c0827139a Author: Jon Loeliger -Date: Tue Oct 10 17:06:53 2006 -0500 +Date: Tue Oct 10 17:06:53 2006 -0500 Fix whitespace issues. commit 89875e96ba3f023157bf50d5f8e33bf254964a76 Author: Jon Loeliger -Date: Tue Oct 10 17:03:43 2006 -0500 +Date: Tue Oct 10 17:03:43 2006 -0500 Ran lindent and cleaned up whitespace issues. Format for 80-columns too. commit 333961ae7095fc66d8a041fce1ac9ee873b09d86 Author: Jon Loeliger -Date: Tue Oct 10 17:02:22 2006 -0500 +Date: Tue Oct 10 17:02:22 2006 -0500 Fix whitespace and 80-col issues. commit f55df18187e7a45cb73fec4370d12135e6691ae1 Author: John Traill -Date: Fri Sep 29 08:23:12 2006 +0100 +Date: Fri Sep 29 08:23:12 2006 +0100 Fix missing tCycle/modfreq calculation. @@ -293,13 +333,13 @@ Date: Fri Sep 29 08:23:12 2006 +0100 commit 8272dc2f58f2473d8995fcc9b916440cfba080f0 Author: Andy Fleming -Date: Wed Sep 13 10:33:35 2006 -0500 +Date: Wed Sep 13 10:33:35 2006 -0500 Updated config headers to add default FDT-based booting commit 09f3e09e9ebcfa7919ca8931a4b5504fadd1f1d3 Author: Andy Fleming -Date: Wed Sep 13 10:34:18 2006 -0500 +Date: Wed Sep 13 10:34:18 2006 -0500 Add support for eTSEC 3 & 4 on 8548 CDS @@ -310,7 +350,7 @@ Date: Wed Sep 13 10:34:18 2006 -0500 commit 084d648b109c8984f83674043c1a7fa3885ef801 Author: Andy Fleming -Date: Wed Sep 13 10:33:56 2006 -0500 +Date: Wed Sep 13 10:33:56 2006 -0500 Added code to support 2.6.18 PCI changes in u-boot @@ -318,7 +358,7 @@ Date: Wed Sep 13 10:33:56 2006 -0500 commit afbdc649f8751e4f4f1a6f527edfe139773f2c15 Author: Jon Loeliger -Date: Tue Sep 19 09:34:10 2006 -0500 +Date: Tue Sep 19 09:34:10 2006 -0500 Modified makefile for new build mechanism. @@ -326,7 +366,7 @@ Date: Tue Sep 19 09:34:10 2006 -0500 commit d14ba6a798beb753e7a864500414fcc2d198b8bc Author: Jon Loeliger -Date: Thu Sep 14 08:40:36 2006 -0500 +Date: Thu Sep 14 08:40:36 2006 -0500 Handle 86xx SVR values according to the new Reference Manual. Both 8641 and 8641D have SVR == 0x8090, and are distinguished @@ -337,7 +377,7 @@ Date: Thu Sep 14 08:40:36 2006 -0500 commit 88c8f4921fc47fb0eb2384b16586f1bd7f275be7 Author: Zhang Wei -Date: Mon Aug 28 14:25:31 2006 +0800 +Date: Mon Aug 28 14:25:31 2006 +0800 Fixed an OF-tree off-by-one bug when adding a new property name. This bug will cause the kernel booting to pause a long time. @@ -347,25 +387,25 @@ Date: Mon Aug 28 14:25:31 2006 +0800 commit 9bff7a69a885adebbd2bd45990494ec4cf998a30 Author: Jon Loeliger -Date: Tue Aug 29 11:05:09 2006 -0500 +Date: Tue Aug 29 11:05:09 2006 -0500 Remove trailing empty lines. commit cd6d73d5b895a5935ac4fde0a356288142a584e0 Author: Jon Loeliger -Date: Tue Aug 29 09:48:49 2006 -0500 +Date: Tue Aug 29 09:48:49 2006 -0500 Remove bogus msync and use volatile asm. commit 778d45049ce5927b65b3ff1d8e6692b654bdd49e Author: Jon Loeliger -Date: Tue Aug 29 08:17:14 2006 -0500 +Date: Tue Aug 29 08:17:14 2006 -0500 Add myself as maintainer for MPC8641HPCN. commit 2f15776ccc6dc32377d8ba9652b8f58059c27c6d Author: Zhang Wei -Date: Mon Aug 28 14:25:31 2006 +0800 +Date: Mon Aug 28 14:25:31 2006 +0800 Fixed an OF-tree off-by-one bug when adding a new property name. This bug will cause the kernel booting to pause a long time. @@ -374,7 +414,7 @@ Date: Mon Aug 28 14:25:31 2006 +0800 commit 5567806b67d0ae83493aa8823ad3b6c914f581d7 Author: Haiying Wang -Date: Fri Aug 25 14:38:34 2006 -0400 +Date: Fri Aug 25 14:38:34 2006 -0400 Change ramdiskaddr and dtbaddr Remove PEX fluff commands. @@ -384,7 +424,7 @@ Date: Fri Aug 25 14:38:34 2006 -0400 commit b2b78421d9db49c21a821af8a19c21c1f7dfb29e Author: Matthew McClintock -Date: Wed Aug 23 13:32:45 2006 -0500 +Date: Wed Aug 23 13:32:45 2006 -0500 * Another small fix for booting with disable_of @@ -392,13 +432,13 @@ Date: Wed Aug 23 13:32:45 2006 -0500 commit 4a7cc0f21918e6ecf07ed57075d67df2c4a1299c Author: Jon Loeliger -Date: Wed Aug 23 11:04:43 2006 -0500 +Date: Wed Aug 23 11:04:43 2006 -0500 Cleanup and lindent new AHCI driver. commit dabf9ef8c10b4dead5ef2106ef742b1c06b542de Author: Jin Zhengxiong -Date: Wed Aug 23 19:15:12 2006 +0800 +Date: Wed Aug 23 19:15:12 2006 +0800 Add AHCI define and sata support for MPC8641HPCN board. @@ -406,7 +446,7 @@ Date: Wed Aug 23 19:15:12 2006 +0800 commit 4782ac80b02f0d01afd309e2200dd3c7037f2ba4 Author: Jin Zhengxiong -Date: Wed Aug 23 19:10:44 2006 +0800 +Date: Wed Aug 23 19:10:44 2006 +0800 Add AHCI support to u-boot @@ -417,7 +457,7 @@ Date: Wed Aug 23 19:10:44 2006 +0800 commit d8ea2acf5f137cae99417df4f573d036ee384668 Author: Zhang Wei -Date: Wed Aug 23 17:54:32 2006 +0800 +Date: Wed Aug 23 17:54:32 2006 +0800 Add dtb boot-up parameter to default boot commands. @@ -425,43 +465,43 @@ Date: Wed Aug 23 17:54:32 2006 +0800 commit b93775c2036b99baa390ea425c4771895bbc63c4 Author: Jon Loeliger -Date: Tue Aug 22 18:26:08 2006 -0500 +Date: Tue Aug 22 18:26:08 2006 -0500 Cleanup even more poorly introduced whitespace. commit ae6241685cbcf0c79a3636530d2ceab1fb291a94 Author: Jon Loeliger -Date: Tue Aug 22 18:07:00 2006 -0500 +Date: Tue Aug 22 18:07:00 2006 -0500 Cleanup more poorly introduced whitespace. commit 2c33e8a1c535b3ae91cf0b284480600bf3f57c57 Author: Jon Loeliger -Date: Tue Aug 22 17:54:05 2006 -0500 +Date: Tue Aug 22 17:54:05 2006 -0500 Cleanup poorly introduced whitespace. commit 80e955c7dd98f4b4fd23c2113caf75ed2b77b5b3 Author: Jon Loeliger -Date: Tue Aug 22 12:25:27 2006 -0500 +Date: Tue Aug 22 12:25:27 2006 -0500 General indent and whitespace cleanups. commit ffff3ae56f5842ca3679e4ce7922b819a87aad9f Author: Jon Loeliger -Date: Tue Aug 22 12:06:18 2006 -0500 +Date: Tue Aug 22 12:06:18 2006 -0500 General indent and whitespace cleanups. commit 41a0e8b304d3ff55fe27a230507aac79684016ac Author: Jon Loeliger -Date: Tue Aug 22 10:42:21 2006 -0500 +Date: Tue Aug 22 10:42:21 2006 -0500 Cleanup compiler warnings. commit 5de62c47a8628b3da4d73f7c07027f32a3342d40 Author: Matthew McClintock -Date: Tue Aug 22 09:31:59 2006 -0500 +Date: Tue Aug 22 09:31:59 2006 -0500 Fix disable_of booting @@ -469,7 +509,7 @@ Date: Tue Aug 22 09:31:59 2006 -0500 commit 87a449c8ac396420cb24260f717ea9e6faa82047 Author: Matthew McClintock -Date: Tue Aug 22 09:23:55 2006 -0500 +Date: Tue Aug 22 09:23:55 2006 -0500 Support for FDT in uImage format, error when using FDT from flash @@ -477,31 +517,31 @@ Date: Tue Aug 22 09:23:55 2006 -0500 commit 75c299c38369d01addd5e054b8a16217b70f4a86 Author: Haiying Wang -Date: Tue Aug 15 15:12:55 2006 -0400 +Date: Tue Aug 15 15:12:55 2006 -0400 Unlock cache before kernel starts up for MPC86xx commit 67256678f00c09b0a7f19e862e5c1847553d31bc Author: Haiying Wang -Date: Tue Aug 15 15:13:15 2006 -0400 +Date: Tue Aug 15 15:13:15 2006 -0400 Copy Global Data Pointer to r29 for DECLARE_GLOBAL_DATA_PTR commit 1c8f6d8fb028f156094d05f2d14298e6479364ac Author: Haiying Wang -Date: Tue Aug 15 15:12:55 2006 -0400 +Date: Tue Aug 15 15:12:55 2006 -0400 Unlock cache before kernel starts up for MPC86xx commit 0d9ccc55edf9a7f3c5b2b6263580a6ea8d702a04 Author: Haiying Wang -Date: Tue Aug 15 15:13:15 2006 -0400 +Date: Tue Aug 15 15:13:15 2006 -0400 Copy Global Data Pointer to r29 for DECLARE_GLOBAL_DATA_PTR commit 86c8e17f25e972a7e272950a0735fad84e082b88 Author: Matthew McClintock -Date: Wed Aug 16 13:59:47 2006 -0500 +Date: Wed Aug 16 13:59:47 2006 -0500 * Fix disable_of booting @@ -509,7 +549,7 @@ Date: Wed Aug 16 13:59:47 2006 -0500 commit 25c751e9adc86e22fe3b5b47cf2806379b575db7 Author: Matthew McClintock -Date: Wed Aug 16 10:54:09 2006 -0500 +Date: Wed Aug 16 10:54:09 2006 -0500 * Support for FDT in uImage format, error when using FDT from flash @@ -517,7 +557,7 @@ Date: Wed Aug 16 10:54:09 2006 -0500 commit fecf1c7e4de1b2779edc18742b91c22bdc32b68b Author: Jon Loeliger -Date: Mon Aug 14 15:33:38 2006 -0500 +Date: Mon Aug 14 15:33:38 2006 -0500 Fix BAT0 to actually be cacheable, non-guarded as documented. @@ -525,7 +565,7 @@ Date: Mon Aug 14 15:33:38 2006 -0500 commit 40bc83559db5745681909fd7382ae509567e116d Author: Jon Loeliger -Date: Wed Aug 9 15:32:16 2006 -0500 +Date: Wed Aug 9 15:32:16 2006 -0500 Removed MPC8641HPCN DTS source file from build. It is no longer linked into U-Boot; its sources are @@ -535,7 +575,7 @@ Date: Wed Aug 9 15:32:16 2006 -0500 commit 34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb Author: Matthew McClintock -Date: Wed Jun 28 10:47:03 2006 -0500 +Date: Wed Jun 28 10:47:03 2006 -0500 * Switched default PCI speed for 8540 ADS back to 33MHz @@ -547,7 +587,7 @@ Date: Wed Jun 28 10:47:03 2006 -0500 commit b6c5e1373b6ea0bb37a18e4aeecec00613d1cd39 Author: Matthew McClintock -Date: Wed Jun 28 10:46:35 2006 -0500 +Date: Wed Jun 28 10:46:35 2006 -0500 * Fixed a bug where 8555 PCI code used the old variable and function names Patch by Andy Fleming 17-Mar-2006 @@ -555,7 +595,7 @@ Date: Wed Jun 28 10:46:35 2006 -0500 commit bf1dfffd8c26f8ecdd630a0ae4c834e751e4e452 Author: Matthew McClintock -Date: Wed Jun 28 10:46:13 2006 -0500 +Date: Wed Jun 28 10:46:13 2006 -0500 * Added VIA configuration table @@ -566,7 +606,7 @@ Date: Wed Jun 28 10:46:13 2006 -0500 commit c88f9fe66b64247e5b6a38410ba315ca25596d16 Author: Matthew McClintock -Date: Wed Jun 28 10:45:41 2006 -0500 +Date: Wed Jun 28 10:45:41 2006 -0500 * Fixed PCI memory definitions Patch by Andy Fleming 17-Mar-2006 @@ -574,7 +614,7 @@ Date: Wed Jun 28 10:45:41 2006 -0500 commit 97074ed9655309b64231bc2cee69fe85399f8055 Author: Matthew McClintock -Date: Wed Jun 28 10:45:17 2006 -0500 +Date: Wed Jun 28 10:45:17 2006 -0500 * Added support for initializing second PCI bus on 85xx Patch by Andy Fleming 17-Mar-2006 @@ -582,7 +622,7 @@ Date: Wed Jun 28 10:45:17 2006 -0500 commit f0e6f57f71b3c4fdd13028eb03c3f3e91926dda2 Author: Matthew McClintock -Date: Wed Jun 28 10:44:49 2006 -0500 +Date: Wed Jun 28 10:44:49 2006 -0500 * Added PCI-X #defines for PCI-X initialization Patch by Andy Fleming on 17-Mar-2006 @@ -590,7 +630,7 @@ Date: Wed Jun 28 10:44:49 2006 -0500 commit a4e11558b810ef2cddffdf7b9d86bc1130441960 Author: Matthew McClintock -Date: Wed Jun 28 10:44:23 2006 -0500 +Date: Wed Jun 28 10:44:23 2006 -0500 * Made sure the code which disables prefetch for PCI devices sets the size of the prefetch region to 0 Patch by Andy Fleming on 17-Mar-2006 @@ -598,7 +638,7 @@ Date: Wed Jun 28 10:44:23 2006 -0500 commit 0e16387db1d4aacd5bf35cb6d7c1942765c0347b Author: Matthew McClintock -Date: Wed Jun 28 10:43:36 2006 -0500 +Date: Wed Jun 28 10:43:36 2006 -0500 * Add Flat Dev Tree construction for MPC85xx ADS and CDS boards Patch by Jon Loeliger 17-Jan-2006 @@ -606,25 +646,25 @@ Date: Wed Jun 28 10:43:36 2006 -0500 commit 855e6fb073f9d04fe4a7f06c107ecbac6344ddd4 Author: Matthew McClintock -Date: Wed Jun 28 10:43:00 2006 -0500 +Date: Wed Jun 28 10:43:00 2006 -0500 * Removed the oftree.dts for stxxtx in light of the changes to the flat device tree handling code Patch by Matthew McClintock 26-June-2006 commit 5498d90312aad9f6bdbf047986027c35b03cd163 Author: Matthew McClintock -Date: Wed Jun 28 10:42:24 2006 -0500 +Date: Wed Jun 28 10:42:24 2006 -0500 * Patch to modify ft_build.c to update flat device trees in place Patch by Matthew McClintock 26-June-2006 commit 0267768eddc5ca7bc1865bc40c866829ac5efbfe Author: Matthew McClintock -Date: Wed Jun 28 10:41:37 2006 -0500 +Date: Wed Jun 28 10:41:37 2006 -0500 * Modify bootm command to support booting with flat device trees Patch by Matthew McClintock 26-June-2006 commit 8fc8bd2cc479b6cd188fdede4010e0e052970b8a Author: John Traill -Date: Wed Aug 9 14:33:50 2006 +0100 +Date: Wed Aug 9 14:33:50 2006 +0100 Add Rapidio support for the MPC8641HPCN @@ -632,7 +672,7 @@ Date: Wed Aug 9 14:33:50 2006 +0100 commit 91a414c7d1fb0eac912592cd995b30c9f23045c9 Author: John Traill -Date: Tue Aug 8 11:32:43 2006 +0100 +Date: Tue Aug 8 11:32:43 2006 +0100 Fix caslat calculation @@ -640,43 +680,43 @@ Date: Tue Aug 8 11:32:43 2006 +0100 commit 709d3073e74153278e7904a70819bbef7df50e1a Author: Jon Loeliger -Date: Thu Aug 3 16:17:56 2006 -0500 +Date: Thu Aug 3 16:17:56 2006 -0500 Convert to mac-address in ethernet nodes. commit 71748af833ca1017edf1415be376366ff2937d17 Author: Haiying Wang -Date: Fri Jul 28 12:41:35 2006 -0400 +Date: Fri Jul 28 12:41:35 2006 -0400 Correct the irq value of DUART2 commit 9cb3e8816ae4d854e7dc22128c3eea3d70bb982c Author: Haiying Wang -Date: Fri Jul 28 12:41:41 2006 -0400 +Date: Fri Jul 28 12:41:41 2006 -0400 Change the space size of PEX IO in README commit 239db37c94f7a92941c4465feceb867c609241c5 Author: Haiying Wang -Date: Fri Jul 28 12:41:18 2006 -0400 +Date: Fri Jul 28 12:41:18 2006 -0400 Move get_board_sys_clk to board directory commit 492900b985439fbce1a118afde1e35def870db03 Author: John Traill -Date: Fri Jul 28 09:03:54 2006 +0100 +Date: Fri Jul 28 09:03:54 2006 +0100 Fix 8641HPCN pollution commit 515ab8a62e8574e2babc6e8dcc43544ad221c5b2 Author: John Traill -Date: Fri Jul 28 08:16:06 2006 +0100 +Date: Fri Jul 28 08:16:06 2006 +0100 Fix 8641HPCN timebase commit c86360b830f1eecd7a72208575dde4f57879faea Author: Zhang Wei -Date: Fri Jul 28 00:01:34 2006 +0800 +Date: Fri Jul 28 00:01:34 2006 +0800 Fixed OF device tree of mpc86xxhpcn board. @@ -686,7 +726,7 @@ Date: Fri Jul 28 00:01:34 2006 +0800 commit bea3f28d285942bf3f7ab339ce85178ded544225 Author: Haiying Wang -Date: Wed Jul 12 10:48:05 2006 -0400 +Date: Wed Jul 12 10:48:05 2006 -0400 Add support for reading and writing mac addresses to or from ID EEPROM. @@ -708,7 +748,7 @@ Date: Wed Jul 12 10:48:05 2006 -0400 commit fcb28e763415e0e4e66b0f45842d1557ae198e5e Author: Jin Zhengxiong -Date: Thu Jul 13 10:35:10 2006 -0500 +Date: Thu Jul 13 10:35:10 2006 -0500 Fixed initrd issue by define big RAM @@ -716,7 +756,7 @@ Date: Thu Jul 13 10:35:10 2006 -0500 commit e6cd2a1785d74ec3d30a86f1cb360be8de478151 Author: Jason Jin -Date: Fri Jul 7 10:01:45 2006 -0500 +Date: Fri Jul 7 10:01:45 2006 -0500 We made a u-boot patch to fix the hang up issue when booting filesystem from ramdisk. @@ -725,7 +765,7 @@ Date: Fri Jul 7 10:01:45 2006 -0500 commit 38433ccc5850ee70549af0b2bc5b920355ef5388 Author: Matthew McClintock -Date: Wed Jun 28 10:47:03 2006 -0500 +Date: Wed Jun 28 10:47:03 2006 -0500 * Switched default PCI speed for 8540 ADS back to 33MHz * Added comments and a printf to warn that PCI-X won't @@ -736,7 +776,7 @@ Date: Wed Jun 28 10:47:03 2006 -0500 commit e4c2a0eb0c3e3ffbf824800184ee42bdc99d5b19 Author: Matthew McClintock -Date: Wed Jun 28 10:46:35 2006 -0500 +Date: Wed Jun 28 10:46:35 2006 -0500 * Fixed a bug where 8555 PCI code used the old variable and function names @@ -746,7 +786,7 @@ Date: Wed Jun 28 10:46:35 2006 -0500 commit cbfc7ce756b88eb26e5537bc7b625c445c6dcfac Author: Matthew McClintock -Date: Wed Jun 28 10:46:13 2006 -0500 +Date: Wed Jun 28 10:46:13 2006 -0500 * Added VIA configuration table * Added support for PCI2 on CDS @@ -756,7 +796,7 @@ Date: Wed Jun 28 10:46:13 2006 -0500 commit 52c7a68b8d587ebcf5a6b051b58b3d3ffa377ddc Author: Matthew McClintock -Date: Wed Jun 28 10:45:41 2006 -0500 +Date: Wed Jun 28 10:45:41 2006 -0500 * Fixed PCI memory definitions Patch by Andy Fleming 17-Mar-2006 @@ -765,7 +805,7 @@ Date: Wed Jun 28 10:45:41 2006 -0500 commit 087454609e47295443af793a282cddcd91a5f49c Author: Matthew McClintock -Date: Wed Jun 28 10:45:17 2006 -0500 +Date: Wed Jun 28 10:45:17 2006 -0500 * Added support for initializing second PCI bus on 85xx Patch by Andy Fleming 17-Mar-2006 @@ -774,7 +814,7 @@ Date: Wed Jun 28 10:45:17 2006 -0500 commit b636aaeb6fd516a442fb611bbeeddf3077a687fb Author: Matthew McClintock -Date: Wed Jun 28 10:44:49 2006 -0500 +Date: Wed Jun 28 10:44:49 2006 -0500 * Added PCI-X #defines for PCI-X initialization Patch by Andy Fleming on 17-Mar-2006 @@ -783,7 +823,7 @@ Date: Wed Jun 28 10:44:49 2006 -0500 commit 20abbc6fffa115690107cc942c7abf84bdc03a1b Author: Matthew McClintock -Date: Wed Jun 28 10:44:23 2006 -0500 +Date: Wed Jun 28 10:44:23 2006 -0500 * Made sure the code which disables prefetch for PCI devices sets the size of the prefetch region to 0 @@ -793,7 +833,7 @@ Date: Wed Jun 28 10:44:23 2006 -0500 commit 40d5fa35d02df22580593bf0039ab173367e8ef0 Author: Matthew McClintock -Date: Wed Jun 28 10:43:36 2006 -0500 +Date: Wed Jun 28 10:43:36 2006 -0500 * Add Flat Dev Tree construction for MPC85xx ADS and CDS boards Patch by Jon Loeliger 17-Jan-2006 @@ -802,7 +842,7 @@ Date: Wed Jun 28 10:43:36 2006 -0500 commit be7e8b0cb5a0c49dc180075b96df296a893bf146 Author: Matthew McClintock -Date: Wed Jun 28 10:43:00 2006 -0500 +Date: Wed Jun 28 10:43:00 2006 -0500 * Removed the oftree.dts for stxxtx in light of the changes to the flat device tree handling code @@ -810,21 +850,21 @@ Date: Wed Jun 28 10:43:00 2006 -0500 commit 1b380ec225665e73959677f3893dc658c5925e05 Author: Matthew McClintock -Date: Wed Jun 28 10:42:24 2006 -0500 +Date: Wed Jun 28 10:42:24 2006 -0500 * Patch to modify ft_build.c to update flat device trees in place Patch by Matthew McClintock 26-June-2006 commit 98a9c4d468a942a09ebe8979bec508017f3e4462 Author: Matthew McClintock -Date: Wed Jun 28 10:41:37 2006 -0500 +Date: Wed Jun 28 10:41:37 2006 -0500 * Modify bootm command to support booting with flat device trees Patch by Matthew McClintock 26-June-2006 commit da012ab661fd4ab169dd7b9b32201a4df62cf34a Author: Jin Zhengxiong -Date: Wed Jun 28 08:43:56 2006 -0500 +Date: Wed Jun 28 08:43:56 2006 -0500 Change Id to symbolic name for RTL8139 @@ -832,7 +872,7 @@ Date: Wed Jun 28 08:43:56 2006 -0500 commit bc09cf3c2bfb8d54c659cbb332f79d0950982fd0 Author: Jin Zhengxiong-R64188 -Date: Tue Jun 27 18:12:10 2006 +0800 +Date: Tue Jun 27 18:12:10 2006 +0800 Fix RTL8139 in big endian @@ -841,7 +881,7 @@ Date: Tue Jun 27 18:12:10 2006 +0800 commit fcfb9a57947fc203b99fe81ab0578f7286261f9f Author: Jin Zhengxiong-R64188 -Date: Tue Jun 27 18:12:23 2006 +0800 +Date: Tue Jun 27 18:12:23 2006 +0800 Fix Tsec bug when no link @@ -853,7 +893,7 @@ Date: Tue Jun 27 18:12:23 2006 +0800 commit bd22c2b97514fbfb0e03bd9c72b3445e4dbd57e2 Author: Jin Zhengxiong-R64188 -Date: Tue Jun 27 18:12:02 2006 +0800 +Date: Tue Jun 27 18:12:02 2006 +0800 Fix bug for io_bar size during pci scan @@ -865,7 +905,7 @@ Date: Tue Jun 27 18:12:02 2006 +0800 commit fa7db9c377bc2353a17bf1d381d65a6c418728f0 Author: Jin Zhengxiong-R64188 -Date: Tue Jun 27 18:11:54 2006 +0800 +Date: Tue Jun 27 18:11:54 2006 +0800 Enable PCIE1 for MPC8641HPCN board @@ -873,7 +913,7 @@ Date: Tue Jun 27 18:11:54 2006 +0800 commit 684623ce92c5fd32e7db2d6e016945a67c5ffaba Author: Jon Loeliger -Date: Thu Jun 22 08:51:46 2006 -0500 +Date: Thu Jun 22 08:51:46 2006 -0500 Fix bug in 8641hpcn reset command with no args. @@ -882,13 +922,13 @@ Date: Thu Jun 22 08:51:46 2006 -0500 commit 8be429a5ddbf0ebe2d94174ba58fcfc7a24285dc Author: Zhang Wei -Date: Tue Jun 20 17:47:15 2006 +0800 +Date: Tue Jun 20 17:47:15 2006 +0800 Reworked IRQ mapping in OF-tree. commit 0e4c2a17ca34001ed36d259f13cb88ada4611a8c Author: Jon Loeliger -Date: Thu Jun 15 21:33:37 2006 -0500 +Date: Thu Jun 15 21:33:37 2006 -0500 Do not enable address translation on secondary CPUs. Do not set up BATs on secondary CPUs. Let Linux do the nasty. @@ -897,7 +937,7 @@ Date: Thu Jun 15 21:33:37 2006 -0500 commit 8ecc971618f56029ad99d3516f8b297a6ed58971 Author: Jon Loeliger -Date: Wed Jun 7 10:53:55 2006 -0500 +Date: Wed Jun 7 10:53:55 2006 -0500 Fix a get_board_sys_clk() use-before-def warning. @@ -905,7 +945,7 @@ Date: Wed Jun 7 10:53:55 2006 -0500 commit d9bf4858fca5aa4d651b283270f77da72ebadfd5 Author: Jon Loeliger -Date: Wed Jun 7 10:52:49 2006 -0500 +Date: Wed Jun 7 10:52:49 2006 -0500 Allow DTC path to be passed in. @@ -913,13 +953,13 @@ Date: Wed Jun 7 10:52:49 2006 -0500 commit c83ae9ea6d93abbe751bf8a3396236a084e56f87 Author: Haiying Wang -Date: Tue Jun 6 16:54:29 2006 -0400 +Date: Tue Jun 6 16:54:29 2006 -0400 Modify the IRQ of DUART2 commit c934f655f9aeca70a5c5f88b465d9e9d57a8d22e Author: Jon Loeliger -Date: Wed May 31 13:55:35 2006 -0500 +Date: Wed May 31 13:55:35 2006 -0500 Review cleanups. @@ -927,7 +967,7 @@ Date: Wed May 31 13:55:35 2006 -0500 commit cb5965fb95b77a49f4e6af95248e0c849f4af03e Author: Jon Loeliger -Date: Wed May 31 12:44:44 2006 -0500 +Date: Wed May 31 12:44:44 2006 -0500 White space cleanup. Some 80-column cleanups. @@ -939,7 +979,7 @@ Date: Wed May 31 12:44:44 2006 -0500 commit 3d5c5be547445dd3bd2eb7368d80df03ea437970 Author: Jon Loeliger -Date: Wed May 31 11:39:34 2006 -0500 +Date: Wed May 31 11:39:34 2006 -0500 Removed unneeded local_bus_init() from 8641HPCN board. @@ -947,7 +987,7 @@ Date: Wed May 31 11:39:34 2006 -0500 commit 4d3d729c16c392d2982d3266b659d333c927697d Author: Jon Loeliger -Date: Wed May 31 11:24:28 2006 -0500 +Date: Wed May 31 11:24:28 2006 -0500 Moved mpc8641hpcn_board_reset() out of cpu/ into board/. @@ -955,7 +995,7 @@ Date: Wed May 31 11:24:28 2006 -0500 commit b2a941de060350ad15878d8219825f4950e9bb8e Author: Jon Loeliger -Date: Wed May 31 10:07:28 2006 -0500 +Date: Wed May 31 10:07:28 2006 -0500 Remove dead debug code. @@ -963,7 +1003,7 @@ Date: Wed May 31 10:07:28 2006 -0500 commit 126aa70f10ba3d20e0a6f4d32328250513b77770 Author: Jon Loeliger -Date: Tue May 30 17:47:00 2006 -0500 +Date: Tue May 30 17:47:00 2006 -0500 Move mpc86xx PIXIS code to board directory @@ -975,30 +1015,30 @@ Date: Tue May 30 17:47:00 2006 -0500 commit 38cee12dcfcc257371c901c7e13e58ecab0a35d8 Author: Haiying Wang -Date: Tue May 30 09:10:32 2006 -0500 +Date: Tue May 30 09:10:32 2006 -0500 Improve "reset" command's interaction with watchdog. - "reset altbank" will reset another bank WITHOUT watch dog timer enabled - "reset altbank wd" will reset another bank WITH watch dog enabled - "diswd" will disable watch dog after u-boot boots up successfully + "reset altbank" will reset another bank WITHOUT watch dog timer enabled + "reset altbank wd" will reset another bank WITH watch dog enabled + "diswd" will disable watch dog after u-boot boots up successfully Signed-off-by: Haiying Wang commit 70205e5a6ddc8528b11db9eb4d3fa0209d9fce2a Author: Haiying Wang -Date: Tue May 30 08:51:19 2006 -0500 +Date: Tue May 30 08:51:19 2006 -0500 Fix two SDRAM setup bugs. - Fix ECC setup bug. - Enable 1T/2T based on number of DIMMs present. + Fix ECC setup bug. + Enable 1T/2T based on number of DIMMs present. Signed-off-by: Haiying Wang commit d11fec5015334deb2010e36ce00bb118cc5429a5 Author: Haiying Wang -Date: Fri May 26 10:24:48 2006 -0500 +Date: Fri May 26 10:24:48 2006 -0500 Add first draft of the MPC8641HPCN doc/README. @@ -1006,7 +1046,7 @@ Date: Fri May 26 10:24:48 2006 -0500 commit ed45d6c930b5939718a87ee12e25cf9a05978d4a Author: Haiying Wang -Date: Fri May 26 10:13:04 2006 -0500 +Date: Fri May 26 10:13:04 2006 -0500 Added pci@8000 block. Updated ethernet interrupt mappings (moved up 48). @@ -1016,7 +1056,7 @@ Date: Fri May 26 10:13:04 2006 -0500 commit 3033ebb20fd7c372c7bca3c9955a4692bb2240b7 Author: Haiying Wang -Date: Fri May 26 10:01:16 2006 -0500 +Date: Fri May 26 10:01:16 2006 -0500 Allow args on reset command. @@ -1024,43 +1064,43 @@ Date: Fri May 26 10:01:16 2006 -0500 commit 14e37081ff3cac7ebe6e93836523429853b6b292 Author: Jon Loeliger -Date: Fri May 19 13:28:39 2006 -0500 +Date: Fri May 19 13:28:39 2006 -0500 Change arbitration to round-robin for SMP linux. commit 9a655876e5995be80f49054e2509500e871e4d3a Author: Jon Loeliger -Date: Fri May 19 13:26:34 2006 -0500 +Date: Fri May 19 13:26:34 2006 -0500 Enable dual DDR controllers and interleaving. commit 586d1d5abd3e525f1e1d9b81e5a61a4da6b2fa3c Author: Jon Loeliger -Date: Fri May 19 13:22:44 2006 -0500 +Date: Fri May 19 13:22:44 2006 -0500 Update 86xx address map and LAWBARs. commit cccce5d0581bb0ba4602799a4b5112e58d1579cb Author: Jon Loeliger -Date: Fri May 19 13:14:15 2006 -0500 +Date: Fri May 19 13:14:15 2006 -0500 Remove L2 Cache invalidate polling. commit f35ec68fb066cec0e36294bfe07dec2d4e8ad3a8 Author: Jon Loeliger -Date: Fri May 19 12:33:09 2006 -0500 +Date: Fri May 19 12:33:09 2006 -0500 Enable 2nd CPU and I2C. commit bf690dcb512d34c4fceec0eb1e5c0e88a9db5d54 Author: Jon Loeliger -Date: Mon May 15 07:26:56 2006 -0500 +Date: Mon May 15 07:26:56 2006 -0500 Update interrupt mapping. commit 6cfea33477b04b63ed47386ed1629529484c33ba Author: Haiying Wang -Date: Wed May 10 09:38:06 2006 -0500 +Date: Wed May 10 09:38:06 2006 -0500 Remove unneeded INIT_RAM_LOCK cache twiddling. Correctly tracks r29 as global data pointer now. @@ -1069,25 +1109,25 @@ Date: Wed May 10 09:38:06 2006 -0500 commit d4dd317b58c126a2a7e73f4764ecc1a7c97f876c Author: Jon Loeliger -Date: Wed May 10 09:33:07 2006 -0500 +Date: Wed May 10 09:33:07 2006 -0500 Remove unnecessary flash.c file. commit 18b6c8cd8af6cc7f35180cedc4adb3236cc1a1b8 Author: Jon Loeliger -Date: Tue May 9 08:23:49 2006 -0500 +Date: Tue May 9 08:23:49 2006 -0500 Get MPC8641HPCN flash images working. - Enable the CFI driver. - Remove bogus LAWBAR7 cruft. - Use correct TEXT_BASE, Fixup load script. - Enable SPD EEPROM during DDR setup. - Use generic RFC 1918 IP addresses by default. + Enable the CFI driver. + Remove bogus LAWBAR7 cruft. + Use correct TEXT_BASE, Fixup load script. + Enable SPD EEPROM during DDR setup. + Use generic RFC 1918 IP addresses by default. commit 5c9efb36a6b5431423f52888a0e3b4b515fe7eca Author: Jon Loeliger -Date: Thu Apr 27 10:15:16 2006 -0500 +Date: Thu Apr 27 10:15:16 2006 -0500 Cleanup whitespaces and style issues. Removed //-style comments. @@ -1097,12 +1137,12 @@ Date: Thu Apr 27 10:15:16 2006 -0500 commit a2320a6bf8113a09544c42d160d10ac69d049a03 Author: Jon Loeliger -Date: Thu Apr 27 08:22:39 2006 -0500 +Date: Thu Apr 27 08:22:39 2006 -0500 Revert bad PCI prefetch limit change. commit debb7354d1ea4f694154818df5e5b523f5c1cc1d Author: Jon Loeliger -Date: Wed Apr 26 17:58:56 2006 -0500 +Date: Wed Apr 26 17:58:56 2006 -0500 Initial support for MPC8641 HPCN board. diff --git a/Makefile b/Makefile index c2e47d4034..c871d49676 100644 --- a/Makefile +++ b/Makefile @@ -330,7 +330,7 @@ endif .PHONY : CHANGELOG CHANGELOG: - git log --no-merges U-Boot-1_1_5.. > $@ + git log --no-merges U-Boot-1_1_5.. | unexpand -a > $@ ######################################################################### diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index ab3c32ca32..3091a58897 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -929,7 +929,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, */ (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); -#else +#else /* CONFIG_OF_FLAT_TREE */ /* move of_flat_tree if needed */ if (of_data) { ulong of_start, of_len; @@ -971,8 +971,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, /* ft_dump_blob(of_flat_tree); */ (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0); } - -#endif +#endif /* CONFIG_OF_FLAT_TREE */ } #endif /* CONFIG_PPC */ diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 5fe2ede52f..7221a865ed 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -181,7 +181,7 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) if (argc < 4) { printf ("Usage:\n%s\n", cmdtp->usage); return 1; - } + } /* Find out whether ther is '.' (dot) symbol in the first parameter. */ strncpy (buf, argv[1], sizeof(buf)-1); @@ -198,9 +198,9 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * First parameter has format adr_dcrn; dat_dcrn will be * calculated as adr_dcrn+1. */ - adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16); - dat_dcrn = adr_dcrn+1; - } + adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16); + dat_dcrn = adr_dcrn+1; + } /* Register's offset */ offset = (unsigned short) simple_strtoul (argv[2], NULL, 16);