Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with git://www.denx.de/git/u-boot-testing

Browse Source
master
Wolfgang Denk 18 years ago
parent 6b0a174a1e e4dbe1b215
commit dcc0264878
16 changed files with 491 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 492
      CHANGELOG
  2. 2
      cpu/mpc8260/cpu_init.c
  3. 9
      fs/jffs2/jffs2_1pass.c
  4. 6
      include/configs/MPC8260ADS.h
  5. 9
      include/configs/MPC8266ADS.h
  6. 6
      include/configs/TQM834x.h
  7. 2
      include/configs/Total5200.h
  8. 12
      include/configs/ZPC1900.h
  9. 3
      include/configs/acadia.h
  10. 3
      include/configs/atstk1002.h
  11. 5
      include/configs/bf537-stamp.h
  12. 3
      include/configs/cpci5200.h
  13. 3
      include/configs/csb472.h
  14. 2
      include/configs/lwmon.h
  15. 4
      include/configs/ml401.h
  16. 11
      include/configs/sc520_cdp.h

492
CHANGELOG
Unescape View File

@ -1,3 +1,459 @@
commit dca3b3d6d6396b67e5e84af53452164923c73443
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:46 2007 -0500
include/configs: Use new CONFIG_CMD_* in various [v-z]* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 6c18eb9804b525f3e4f3bb3d014dd69a200d9fa7
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:38 2007 -0500
include/configs: Use new CONFIG_CMD_* in various t* and u* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 46da1e96b7db14f4fcd2c92544e7c0862024bc76
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:30 2007 -0500
include/configs: Use new CONFIG_CMD_* in various s* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 90cc3eb6d2be856d9ddd81436de9cf343bc6b5c8
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:23 2007 -0500
include/configs: Use new CONFIG_CMD_* in various q* and r* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 26a34560d56a9df5bc2ae23525d9229736134757
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:17 2007 -0500
include/configs: Use new CONFIG_CMD_* in various p* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit a5cb23092a7d31490a33d4ec871468b63babfa3c
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:13 2007 -0500
include/configs: Use new CONFIG_CMD_* in various o* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 929a2bfd142737003a8fc32e1b86e1f2c1850257
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:07 2007 -0500
include/configs: Use new CONFIG_CMD_* in various n* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 5dc11a511960d490f7f01ffd746edfe6277f99b0
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:33:01 2007 -0500
include/configs: Use new CONFIG_CMD_* in various m* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 9bbb1c0820c1fbd3811ab6ee4ba0f6c6f76b27e4
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:57 2007 -0500
include/configs: Use new CONFIG_CMD_* in various l* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit bc234c129fa04fb9fa33530930e5cbc6084cd47a
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:51 2007 -0500
include/configs: Use new CONFIG_CMD_* in various j* and k* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 1d2c6bc491969f8d8fb34c8e30e8bea7a2af9c31
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:32 2007 -0500
include/configs: Use new CONFIG_CMD_* in various i* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 48d5d102a2f2e619c92050b9aedbb69689185bc0
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:25 2007 -0500
include/configs: Use new CONFIG_CMD_* in various h* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 72eb0efaed7048afcc61fc6f0085c49394b5dc36
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:19 2007 -0500
include/configs: Use new CONFIG_CMD_* in various g* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 1bec3d3002d3bbbae6f2468a0f7376db1120d33e
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:10 2007 -0500
include/configs: Use new CONFIG_CMD_* in various e* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit ab999ba1b31ebe78dd16374394a55d7c6e5aa6e4
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:32:03 2007 -0500
include/configs: Use new CONFIG_CMD_* in various d* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 37e4f24b87fa255ae456d193b7cd23c18dd1d56b
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:56 2007 -0500
include/configs: Use new CONFIG_CMD_* in various c* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit ba2351f9d1e841bd00ea6dad1e3c16d0259ad264
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:49 2007 -0500
include/configs: Use new CONFIG_CMD_* in various b* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 0b361c916617aff79e647b40f0e43361e0bbaccf
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:42 2007 -0500
include/configs: Use new CONFIG_CMD_* in various a* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit b730cda82e362df6a22f4c59c0a9b97e885b1014
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:35 2007 -0500
include/configs: Use new CONFIG_CMD_* in mpc5xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit d794cfefead5fc177cf4f41164e80382e9c9484a
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:15 2007 -0500
include/configs: Use new CONFIG_CMD_* in various 5200 board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit ef0df52ab49eea4a30c15087fd27d54c1d946f2c
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:31:07 2007 -0500
include/configs: Use new CONFIG_CMD_* in STx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 866e3089bfc826bb4dc74637f8aad87a3bab79fc
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:30:58 2007 -0500
include/configs: Use new CONFIG_CMD_* in sbc* board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 2694690e285acaa34922f55f4b5ae030da60c55a
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:30:50 2007 -0500
include/configs: Use new CONFIG_CMD_* in TQM board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 1cc4c458329765b58e584a19821e796b3c10e976
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:30:28 2007 -0500
include/configs: Use new CONFIG_CMD_* in 82xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 8ea5499afdaba0acf60923dd99001c399d4a7c8e
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jul 4 22:30:06 2007 -0500
include/configs: Use new CONFIG_CMD_* in 83xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit b24629fa377214d63bb40d1360e354b6d3e4af56
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jun 13 13:23:15 2007 -0500
mpc86xx: Remove old CFG_CMD_* references.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 46175d9764da129bb4fd341cd2554dc7d55f5b2a
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jun 13 13:22:54 2007 -0500
Add MPC8568MDS to MAKEALL 85xx target.
It was missing from the original port submission.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 2835e518c969e5124ba1174eef3e8375e12fa7d5
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jun 13 13:22:08 2007 -0500
include/configs: Use new CONFIG_CMD_* in 85xx board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 56b304ac2091689506088a9ae67f63fd6300cf16
Author: Jon Loeliger <jdl@jdl.com>
Date: Wed Jun 13 13:21:37 2007 -0500
Fix #if typo in CONFIG_CMD_* changes.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
commit 6810a34677dbc446334f5e451f1682426dd33b49
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:17:28 2007 -0600
Fix Makefile to use $(MKCONFIG) macro for all board ports
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 90b1b2d69b9396ff2f01165ebc16c9a594eb5926
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:17:28 2007 -0600
Fix Makefile to use $(MKCONFIG) macro for all board ports
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 057004f4a4863554d56cc56268bfa7c7d9738e27
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:49 2007 -0600
Correct fixup relocation for mpc83xx
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 5af61b2f4b838a05f79be274f3e5a66edd2d9c96
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:44 2007 -0600
Correct fixup relocation for mpc8260
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit f3a52fe05923935db86985daf9438e2f70ac39aa
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:39 2007 -0600
Correct fixup relocation for mpc824x
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:34 2007 -0600
Correct fixup relocation for mpc8220
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:29 2007 -0600
Correct fixup relocation for MPC5xxx
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 3649cd99ba815b6601868735765602f00ef3692b
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:24 2007 -0600
Correct relocation fixup for mpc5xx
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:19 2007 -0600
Don't set gd->reloc_off if relocation of .fixup works correctly
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit e1a6144c32dc7de73bcdd33995de0148cbd0bd28
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:14 2007 -0600
Remove obsolete mpc83xx linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 17e32fc3908bf7089d3f16fc82a1c3ae674dd65b
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:09 2007 -0600
Consolidate mpc8260 linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit af7d38b393690d7eeaf418ac85a1e831a50d5fd0
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:34:04 2007 -0600
Remove obsolete mpc824x linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit f94a3aecebc40ca0939c7d66d010009cf51be9e2
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:59 2007 -0600
Remove obsolete mpc824x linker scripts (3 of 4)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit a71c084f3ac7fedf144537db2b2da47323068833
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:53 2007 -0600
Remove obsolete mpc824x linker scripts (2 of 4)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit f670a15468d1365241d40022b9408e1004181f5e
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:48 2007 -0600
Remove obsolete mpc824x linker scripts (1 of 4)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 09555bd45a04c0e54f172528d21bc18896550d28
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:43 2007 -0600
Remove obsolete mpc8220 linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 5efb992f046e51225c93d52f80fecbe433abd789
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:38 2007 -0600
Remove obsolete mpc5xxx linker scripts (3 of 3)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 07c13dfef65b31647e69d8b61daa1eec598add1a
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:33 2007 -0600
Remove obsolete mpc5xxx linker scripts (2 of 3)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit b4f67513a624ce85866c66c575bd2d9d7977d7f0
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:28 2007 -0600
Remove obsolete mpc5xxx linker scripts (1 of 3)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit b7d8e05f8675249b5f208aa73babeed384a4519d
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:23 2007 -0600
Remove obsolete mpc5xx linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 416a0b6d40f6eba3a2fc547253c16bda28d922f7
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:18 2007 -0600
Consolidate mpc83xx linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 5fc59175b92883ed5d2666a04e6bc49e70a4a365
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:13 2007 -0600
Consolidate mpc8260 linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 737f9eb02d7335df2b3e4d7a4d3348784d1da207
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:08 2007 -0600
Consolidate mpc824x linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 9c757b789a59a855db57b448dd825329c4e9c4a0
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:33:03 2007 -0600
Consolidate mpc8220 linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit d181c9a15cd41863fe24840d17848429f27d3c8c
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:32:58 2007 -0600
Consolidate mpc5xxx linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 287ac924adb7291bebe5086652a362a30ab28b13
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Tue Jul 3 00:32:53 2007 -0600
Consolidate mpc5xx linker scripts
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 52b8704d0245e589f86d462e9ec25aeb7ecbbbdd
Author: Wolfgang Denk <wd@denx.de>
Date: Wed Jul 4 00:43:53 2007 +0200
Fix a few file permission problems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
commit 78e0cf2de7be7f1eaeeb622eb61fd50e4d5e205c
Author: Wolfgang Denk <wd@denx.de>
Date: Wed Jul 4 00:38:38 2007 +0200
Minor coding style cleanup. Rebuild CHANGELOG file.
commit 2f9c19e496acb6bb50d9299e1aab377625d48c38
Author: Jon Loeliger <jdl@jdl.com>
Date: Mon Jun 11 19:03:44 2007 -0500
@ -1358,7 +1814,7 @@ Date: Sat May 5 08:12:30 2007 +0200
5xxx: write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address,
and some have both. To support all of these device trees, ftp_cpu_setup()
and some have both. To support all of these device trees, ftp_cpu_setup()
should write the MAC address to mac-address and local-mac-address, if they
exist.
@ -1500,7 +1956,7 @@ Date: Sat May 5 08:12:30 2007 +0200
5xxx: write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address,
and some have both. To support all of these device trees, ftp_cpu_setup()
and some have both. To support all of these device trees, ftp_cpu_setup()
should write the MAC address to mac-address and local-mac-address, if they
exist.
@ -1631,7 +2087,7 @@ Date: Mon Apr 30 13:59:50 2007 -0500
Fix memory initialization on MPC8349E-mITX
Define CFG_DDR_SDRAM_CLK_CNTL for the MPC8349E-mITX and MPC8349E-mITX-GP.
This allows ddr->sdram_clk_cntl to be properly initialized. This is necessary
This allows ddr->sdram_clk_cntl to be properly initialized. This is necessary
on some ITX boards, notably those with a revision 3.1 CPU.
Also change spd_sdram() in cpu/mpc83xx/spd_sdram.c to not write anything into
@ -1788,7 +2244,7 @@ Date: Mon Feb 12 13:34:55 2007 -0600
85xx: write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address,
and some have both. To support all of these device trees, ftp_cpu_setup()
and some have both. To support all of these device trees, ftp_cpu_setup()
should write the MAC address to mac-address and local-mac-address, if they
exist.
@ -2097,7 +2553,7 @@ Date: Fri Apr 20 14:12:26 2007 -0500
mpc86xx; Write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address,
and some have both. To support all of these device trees, ftp_cpu_setup()
and some have both. To support all of these device trees, ftp_cpu_setup()
should write the MAC address to mac-address and local-mac-address, if they
exist.
@ -2150,7 +2606,7 @@ Date: Thu Apr 19 23:14:39 2007 -0400
What was suppose to be a stack variable was declared as a pointer,
overwriting random memory.
Also moved the libfdt.a requirement into the main Makefile. That is
Also moved the libfdt.a requirement into the main Makefile. That is
The U-Boot Way.
commit d21686263574e95cb3e9e9b0496f968b1b897fdb
@ -2745,7 +3201,7 @@ Date: Sat Mar 31 12:22:10 2007 -0400
Add a flattened device tree (fdt) command (1 of 2)
The fdt command uses David Gibson's libfdt library to manipulate as well
as print the flattened device tree. This patch is the new command,
as print the flattened device tree. This patch is the new command,
the second part is the modifications to the existing code.
commit 3af0d587d93e0be5f96e1b30fa41e662f8b0803e
@ -3446,7 +3902,7 @@ Date: Tue Feb 13 10:41:42 2007 -0600
mpc83xx: write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address,
and some have both. To support all of these device trees, this patch
and some have both. To support all of these device trees, this patch
updates ftp_cpu_setup() to write the MAC address to mac-address if it exists.
This function already updates local-mac-address.
@ -3669,7 +4125,7 @@ Date: Wed Dec 6 21:23:55 2006 -0500
mpc83xx: Put the version (and magic) after the HRCW.
Put the version (and magic) after the HRCW. This puts it in a fixed
Put the version (and magic) after the HRCW. This puts it in a fixed
location in flash, not at the start of flash but as close as we can get.
Signed-off-by: Jerry Van Baren <vanbaren@cideas.com>
@ -3963,7 +4419,7 @@ Date: Tue Feb 20 09:05:31 2007 +0100
[PATCH 7_9] Replace ace_readw_ace_writeb functions with macros
Register read/write does not need to be wrapped in a full function. The
Register read/write does not need to be wrapped in a full function. The
patch replaces them with macros.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
@ -4266,7 +4722,7 @@ commit fdef388758506765d4d6a7155c8f1584c63ff581
Author: roy zang <tie-fei.zang@freescale.com>
Date: Mon Jan 22 13:19:21 2007 +0800
use CFG_WRITE_SWAPPED_DATA define instead of define CFG_FLASH_CFI_SWAP
use CFG_WRITE_SWAPPED_DATA define instead of define CFG_FLASH_CFI_SWAP
The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
@ -4954,7 +5410,7 @@ Date: Mon Nov 27 17:04:06 2006 +0100
[PATCH] Allow CONFIG_OF_FLAT_TREE to boot a non-arch/powerpc kernel
This patch allows an arch/ppc kernel to be booted by just passing 1 or 2
arguments to bootm. It removes the getenv("disable_of") test that used
arguments to bootm. It removes the getenv("disable_of") test that used
to be used for this purpose.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
@ -5530,7 +5986,7 @@ Date: Thu Nov 2 19:08:55 2006 +0800
Gigabit Ethernet ports,E0 and E1. It uses a single Management interface
to manage the two physical connection devices (PHYs). Each Ethernet port
has its own statistics monitor that tracks and reports key interface
statistics. Each port supports a 256-entry hash table for address
statistics. Each port supports a 256-entry hash table for address
filtering. In addition, each port is bridged to the Switch Fabric
through a 2-Kbyte transmit FIFO and a 4-Kbyte Receive FIFO.
@ -5576,7 +6032,7 @@ commit 87c4db09699c6b89176b31004afcb83eb1585d47
Author: roy zang <tie-fei.zang@freescale.com>
Date: Thu Nov 2 18:59:15 2006 +0800
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
mpc7448hpc2 board support high level code:tsi108 init + mpc7448hpc2.
Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
@ -5586,7 +6042,7 @@ commit 27801b8ab11c61b577e45742a515bb3b23b80241
Author: roy zang <tie-fei.zang@freescale.com>
Date: Thu Nov 2 18:57:21 2006 +0800
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Make ,config.mk and link file for the mpc7448hpc2 board.
Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
@ -5596,7 +6052,7 @@ commit c6411c0c3bbc79f9ba8aef58296a42d8f9d8a0a6
Author: roy zang <tie-fei.zang@freescale.com>
Date: Thu Nov 2 18:55:04 2006 +0800
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
The mpc7448hpc2 board support header file.
Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
@ -5606,7 +6062,7 @@ commit 625bb5ddb50b243f931262ca8c46956409471917
Author: roy zang <tie-fei.zang@freescale.com>
Date: Thu Nov 2 18:52:21 2006 +0800
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
Add mpc7448hpc2 (mpc7448 + tsi108) board associated code support.
The mpc7448hpc2 board support low level assemble language init code.
Signed-off-by: Alexandre Bounine <alexandreb@tundra.com>
@ -5831,7 +6287,7 @@ Date: Tue Oct 24 23:47:37 2006 -0500
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
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

