---

yaml --- r: 91553 b: refs/heads/master c: 38521a2 h: refs/heads/master i: 91551: 20bc48b v: v3
git-mirror · Apr 16, 2008 · 442f494 · 442f494
1 parent 14923d7
commit 442f494
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fbe9d413e503aba71258947bf2e22f6de5ffa41
+refs/heads/master: 38521a23a99232e14d7454ab59d23565c626ea33
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -693,22 +693,6 @@ config CONSISTENT_SIZE
 	hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
 	default "0x00200000" if NOT_COHERENT_CACHE
 
-config BOOT_LOAD_BOOL
-	bool "Set the boot link/load address"
-	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
-	help
-	  This option allows you to set the initial load address of the zImage
-	  or zImage.initrd file.  This can be useful if you are on a board
-	  which has a small amount of memory.
-
-	  Say N here unless you know what you are doing.
-
-config BOOT_LOAD
-	hex "Link/load address for booting" if BOOT_LOAD_BOOL
-	default "0x00400000" if 40x || 8xx || 8260
-	default "0x01000000" if 44x
-	default "0x00800000"
-
 config PIN_TLB
 	bool "Pinned Kernel TLBs (860 ONLY)"
 	depends on ADVANCED_OPTIONS && 8xx