From patchwork Sat Feb 7 18:51:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 437602 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 8510314017B for ; Sun, 8 Feb 2015 05:57:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 301B54B164; Sat, 7 Feb 2015 19:57:48 +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 lCiJ6Hxdvi_c; Sat, 7 Feb 2015 19:57:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C89E14A049; Sat, 7 Feb 2015 19:57:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02DD14A054 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 zWehBKrb5Dq8 for ; Sat, 7 Feb 2015 19:57:42 +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-ig0-f201.google.com (mail-ig0-f201.google.com [209.85.213.201]) by theia.denx.de (Postfix) with ESMTPS id 933014A04A for ; Sat, 7 Feb 2015 19:57:39 +0100 (CET) Received: by mail-ig0-f201.google.com with SMTP id b16so2333539igk.0 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=4qqPE18cpnVBjAIG/a2KmxO1veMmktjtVSdSNSvH4eE=; b=D4lV7S+7Bbcg8B6pOXbX5AMMsobNsjKZPgQXxVS0o4u1rgOeyEbPj5f53+LsWnqQ+P hLdMEZKj2AcXsd35fQOhLuXKOHKuFZrmOkvA0WUORwPphgJJse+kF5lq3kZZiJmuRQaW x03PQ9XWANtIxH4pLOriSYGspapk4v3Y2OqhZAIFgKQI894IFmbwzjuYVyCq8udvjoLO hsxF8hoCNYnxvMjBp05o+QQMT9H6krWGXKbUQomwZNPRZQk6SDjgU20gYUCPaUDQ2T91 TmhMS0/jcUPIeicVqFX6MAsxiT2Pdq8uC2zaO3Yg79HINLAQwyIIs7dfCUGcbjjdO8OH c2DA== X-Gm-Message-State: ALoCoQn4p0MraRl55e2b8JyKJS6iAG6RJx3PRQ2OaLw3cY+huJ8VpU5LijFI+V9wllFpN2k2i74t X-Received: by 10.43.14.74 with SMTP id pp10mr16362015icb.19.1423335458436; Sat, 07 Feb 2015 10:57:38 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id z3si1089256qcn.0.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-1.hot.corp.google.com with ESMTP id GDNFRFxc.1; Sat, 07 Feb 2015 10:57:38 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 21FE92212C6; Sat, 7 Feb 2015 11:52:17 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 7 Feb 2015 11:51:50 -0700 Message-Id: <1423335112-24585-18-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 17/19] powerpc: ppc4xx: Change from OF_SEPARATE to OF_EMBED 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" From: Stefan Roese This is necessary, as ppc4xx has the reset vector located at the end of the U-Boot image. This needs to be flashed to the end of the NOR flash. Adding the dtb to the main U-Boot image will break booting on ppc4xx. This patch now embeds the dtb in the U-Boot image instead. Signed-off-by: Stefan Roese Cc: Simon Glass Reviewed-by: Simon Glass Signed-off-by: Simon Glass --- Changes in v2: None configs/canyonlands_defconfig | 2 +- configs/glacier_defconfig | 2 +- configs/glacier_ramboot_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index 6f6cf14..44d4fbd 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -4,4 +4,4 @@ CONFIG_TARGET_CANYONLANDS=y CONFIG_CANYONLANDS=y CONFIG_DEFAULT_DEVICE_TREE="canyonlands" CONFIG_OF_CONTROL=y -CONFIG_OF_SEPARATE=y +CONFIG_OF_EMBED=y diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index e67fa32..d318f82 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -4,4 +4,4 @@ CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_CONTROL=y -CONFIG_OF_SEPARATE=y +CONFIG_OF_EMBED=y diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig index e5b402e..f8363b2 100644 --- a/configs/glacier_ramboot_defconfig +++ b/configs/glacier_ramboot_defconfig @@ -5,4 +5,4 @@ CONFIG_TARGET_CANYONLANDS=y CONFIG_GLACIER=y CONFIG_DEFAULT_DEVICE_TREE="glacier" CONFIG_OF_CONTROL=y -CONFIG_OF_SEPARATE=y +CONFIG_OF_EMBED=y