From af842f28b956b74a099aedf155569e074c0c7254 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 16 Apr 2012 15:45:33 +0000 Subject: [PATCH] Kconfig update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4616 42af7a65-404d-4744-a932-0658087f49c3 --- arch/8051/include/irq.h | 2 +- arch/arm/src/arm/up_head.S | 2 +- arch/sh/include/sh1/irq.h | 4 ++-- arch/sh/src/sh1/chip.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/8051/include/irq.h b/arch/8051/include/irq.h index 29b19d2807..60f5d1c474 100644 --- a/arch/8051/include/irq.h +++ b/arch/8051/include/irq.h @@ -68,7 +68,7 @@ */ #define IRAM_BASE 0x0000 -#ifdef CONFIG_ARCH_8052 +#ifdef CONFIG_ARCH_CHIP_8052 # define IRAM_SIZE 0x0100 #else # define IRAM_SIZE 0x0080 diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S index 7ed94bd9a6..c04dddf8aa 100644 --- a/arch/arm/src/arm/up_head.S +++ b/arch/arm/src/arm/up_head.S @@ -458,7 +458,7 @@ __start: .long MMU_L2_PGTABFLAGS /* L2 MMU flags to use */ #endif /* CONFIG_PAGING */ - .size _start, .-_start + .size __start, .-__start /**************************************************************************** * Name: .Lvstart diff --git a/arch/sh/include/sh1/irq.h b/arch/sh/include/sh1/irq.h index 5e21ecc6bf..a6b0fcbaee 100644 --- a/arch/sh/include/sh1/irq.h +++ b/arch/sh/include/sh1/irq.h @@ -120,7 +120,7 @@ /* On-chip modules -- The following may be unique to the 7032 */ -#ifdef CONFIG_ARCH_SH7032 +#ifdef CONFIG_ARCH_CHIP_SH7032 /* DMAC */ @@ -342,7 +342,7 @@ /* On-chip modules -- The following may be unique to the 7032 */ -#ifdef CONFIG_ARCH_SH7032 +#ifdef CONFIG_ARCH_CHIP_SH7032 /* DMAC */ diff --git a/arch/sh/src/sh1/chip.h b/arch/sh/src/sh1/chip.h index 21204155f2..e907bbd421 100644 --- a/arch/sh/src/sh1/chip.h +++ b/arch/sh/src/sh1/chip.h @@ -43,7 +43,7 @@ #include #include -#ifdef CONFIG_ARCH_SH7032 +#ifdef CONFIG_ARCH_CHIP_SH7032 # include "sh1_703x.h" #endif