2
cpu/mpc8260/cpu_init.c
Unescape View File

@ -182,7 +182,7 @@ void cpu_init_f (volatile immap_t * immr)
#endif
/* now restrict to preliminary range */
/* the PS came from the HRCW, don´t change it */
/* the PS came from the HRCW, don´t change it */
memctl->memc_br0 = SET_VAL_MASK(memctl->memc_br0 , CFG_BR0_PRELIM, BRx_PS_MSK);
memctl->memc_or0 = CFG_OR0_PRELIM;

9
fs/jffs2/jffs2_1pass.c
Unescape View File

@ -143,7 +143,8 @@
/* keeps pointer to currentlu processed partition */
static struct part_info *current_part;
#if (defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND))
#if (defined(CONFIG_JFFS2_NAND) && \
((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) )
#if defined(CFG_NAND_LEGACY)
#include <linux/mtd/nand_legacy.h>
#else
@ -334,7 +335,8 @@ static inline void *get_node_mem(u32 off)
return get_node_mem_nor(off);
#endif
#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#if defined(CONFIG_JFFS2_NAND) && \
(CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
if (id->type == MTD_DEV_TYPE_NAND)
return get_node_mem_nand(off);
#endif
@ -345,7 +347,8 @@ static inline void *get_node_mem(u32 off)
static inline void put_fl_mem(void *buf)
{
#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#if defined(CONFIG_JFFS2_NAND) && \
(CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
struct mtdids *id = current_part->dev->id;
if (id->type == MTD_DEV_TYPE_NAND)

6
include/configs/MPC8260ADS.h
Unescape View File

@ -246,13 +246,11 @@
#endif /* CONFIG_ADSTYPE >= CFG_PQ2FADS */
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOOTCOMMAND "bootm fff80000" /* autoboot command */
#define CONFIG_BOOTARGS "root=/dev/mtdblock2"
#if defined(CONFIG_CMD_KGDB)
#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_CMD_KGDB)
#undef CONFIG_KGDB_ON_SMC /* define if kgdb on SMC */
#define CONFIG_KGDB_ON_SCC /* define if kgdb on SCC */
#undef CONFIG_KGDB_NONE /* define if kgdb on something else */
@ -270,7 +268,7 @@
#define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_LONGHELP /* undef to save memory */
#define CFG_PROMPT "=> " /* Monitor Command Prompt */
#if defined(CONFIG & CFG_CMD_KGDB)
#if defined(CONFIG_CMD_KGDB) || (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */

9
include/configs/MPC8266ADS.h
Unescape View File

@ -141,11 +141,9 @@
*/
#define SPD_EEPROM_ADDRESS 0x50
#define CONFIG_8260_CLKIN 66000000 /* in Hz */
#define CONFIG_BAUDRATE 115200
/*
* Command line configuration.
*/
@ -214,8 +212,6 @@
CONFIG_BOOTP_BOOTFILESIZE | \
CONFIG_BOOTP_DNS)
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#if defined(CONFIG_CMD_KGDB)
@ -285,7 +281,6 @@
#define SDRAM_SPD_ADDR 0x50
/*-----------------------------------------------------------------------
* BR2,BR3 - Base Register
* Ref: Section 10.3.1 on page 10-14
@ -383,7 +378,6 @@
#error "INVALID SDRAM CONFIGURATION"
#endif
#define RS232EN_1 0x02000002
#define RS232EN_2 0x01000001
#define FETHIEN 0x08000008
@ -395,7 +389,6 @@
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
/* Use this HRCW for booting from address 0xfe00000 (JP3 in setting 1-2) */
/* 0x0EB2B645 */
#define CFG_HRCW_MASTER (( HRCW_BPS11 | HRCW_CIP ) |\
@ -452,13 +445,11 @@
# define CFG_ENV_SIZE 0x200
#endif /* CFG_RAMBOOT */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
#if defined(CONFIG_CMD_KGDB)
# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
#endif
/*-----------------------------------------------------------------------
* HIDx - Hardware Implementation-dependent Registers 2-11
*-----------------------------------------------------------------------

6
include/configs/TQM834x.h
Unescape View File

@ -281,7 +281,6 @@ extern int tqm834x_num_flash_banks;
#define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE
#define CFG_PCI1_IO_SIZE 0x1000000 /* 16M */
#undef CONFIG_EEPRO100
#define CONFIG_EEPRO100
#undef CONFIG_TULIP
@ -316,7 +315,6 @@ extern int tqm834x_num_flash_banks;
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* Command line configuration.
*/
@ -339,10 +337,6 @@ extern int tqm834x_num_flash_banks;
#undef CONFIG_CMD_LOADS
#endif
/*
* Miscellaneous configurable options
*/

2
include/configs/Total5200.h
Unescape View File

@ -115,7 +115,7 @@
*/
#include <config_cmd_default.h>
#if definded(CONFIG_MPC5200)
#if defined(CONFIG_MPC5200)
#define CONFIG_CMD_PCI
#endif

12
include/configs/ZPC1900.h
Unescape View File

@ -248,18 +248,18 @@
#define CFG_LSRT 0x0F
#define CFG_MPTPR 0x4000
#define CFG_PSDRAM_BR CFG_SDRAM_BASE | 0x00000041
#define CFG_PSDRAM_BR (CFG_SDRAM_BASE | 0x00000041)
#define CFG_PSDRAM_OR 0xFC0028C0
#define CFG_LSDRAM_BR CFG_LSDRAM_BASE | 0x00001861
#define CFG_LSDRAM_BR (CFG_LSDRAM_BASE | 0x00001861)
#define CFG_LSDRAM_OR 0xFF803480
#define CFG_BR0_PRELIM CFG_FLASH_BASE | 0x00000801
#define CFG_BR0_PRELIM (CFG_FLASH_BASE | 0x00000801)
#define CFG_OR0_PRELIM 0xFFE00856
#define CFG_BR5_PRELIM CFG_EEPROM | 0x00000801
#define CFG_BR5_PRELIM (CFG_EEPROM | 0x00000801)
#define CFG_OR5_PRELIM 0xFFFF03F6
#define CFG_BR6_PRELIM CFG_FLSIMM_BASE | 0x00001801
#define CFG_BR6_PRELIM (CFG_FLSIMM_BASE | 0x00001801)
#define CFG_OR6_PRELIM 0xFF000856
#define CFG_BR7_PRELIM CFG_BCSR | 0x00000801
#define CFG_BR7_PRELIM (CFG_BCSR | 0x00000801)
#define CFG_OR7_PRELIM 0xFFFF83F6
#define CFG_RESET_ADDRESS 0xC0000000

3
include/configs/acadia.h
Unescape View File

@ -299,7 +299,6 @@
#define CONFIG_SUPPORT_VFAT
/*
* Command line configuration.
*/
@ -331,8 +330,6 @@
#undef CONFIG_CMD_IMLS
#endif
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*-----------------------------------------------------------------------

3
include/configs/atstk1002.h
Unescape View File

@ -111,7 +111,6 @@
#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_SUBNETMASK \
| CONFIG_BOOTP_GATEWAY)
/*
* Command line configuration.
*/
@ -129,8 +128,6 @@
#undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_XIMG
#define CONFIG_ATMEL_USART 1
#define CONFIG_MACB 1
#define CONFIG_PIO2 1

5
include/configs/bf537-stamp.h
Unescape View File

@ -166,8 +166,6 @@
#define CONFIG_NETCONSOLE 1
#define CONFIG_NET_MULTI 1
/*
* Command line configuration.
*/
@ -196,7 +194,6 @@
#endif
#if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT)
#define CONFIG_CMD_DHCP
@ -209,8 +206,6 @@
#endif
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 rw console=ttyBF0,57600"
#define CONFIG_LOADADDR 0x1000000

3
include/configs/cpci5200.h
Unescape View File

@ -99,7 +99,6 @@
#define CONFIG_USB_STORAGE
#endif
/*
* Command line configuration.
*/
@ -118,8 +117,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_DATE
#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */
# define CFG_LOWBOOT 1
# define CFG_LOWBOOT16 1

3
include/configs/csb472.h
Unescape View File

@ -80,8 +80,6 @@
CONFIG_BOOTP_DNS2 | \
CONFIG_BOOTP_BOOTFILESIZE )
/*
* Command line configuration.
*/
@ -98,7 +96,6 @@
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
/*
* Serial download configuration
*

2
include/configs/lwmon.h
Unescape View File

@ -279,7 +279,7 @@
*/
#define CFG_SDRAM_BASE 0x00000000
#define CFG_FLASH_BASE 0x40000000
#if defined(DEBUG) || defiend(CONFIG_CMD_IDE)
#if defined(DEBUG) || defined(CONFIG_CMD_IDE)
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
#else
#define CFG_MONITOR_LEN (128 << 10) /* Reserve 128 kB for Monitor */

