---

yaml --- r: 77745 b: refs/heads/master c: b4db3ae h: refs/heads/master i: 77743: 78e1772 v: v3
git-mirror · Jan 28, 2008 · c82e28a · c82e28a
1 parent f920674
commit c82e28a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6694e8250e37058d5a8db23245a349db4e112fe4
+refs/heads/master: b4db3aec8351c78df77bbd95f1951a4dd0246853
diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile
@@ -74,15 +74,21 @@ OBJCOPYFLAGS	:= -O binary -R .note -R .note.gnu.build-id -R .comment -R .stab -R
 # never be used by anyone. Use a board-specific defconfig that has a
 # reasonable chance of being current instead.
 #
-KBUILD_DEFCONFIG := r7780rp_defconfig
+KBUILD_DEFCONFIG	:= r7780rp_defconfig
 
-KBUILD_IMAGE	:= arch/sh/boot/zImage
+KBUILD_IMAGE		:= arch/sh/boot/zImage
 
 #
 # Choosing incompatible machines durings configuration will result in
 # error messages during linking.
 #
-LDFLAGS_vmlinux     += -e _stext
+ifdef CONFIG_SUPERH32
+LDFLAGS_vmlinux	+= -e _stext
+else
+LDFLAGS_vmlinux	+= --defsym phys_stext=_stext-$(CONFIG_CACHED_MEMORY_OFFSET) \
+		   --defsym phys_stext_shmedia=phys_stext+1 \
+		   -e phys_stext_shmedia
+endif
 
 ifdef CONFIG_CPU_LITTLE_ENDIAN
 LDFLAGS_vmlinux		+= --defsym 'jiffies=jiffies_64'