>From 4f6485eac11ba0f8ef694f476cf8c3762188b805 Mon Sep 17 00:00:00 2001 From: Claudio Scordino Date: Tue, 26 Aug 2008 11:07:11 +0200 Subject: [PATCH] Fix regression for commit 87fee013a23ad02821699aef5b76891b42959182 Commit [87fee013a23ad02821699aef5b76891b42959182] removed "redundant" machine-type verification and manipulation, but it also removed default board (i.e. AT91RM9200DK) when the board is unknown. This patch just restores the default board. Signed-off-by: Claudio Scordino --- arch/arm/boot/compressed/Makefile | 4 ++++ arch/arm/boot/compressed/head-at91rm9200.S | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/compressed/head-at91rm9200.S diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 94462a0..a5252fc 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -44,6 +44,10 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) OBJS += head-sharpsl.o endif +ifeq ($(CONFIG_ARCH_AT91RM9200),y) +OBJS += head-at91rm9200.o +endif + ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) ifeq ($(CONFIG_CPU_CP15),y) OBJS += big-endian.o diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S new file mode 100644 index 0000000..2c2c186 --- /dev/null +++ b/arch/arm/boot/compressed/head-at91rm9200.S @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/boot/compressed/head-at91rm9200.S + * + * Copyright (C) 2003 SAN People + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ +#include + + .section ".start", "ax" + + @ Unknown board, use the AT91RM9200DK board + @ mov r7, #MACH_TYPE_AT91RM9200 + mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) + orr r7, r7, #(MACH_TYPE_AT91RM9200DK & 0xff00) + +99: -- 1.5.4.3