From patchwork Wed Mar 6 00:39:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 225223 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id AA3422C02A8 for ; Wed, 6 Mar 2013 11:44:23 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2F9F84A1F4; Wed, 6 Mar 2013 01:43:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4JGtMc3HrgFS; Wed, 6 Mar 2013 01:43:33 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F1E0D4A245; Wed, 6 Mar 2013 01:41:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09CE54A206 for ; Wed, 6 Mar 2013 01:41:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tYV57pMrYcln for ; Wed, 6 Mar 2013 01:41:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ve0-f201.google.com (mail-ve0-f201.google.com [209.85.128.201]) by theia.denx.de (Postfix) with ESMTPS id 095374A1DE for ; Wed, 6 Mar 2013 01:41:02 +0100 (CET) Received: by mail-ve0-f201.google.com with SMTP id 14so807623vea.0 for ; Tue, 05 Mar 2013 16:41:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=93Voj3YnJ+htPkKAB9Fc0kZcHym63QSi3fxNmEQYHbU=; b=eHKJoY0Qgfh8goEYjD8yBCsGiQzA0qkteMYIX6YzVKbGEwMxQegOaq5FUrhT6DQY8/ UQbbze1lHLIkGoJB7n/2o2iv8Caegmacudw1HK6yMwRJBE5MUntWIp+fkzoTu1YQBfgv um0rsScrNyI4d8zFcuMCdwGObIK6Newq+UfVR0T6yCAPuObTmruGWUX9CNe9MnYLBtGh ImtIYBiSS06iA8OFXF8EehnAJPGblKQ+JRrJxUlLsWt6d91LG6FD770mXNEwXiW4vD2T LQKLf+DwE6TDXwPPDUd/O7XSLzzIG9Ur64n54AuBKal/N4ljXeCx4bdPxN01HCn9EkQC ETCw== X-Received: by 10.236.181.34 with SMTP id k22mr16472404yhm.7.1362530461465; Tue, 05 Mar 2013 16:41:01 -0800 (PST) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id b67si445268yhi.2.2013.03.05.16.41.01 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 05 Mar 2013 16:41:01 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 403D85A4213; Tue, 5 Mar 2013 16:41:01 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 20F6D160A46; Tue, 5 Mar 2013 16:41:01 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Tue, 5 Mar 2013 16:39:51 -0800 Message-Id: <1362530405-10824-18-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1362530405-10824-1-git-send-email-sjg@chromium.org> References: <1362530405-10824-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQl/Q7w/JeJOf/Rcc/J1D2Fu5gpI6QWBsTkHETKeOcaiIWNpn/CSHNwVCbcZmdATlgGY2djQgnN9iwezNp8jHjQZLL75X7xR0hcGxBsxVYboCem+kYTemBjNEpbdMKfznli5fdyNypyOB9RtOp/spCn4AB3c70pmB62J+hv4MUEA/YuFq6uSDiltBpC1+swKFI4heV3D Cc: Kim Phillips , Graeme Russ , Kumar Gala , Andy Fleming , Tom Rini , Vadim Bendebury , Stefan Roese Subject: [U-Boot] [PATCH v6 17/31] ppc: Enable generic board support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This enables generic board support so that ppc boards can define CONFIG_SYS_GENERIC_BOARD. Signed-off-by: Simon Glass --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None arch/powerpc/config.mk | 3 --- arch/powerpc/include/asm/u-boot.h | 7 +++++++ arch/powerpc/lib/Makefile | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index bf77090..b706281 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -29,9 +29,6 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n -# Move to unified board system later -CONFIG_SYS_LEGACY_BOARD := y - # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 7229a98..951dd6a 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -34,6 +34,11 @@ * include/asm-ppc/u-boot.h */ +#ifdef CONFIG_SYS_GENERIC_BOARD +/* Use the generic board which requires a unified bd_info */ +#include +#else + #ifndef __ASSEMBLY__ typedef struct bd_info { @@ -144,6 +149,8 @@ typedef struct bd_info { #endif /* __ASSEMBLY__ */ +#endif /* nCONFIG_SYS_GENERIC_BOARD */ + /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_PPC diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 86cf02a..59c723b 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -59,8 +59,10 @@ SOBJS-y += reloc.o COBJS-$(CONFIG_BAT_RW) += bat_rw.o ifndef CONFIG_SPL_BUILD +ifndef CONFIG_SYS_GENERIC_BOARD COBJS-y += board.o endif +endif COBJS-y += bootm.o COBJS-y += cache.o COBJS-y += extable.o