From patchwork Wed Jul 19 13:37:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 791016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCJ4c495mz9sNV for ; Wed, 19 Jul 2017 23:37:52 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xCJ4c1dMzzDrWW for ; Wed, 19 Jul 2017 23:37:52 +1000 (AEST) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xCJ4X36dxzDrWD for ; Wed, 19 Jul 2017 23:37:48 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74D547F6B4 for ; Wed, 19 Jul 2017 13:37:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 74D547F6B4 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 74D547F6B4 Received: from thh440s.str.redhat.com (dhcp-200-180.str.redhat.com [10.33.200.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2619E6C51E for ; Wed, 19 Jul 2017 13:37:45 +0000 (UTC) From: Thomas Huth To: slof@lists.ozlabs.org Date: Wed, 19 Jul 2017 15:37:45 +0200 Message-Id: <1500471465-20805-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 19 Jul 2017 13:37:46 +0000 (UTC) Subject: [SLOF] [PATCH] Define 'open' and 'close' words of the /aliases nodes right from the start X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" It's much easier to do this when we create the node instead of looking up the device node again later in each of the boards. Signed-off-by: Thomas Huth --- board-js2x/slof/tree.fs | 5 ----- board-qemu/slof/tree.fs | 5 ----- slof/fs/root.fs | 2 ++ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/board-js2x/slof/tree.fs b/board-js2x/slof/tree.fs index 1f924ea..10946ac 100644 --- a/board-js2x/slof/tree.fs +++ b/board-js2x/slof/tree.fs @@ -216,11 +216,6 @@ s" /openprom" find-device THEN device-end -s" /aliases" find-device - : open true ; - : close ; -device-end - s" /mmu" open-dev encode-int s" mmu" set-chosen #include "available.fs" diff --git a/board-qemu/slof/tree.fs b/board-qemu/slof/tree.fs index e71743b..cc35fa3 100644 --- a/board-qemu/slof/tree.fs +++ b/board-qemu/slof/tree.fs @@ -173,11 +173,6 @@ s" /openprom" find-device 0 0 s" relative-addressing" property device-end -s" /aliases" find-device - : open true ; - : close ; -device-end - s" /mmu" open-dev encode-int s" mmu" set-chosen #include "available.fs" diff --git a/slof/fs/root.fs b/slof/fs/root.fs index 952b00e..44d087a 100644 --- a/slof/fs/root.fs +++ b/slof/fs/root.fs @@ -57,6 +57,8 @@ THEN \ Create /aliases new-device s" aliases" device-name + : open true ; + : close ; finish-device \ Create /options