4
include/configs/ml401.h
Unescape View File

@ -145,8 +145,6 @@
#define CFG_FLASH_PROTECTION /* hardware flash protection */
#endif /* !FLASH */
/*
* Command line configuration.
*/
@ -181,8 +179,6 @@
#endif
#endif
#if defined(CONFIG_CMD_JFFS2)
/* JFFS2 partitions */
#define CONFIG_JFFS2_CMDLINE /* mtdparts command line support */

11
include/configs/sc520_cdp.h
Unescape View File

@ -64,10 +64,8 @@
*/
#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
#define CONFIG_BAUDRATE 9600
/*
* Command line configuration.
*/
@ -79,8 +77,6 @@
#define CONFIG_CMD_NET
#define CONFIG_CMD_EEPROM
#define CONFIG_BOOTDELAY 15
#define CONFIG_BOOTARGS "root=/dev/mtdblock0 console=ttyS0,9600"
/* #define CONFIG_BOOTCOMMAND "bootm 38000000" */
@ -90,7 +86,6 @@
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif
/*
* Miscellaneous configurable options
*/
@ -113,7 +108,6 @@
/* valid baudrates */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/*-----------------------------------------------------------------------
* Physical Memory Map
*/
@ -122,8 +116,6 @@
/*-----------------------------------------------------------------------
* FLASH and environment organization
*/
#define CFG_MAX_FLASH_BANKS 3 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 64 /* max number of sectors on one chip */
@ -134,11 +126,9 @@
#define CONFIG_SPI_EEPROM /* Support for SPI EEPROMs (AT25128) */
#define CONFIG_MW_EEPROM /* Support for MicroWire EEPROMs (AT93LC46) */
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Environment in EEPROM */
#define CFG_ENV_IS_IN_EEPROM 1
#define CONFIG_SPI
@ -218,7 +208,6 @@
#define CONFIG_I8042_KBD
#define CFG_ISA_IO 0
/************************************************************
* RTC
***********************************************************/

Write Preview
Loading…
Cancel
Save