[PATCH 1/3] blackfin: remove duplicated PAGE_SIZE define

[PATCH 1/3] blackfin: remove duplicated PAGE_SIZE define

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/blackfin/include/asm/page.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h
index b51e6d1..ce65ee0 100644
--- a/arch/blackfin/include/asm/page.h
+++ b/arch/blackfin/include/asm/page.h
@@ -28,7 +28,6 @@
 /* PAGE_SHIFT determines the page size */
 
 #define PAGE_SHIFT			(12)
-#define PAGE_SIZE			(4096)
 #define PAGE_MASK			(~(PAGE_SIZE-1))
 
 #ifdef __KERNEL__
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] ipe337: fix default env

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/blackfin/configs/ipe337_defconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index 34c1089..ffd144c 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -2,7 +2,7 @@ CONFIG_TEXT_BASE=0x03f00000
 CONFIG_LONGHELP=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/blackin/boards/ipe337/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/blackfin/boards/ipe337/env"
 CONFIG_CMD_EDIT=y
 CONFIG_CMD_SLEEP=y
 CONFIG_CMD_SAVEENV=y
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] mk68: rename macro __M68K__ to __m68k__ as it's prodive by gcc

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/m68k/Makefile |    3 +--
 include/image.h    |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index ec70028..86afb24 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 add5e02..2c5956d 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))
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox