From patchwork Sat Aug 1 16:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1339756 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PP5XE1dy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BJpy32PB6z9sSt for ; Sun, 2 Aug 2020 02:09:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 36F0381F47; Sat, 1 Aug 2020 18:08:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PP5XE1dy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F09B881D9E; Sat, 1 Aug 2020 18:08:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B05C281BBB for ; Sat, 1 Aug 2020 18:08:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x342.google.com with SMTP id e11so725018otk.4 for ; Sat, 01 Aug 2020 09:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MI95JZgxnu7j8mFfpvkN+EJe8Trf/4DclvA/F+7aS4k=; b=PP5XE1dy8q4suUJdZgZVyj9oui3S7txd1xlilHSj7ug3iZWVu1+HiIG7ueDS3CnZAQ pDqdP+kGXXweqbRljKFQxrGpygO9hrNwuXk1ppXNNF41Dp+psB3q07OMxVefFmhxoyfI E6oNjMPGZ2o7wV8P8frh2V72cchgogNizCom4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MI95JZgxnu7j8mFfpvkN+EJe8Trf/4DclvA/F+7aS4k=; b=bI4UypdaTLOM/E5DLdLsA47dYGZ157DVzgQQGrYdQPQyTNMlI6uWe7t0oxI5ldOGqi 0OU+LohBwh/QqMFkTv10R7mW0vx020aKHYNNvBauODvwblyssUcmbtDReM8wJDhtmtL9 ycgdeuapiF6Mf44FS3P7WaEoddwx+cLA6Ki/mC3W2xxNMfHXyNYIdBLpW99bMPTQGF2D Vkn6EDZvQ64O9swhqsTK9h7GWUCcQ3xERMtxEnwZuoWeallMLBRL2JbSs5DSyzeS65c9 nCPh5I4kgV8wWOKeh04OzjnII+ofM8k6zJ16/akoCwo0jBpcHKwIMsOzBDxk/YkC6XBl x++A== X-Gm-Message-State: AOAM532GvTuSeXeOOxJi/JirqqvbYgu5L9BPDB1VoQkUB5OarQBHzaPx 6HCzdrESd2tKhILs6Ud7xYplqN9jnU9HTw== X-Google-Smtp-Source: ABdhPJzLuN1UwkmfjiXwC0EyNw8fYxpNKR7PjW5yKWd2iMBaY/5XGqeKOYPM0DK6R6cb8aqOsksIbg== X-Received: by 2002:a9d:4ef:: with SMTP id 102mr7303825otm.289.1596298115103; Sat, 01 Aug 2020 09:08:35 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id a14sm1911907otf.41.2020.08.01.09.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 09:08:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Andy Shevchenko , Bin Meng , Joe Hershberger , Wolfgang Wallner Subject: [PATCH 05/16] x86: zboot: Correct image type Date: Sat, 1 Aug 2020 10:08:13 -0600 Message-Id: <20200801160824.17486-6-sjg@chromium.org> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog In-Reply-To: <20200801160824.17486-1-sjg@chromium.org> References: <20200801160824.17486-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean At present U-Boot sets a loader type of 8 which means LILO version 8, according to the spec. Update it to 0x80, which means U-Boot with no particular version. Signed-off-by: Simon Glass Reviewed-by: Wolfgang Wallner --- arch/x86/lib/zimage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index b2c3daf225d..ba9eb50b0ba 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -282,8 +282,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, setup_base->screen_info.cl_offset = COMMAND_LINE_OFFSET; } if (bootproto >= 0x0200) { - hdr->type_of_loader = 8; - + hdr->type_of_loader = 0x80; /* U-Boot version 0 */ if (initrd_addr) { printf("Initial RAM disk at linear address " "0x%08lx, size %ld bytes\n",