From cbfd100e55b2aa44b05ed107d3b78c33fecb22b0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Wed, 6 Aug 2008 17:10:57 +0800
Subject: [PATCH] --- yaml --- r: 108588 b: refs/heads/master c:
 1375204611f417541e55ee09e248acdbbb94356d h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/blackfin/kernel/vmlinux.lds.S      | 1 +
 trunk/arch/blackfin/mach-common/arch_checks.c | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d6ab1b3f241..fdfe5c805996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09e1f70e31ed6ca23dd42feb10aa104fc1b04c40
+refs/heads/master: 1375204611f417541e55ee09e248acdbbb94356d
diff --git a/trunk/arch/blackfin/kernel/vmlinux.lds.S b/trunk/arch/blackfin/kernel/vmlinux.lds.S
index 0896e38d6108..d062597e6217 100644
--- a/trunk/arch/blackfin/kernel/vmlinux.lds.S
+++ b/trunk/arch/blackfin/kernel/vmlinux.lds.S
@@ -83,6 +83,7 @@ SECTIONS
 #if !L1_DATA_B_LENGTH
 		*(.l1.bss.B)
 #endif
+		. = ALIGN(4);
 		___bss_stop = .;
 	}
 
diff --git a/trunk/arch/blackfin/mach-common/arch_checks.c b/trunk/arch/blackfin/mach-common/arch_checks.c
index f9160d83b91f..5986758b2752 100644
--- a/trunk/arch/blackfin/mach-common/arch_checks.c
+++ b/trunk/arch/blackfin/mach-common/arch_checks.c
@@ -27,6 +27,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <asm/fixed_code.h>
 #include <asm/mach/anomaly.h>
 #include <asm/mach-common/clocks.h>
 
@@ -53,3 +54,11 @@
 # endif
 
 #endif /* CONFIG_BFIN_KERNEL_CLOCK */
+
+#if CONFIG_BOOT_LOAD < FIXED_CODE_END
+# error "The kernel load address must be after the fixed code section"
+#endif
+
+#if (CONFIG_BOOT_LOAD & 0x3)
+# error "The kernel load address must be 4 byte aligned"
+#endif