From patchwork Mon Nov 22 23:15:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 348621 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAMN8p16029920 for ; Mon, 22 Nov 2010 23:24:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757760Ab0KVXTg (ORCPT ); Mon, 22 Nov 2010 18:19:36 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:40794 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757727Ab0KVXTg (ORCPT ); Mon, 22 Nov 2010 18:19:36 -0500 Received: from yukiko.kent.sydney.vergenet.net (219-109-213-121.bitcat.net [219.109.213.121]) by kirsty.vergenet.net (Postfix) with ESMTP id 8AF18245B5; Tue, 23 Nov 2010 10:19:33 +1100 (EST) Received: by yukiko.kent.sydney.vergenet.net (Postfix, from userid 7100) id BCCD9C3071; Tue, 23 Nov 2010 08:19:32 +0900 (JST) Message-Id: <20101122231759.865310149@vergenet.net> User-Agent: quilt/0.48-1 Date: Tue, 23 Nov 2010 08:15:15 +0900 From: Simon Horman To: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Cc: Russell King , Paul Mundt , Magnus Damm , Kuninori Morimoto Subject: [patch v4 1/2] ARM: Add zboot support for SuperH Mobile ARM References: <20101122231514.766413220@vergenet.net> Content-Disposition: inline; filename=arm-mach-shmbobile-Add-zboot-support-for-SuperH-Mobile-ARM-framework.patch Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 22 Nov 2010 23:24:27 +0000 (UTC) Index: linux-2.6-arm/arch/arm/boot/compressed/Makefile =================================================================== --- linux-2.6-arm.orig/arch/arm/boot/compressed/Makefile 2010-10-14 16:47:47.000000000 +0900 +++ linux-2.6-arm/arch/arm/boot/compressed/Makefile 2010-10-14 16:47:53.000000000 +0900 @@ -45,6 +45,10 @@ else endif endif +ifeq ($(CONFIG_ARCH_SHMOBILE),y) +OBJS += head-shmobile.o +endif + # # We now have a PIC decompressor implementation. Decompressors running # from RAM should not define ZTEXTADDR. Decompressors running directly Index: linux-2.6-arm/arch/arm/boot/compressed/head-shmobile.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6-arm/arch/arm/boot/compressed/head-shmobile.S 2010-10-14 16:57:54.000000000 +0900 @@ -0,0 +1,53 @@ +/* + * The head-file for SH-Mobile ARM platforms + * + * Kuninori Morimoto + * Simon Horman + * + * 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef CONFIG_ZBOOT_ROM + + .section ".start", "ax" + + /* load board-specific initialization code */ +#include + + b 1f +__atags:@ tag #1 + .long 12 @ tag->hdr.size = tag_size(tag_core); + .long 0x54410001 @ tag->hdr.tag = ATAG_CORE; + .long 0 @ tag->u.core.flags = 0; + .long 0 @ tag->u.core.pagesize = 0; + .long 0 @ tag->u.core.rootdev = 0; + @ tag #2 + .long 8 @ tag->hdr.size = tag_size(tag_mem32); + .long 0x54410002 @ tag->hdr.tag = ATAG_MEM; + .long CONFIG_MEMORY_SIZE @ tag->u.mem.size = CONFIG_MEMORY_SIZE; + .long CONFIG_MEMORY_START @ @ tag->u.mem.start = CONFIG_MEMORY_START; + @ tag #3 + .long 0 @ tag->hdr.size = 0 + .long 0 @ tag->hdr.tag = ATAG_NONE; +1: + + /* Set board ID necessary for boot */ + ldr r7, 1f @ Set machine type register + adr r8, __atags @ Set atag register + b 2f + +1 : .long MACH_TYPE +2 : + +#endif /* CONFIG_ZBOOT_ROM */ Index: linux-2.6-arm/arch/arm/mach-shmobile/include/mach/zboot.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6-arm/arch/arm/mach-shmobile/include/mach/zboot.h 2010-10-14 16:55:20.000000000 +0900 @@ -0,0 +1,12 @@ +#ifndef ZBOOT_H +#define ZBOOT_H + +/************************************************** + * + * board specific settings + * + **************************************************/ + +#error "unsupported board." + +#endif /* ZBOOT_H */