From patchwork Sat Feb 7 18:51:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 437605 X-Patchwork-Delegate: sjg@chromium.org 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 470DE14018C for ; Sun, 8 Feb 2015 05:58:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E79644B5D3; Sat, 7 Feb 2015 19:58:07 +0100 (CET) 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 g3oNv0MYC-Ed; Sat, 7 Feb 2015 19:58:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6050A4B666; Sat, 7 Feb 2015 19:58:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E66F4A04A for ; Sat, 7 Feb 2015 19:57:43 +0100 (CET) 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 gG9dYLuV9qWt for ; Sat, 7 Feb 2015 19:57:43 +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-vc0-f202.google.com (mail-vc0-f202.google.com [209.85.220.202]) by theia.denx.de (Postfix) with ESMTPS id C8D224A04C for ; Sat, 7 Feb 2015 19:57:39 +0100 (CET) Received: by mail-vc0-f202.google.com with SMTP id la4so2216168vcb.1 for ; Sat, 07 Feb 2015 10:57:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mPILfVlo8ln0iATRdI872dGae0iHHeceaFrkSmQEoBY=; b=OM0FqSK9FwnPO2y8PKmLJj1EwAipZynk5AiIyXGIcLRoIvaA6WgNlD17xdi6q5FVXm L3lAY1PjTDhw6Mowt15FR+y4maSexajVCtoT+GDHw/Zub1YuIVRH+g4RK/w9EQ8SeyHe v3CEITvZl5sVvLCPRh6eLzeM4sQL7VdnU0A3+2WTkhksQqS0fztaz0Ki1jcePVOERHqi kam2oixX48bYM5DB8fBTVRHWM2sC/af1Ulw2gJCsuLePE1pU8YQxxSVyXi3xJoydab7y 2dOqKNiYM6cUEdT/5hSmplROt2D9FjyLyL2qcVD4G43eok1+2Vbq1laCHTIsCdnGoAMe rc5w== X-Gm-Message-State: ALoCoQk13Vn6d6G/Fw1sE1smvaOXeuow7abpJtekduwVpWRg0PDacqcXSqztrLtj26i08JHdYLNX X-Received: by 10.236.66.234 with SMTP id h70mr8397460yhd.41.1423335458154; Sat, 07 Feb 2015 10:57:38 -0800 (PST) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id s10si1144877qcl.3.2015.02.07.10.57.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Feb 2015 10:57:38 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id v6pStW7z.1; Sat, 07 Feb 2015 10:57:38 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 71B81220BDD; Sat, 7 Feb 2015 11:52:16 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 7 Feb 2015 11:51:45 -0700 Message-Id: <1423335112-24585-13-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1423335112-24585-1-git-send-email-sjg@chromium.org> References: <1423335112-24585-1-git-send-email-sjg@chromium.org> Cc: Kim Phillips , Kumar Gala , Andy Fleming , Stefan Roese Subject: [U-Boot] [PATCH v2 12/19] powerpc: ppc4xx: Use CONFIG_OF_CONTROL for canyonlands boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_OF_CONTROL so that U-Boot on these three boards uses a device tree for its configuration. Signed-off-by: Simon Glass --- Changes in v2: None board/amcc/canyonlands/u-boot-ram.lds | 10 ++++++++-- configs/arches_defconfig | 3 +++ configs/canyonlands_defconfig | 3 +++ configs/glacier_defconfig | 3 +++ configs/glacier_ramboot_defconfig | 3 +++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/board/amcc/canyonlands/u-boot-ram.lds b/board/amcc/canyonlands/u-boot-ram.lds index 6765256..1750c74 100644 --- a/board/amcc/canyonlands/u-boot-ram.lds +++ b/board/amcc/canyonlands/u-boot-ram.lds @@ -12,6 +12,7 @@ SECTIONS . = + SIZEOF_HEADERS; .text : { + _image_copy_start = .; arch/powerpc/cpu/ppc4xx/start.o (.text*) board/amcc/canyonlands/init.o (.text*) @@ -61,9 +62,14 @@ SECTIONS . = ALIGN(256); __init_begin = .; .text.init : { *(.text.init) } - .data.init : { *(.data.init) } - . = ALIGN(256); + .data.init : { + *(.data.init) + . = ALIGN(256); + LONG(0) LONG(0) /* Extend u-boot.bin to here */ + } __init_end = .; + _end = .; + _image_binary_end = .; __bss_start = .; .bss (NOLOAD) : diff --git a/configs/arches_defconfig b/configs/arches_defconfig index 60e6ef9..30c6932 100644 --- a/configs/arches_defconfig +++ b/configs/arches_defconfig @@ -2,3 +2,6 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_ARCHES=y +CONFIG_DEFAULT_DEVICE_TREE="arches" +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index 37a2b4d..6f6cf14 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -2,3 +2,6 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_CANYONLANDS=y +CONFIG_DEFAULT_DEVICE_TREE="canyonlands" +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index 436b9f8..e67fa32 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -2,3 +2,6 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y +CONFIG_DEFAULT_DEVICE_TREE="glacier" +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig index 4fc2303..e5b402e 100644 --- a/configs/glacier_ramboot_defconfig +++ b/configs/glacier_ramboot_defconfig @@ -3,3 +3,6 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y +CONFIG_DEFAULT_DEVICE_TREE="glacier" +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y