From patchwork Mon Mar 18 23:51:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 228873 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 90F4A2C00BC for ; Tue, 19 Mar 2013 11:03:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 576414A0AB; Tue, 19 Mar 2013 01:00:38 +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 g3c7fb4u3Ime; Tue, 19 Mar 2013 01:00:38 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8CEA74A17A; Tue, 19 Mar 2013 00:54:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 615CC4A0EE for ; Tue, 19 Mar 2013 00:54:04 +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 gjzN6ux2LlrZ for ; Tue, 19 Mar 2013 00:54:01 +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-ye0-f202.google.com (mail-ye0-f202.google.com [209.85.213.202]) by theia.denx.de (Postfix) with ESMTPS id 9E8E64A098 for ; Tue, 19 Mar 2013 00:53:23 +0100 (CET) Received: by mail-ye0-f202.google.com with SMTP id q5so638570yen.3 for ; Mon, 18 Mar 2013 16:53:20 -0700 (PDT) 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=0uT/mY/YGsZLQvHRfS+cTpKB7fe5eEz/IxWR2kHcjEE=; b=Ayf5eIafk6rFxbL0OHN6s2PyVtmhKzPGHxjrIhgmkUyrmyZ5YZN9KP6VTTr8Iw7r3P l6yVakD8yRf9gtjJZTTfMTmr3W1mm9KK8S+Dq+J/+GZzGFyANVgvAy6iDh1+gHK1TjCH QuYxCMSoghRLfhNLUKh4BW75MNn+tPNXK9Em+MIhxeTGtwMP/3AVODjzuYiYtdRRDk2j ICFB3myH/vrbLT8pTMQkGj0DDf2xEw3TD6ESjiMqh5eYvsi+EzbOHzn9MJrfHlarme/7 RAQqIWxFshm+D5c7gXlWvfuS0jW+9XROVycTYXYOHBo18ZIRKn91o0KOLMxt6HHMi7z2 rR3g== X-Received: by 10.58.168.243 with SMTP id zz19mr12840429veb.4.1363650800841; Mon, 18 Mar 2013 16:53:20 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id t30si2188233yhi.6.2013.03.18.16.53.20 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 18 Mar 2013 16:53:20 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id A2C0E31C00F; Mon, 18 Mar 2013 16:53:20 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 818B5160341; Mon, 18 Mar 2013 16:53:20 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 18 Mar 2013 16:51:44 -0700 Message-Id: <1363650725-30459-25-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1363650725-30459-1-git-send-email-sjg@chromium.org> References: <1363650725-30459-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQnS+1GTjSc/Va/QijQnzDI8Q5B65/o+vEl/bJ3rYgFAlJ94pxfmlq+VY2HNTq2nl00qsWHldZBdQczmNCinuJ4QffmUCEebi38d1JY1pRdIQWYwEJgZlABFesWsYzTwXhZTWLyusV+ksVl+B4rWTyDwQb3I3KPD7Nl5Ca72ohgWhFayESZjY3a03m6GXjWsBCvPRMI1 Cc: Joel A Fernandes , Will Drewry , u-boot-review@google.com, Bill Richardson , Randall Spangler , Tom Rini , Vadim Bendebury , =?UTF-8?q?Andreas=20B=C3=A4ck?= , Kees Cook Subject: [U-Boot] [PATCH v2 24/45] Revert "fdt- Tell the FDT library where the device tree is" 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 reverts commit 3b73459ea3421e9f8c6c8c62e1d3fe458ca5bc56. In practice it doesn't seem like a good idea to make the the working FDT point to the control FDT. Now that we can access the control FDT using the 'fdt' command, there is no need for this feature. Remove it. Signed-off-by: Simon Glass --- Changes in v2: - Revert the whole change including the set_working_fdt_addr() part common/main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common/main.c b/common/main.c index a15f020..953ef29 100644 --- a/common/main.c +++ b/common/main.c @@ -45,10 +45,6 @@ #include #endif -#ifdef CONFIG_OF_LIBFDT -#include -#endif /* CONFIG_OF_LIBFDT */ - #include #include #include @@ -376,10 +372,6 @@ void main_loop (void) bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop"); -#if defined CONFIG_OF_CONTROL - set_working_fdt_addr((void *)gd->fdt_blob); -#endif /* CONFIG_OF_CONTROL */ - #ifdef CONFIG_BOOTCOUNT_LIMIT bootcount = bootcount_load(); bootcount++;