Target defined macro fix

diff --git a/arch/h8300/include/asm/elf.h b/arch/h8300/include/asm/elf.h
index 6db7124..d1bc0cb 100644 (file)
--- a/arch/h8300/include/asm/elf.h
+++ b/arch/h8300/include/asm/elf.h
@@ -25,10 +25,10 @@ typedef unsigned long elf_fpregset_t;
 #define ELF_CLASS      ELFCLASS32
 #define ELF_DATA       ELFDATA2MSB
 #define ELF_ARCH       EM_H8_300
-#if defined(__H8300H__)
+#if defined(CONFIG_CPU_H8300H)
 #define ELF_CORE_EFLAGS 0x810000
 #endif
-#if defined(__H8300S__)
+#if defined(CONFIG_CPU_H8S)
 #define ELF_CORE_EFLAGS 0x820000
 #endif
 

diff --git a/arch/h8300/include/asm/ptrace.h b/arch/h8300/include/asm/ptrace.h
index c1826b9..3ca0114 100644 (file)
--- a/arch/h8300/include/asm/ptrace.h
+++ b/arch/h8300/include/asm/ptrace.h
@@ -4,16 +4,14 @@
 #include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-#if defined(CONFIG_CPU_H8S)
-#endif
 #ifndef PS_S
 #define PS_S  (0x10)
 #endif
 
-#if defined(__H8300H__)
+#if defined(CONFIG_CPU_H8300H)
 #define H8300_REGS_NO 11
 #endif
-#if defined(__H8300S__)
+#if defined(CONFIG_CPU_H8S)
 #define H8300_REGS_NO 12
 #endif
 

diff --git a/arch/h8300/include/uapi/asm/ptrace.h b/arch/h8300/include/uapi/asm/ptrace.h
index ef39ec5..43bdd20 100644 (file)
--- a/arch/h8300/include/uapi/asm/ptrace.h
+++ b/arch/h8300/include/uapi/asm/ptrace.h
@@ -31,7 +31,7 @@ struct pt_regs {
        unsigned short ccr;
        long     er0;
        long     vector;
-#if defined(CONFIG_CPU_H8S)
+#if defined(__H8300S__)
        unsigned short exr;
 #endif
        unsigned long  pc;

diff --git a/arch/h8300/lib/abs.S b/arch/h8300/lib/abs.S
index ddd1fb3..c228511 100644 (file)
--- a/arch/h8300/lib/abs.S
+++ b/arch/h8300/lib/abs.S
@@ -2,10 +2,10 @@
 
 #include <asm/linkage.h>
 
-#if defined(__H8300H__) 
+#if defined(CONFIG_CPU_H8300H) 
        .h8300h
 #endif
-#if defined(__H8300S__) 
+#if defined(CONFIG_CPU_H8S) 
        .h8300s
 #endif
        .text

diff --git a/arch/h8300/lib/memcpy.S b/arch/h8300/lib/memcpy.S
index 9683d12..c867419 100644 (file)
--- a/arch/h8300/lib/memcpy.S
+++ b/arch/h8300/lib/memcpy.S
@@ -2,13 +2,12 @@
 
 #include <asm/linkage.h>
 
-#if defined(__H8300H__) 
+#if defined(CONFIG_CPU_H8300H) 
        .h8300h
 #endif
-#if defined(__H8300S__) 
+#if defined(CONFIG_CPU_H8S) 
        .h8300s
 #endif
-
        .text
 .global memcpy
 

diff --git a/arch/h8300/lib/romfs.S b/arch/h8300/lib/romfs.S
deleted file mode 100644 (file)
index 68910d8..0000000
--- a/arch/h8300/lib/romfs.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/* romfs move to __ebss */
-
-#include <asm/linkage.h>
-
-#if defined(__H8300H__) 
-       .h8300h
-#endif
-#if defined(__H8300S__) 
-       .h8300s
-#endif
-
-#define BLKOFFSET 512
-
-       .text
-.globl __move_romfs
-_romfs_sig_len = 8
-
-__move_romfs:  
-       mov.l   #__sbss,er0
-       mov.l   #_romfs_sig,er1
-       mov.b   #_romfs_sig_len,r3l
-1:                                     /* check romfs image */
-       mov.b   @er0+,r2l
-       mov.b   @er1+,r2h
-       cmp.b   r2l,r2h
-       bne     2f
-       dec.b   r3l
-       bne     1b
-
-       /* find romfs image */
-       mov.l   @__sbss+8,er0           /* romfs length(be) */
-       mov.l   #__sbss,er1
-       add.l   er0,er1                 /* romfs image end */
-       mov.l   #__ebss,er2
-       add.l   er0,er2                 /* distination address */
-#if defined(CONFIG_INTELFLASH)
-       add.l   #BLKOFFSET,er2
-#endif
-       adds    #2,er0
-       adds    #1,er0
-       shlr    er0
-       shlr    er0                     /* transfer length */
-1:
-       mov.l   @er1,er3                /* copy image */
-       mov.l   er3,@er2
-       subs    #4,er1
-       subs    #4,er2
-       dec.l   #1,er0
-       bpl     1b
-2:
-       rts
-
-       .section        .rodata
-_romfs_sig:    
-       .ascii  "-rom1fs-"
-
-       .end