diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-24 09:20:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-09-24 09:51:15 +0200 |
| commit | c7173d0f0f25783379b8c503b69ccb5cfb4e9e2e (patch) | |
| tree | 0941ddd2421ef5c08c4ac87e3c09ade6ec6b377e | |
| parent | 3531d4acf1682ae476d9956d768300777ade41a2 (diff) | |
| download | barebox-c7173d0f0f25783379b8c503b69ccb5cfb4e9e2e.tar.gz barebox-c7173d0f0f25783379b8c503b69ccb5cfb4e9e2e.tar.xz | |
mk68: rename macro __M68K__ to __m68k__ as it's prodive by gcc
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/m68k/Makefile | 3 | ||||
| -rw-r--r-- | include/image.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index ec70028a16..86afb24732 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -18,8 +18,7 @@ # along with barebox. If not, see <http://www.gnu.org/licenses/>. # -CPPFLAGS += -isystem $(gccincdir) -D __M68K__ \ - -fno-strict-aliasing +CPPFLAGS += -isystem $(gccincdir) -fno-strict-aliasing machine-$(CONFIG_ARCH_MCF54xx) := mcfv4e diff --git a/include/image.h b/include/image.h index add5e02ae3..2c5956d600 100644 --- a/include/image.h +++ b/include/image.h @@ -96,7 +96,7 @@ #define IH_ARCH IH_ARCH_MIPS #elif defined(__nios__) #define IH_ARCH IH_ARCH_NIOS -#elif defined(__M68K__) +#elif defined(__m68k__) #define IH_ARCH IH_ARCH_M68K #elif defined(__microblaze__) #define IH_ARCH IH_ARCH_MICROBLAZE @@ -348,7 +348,7 @@ static inline int image_check_target_arch(const image_header_t *hdr) if (!image_check_arch(hdr, IH_ARCH_BLACKFIN)) #elif defined(__I386__) if (!image_check_arch(hdr, IH_ARCH_I386)) -#elif defined(__M68K__) +#elif defined(__m68k__) if (!image_check_arch(hdr, IH_ARCH_M68K)) #elif defined(__microblaze__) if (!image_check_arch(hdr, IH_ARCH_MICROBLAZE)) |