From patchwork Sat Aug 24 14:44:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1152652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="BYjuwsXA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46G1J744h7z9sBF for ; Sun, 25 Aug 2019 00:44:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EBBE2C21E49; Sat, 24 Aug 2019 14:44:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 091EEC21C50; Sat, 24 Aug 2019 14:44:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 446E6C21C3F; Sat, 24 Aug 2019 14:44:27 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id B2E46C21C38 for ; Sat, 24 Aug 2019 14:44:26 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id b10so17915621ioj.2 for ; Sat, 24 Aug 2019 07:44:26 -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:mime-version :content-transfer-encoding; bh=BbbtlquT78ecqRMgnuE7bIoFfFmZMcaUpY2la0qEedQ=; b=BYjuwsXA2C1LSKlbuPBnVdBYV14QXMYvU5/0CFOY0LlX6RKBbNmJbwiUPLHhlMpTnT u0et24p4VMDGZHJX35E1DpIpYbOph7383SlItbsFcBoNyTzb6fZ44up6H3F74OiAUYoE wZVH+rstm4378RougJilzUItaqE21mnuAkVBw= 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:mime-version :content-transfer-encoding; bh=BbbtlquT78ecqRMgnuE7bIoFfFmZMcaUpY2la0qEedQ=; b=SAQ7ZVRByvv1unVIanlf77hax0fjNjZhzk6S5t9rmD6on/6h/c3vTDHOJo5x5SHCff K8hns2BHD5GYfIefu3y+87N/MiBBRseHYK/xY6INnxOpkb2h8LMI/HodQYvpui8e/YMd frOg2J4D74P2VBfeU3Vtrxi/9jL6IuO6v5o5la1QaQkVRfPOYBCP6lGt8yQGIHI1Z8pY T5yN2KHiJiA9LxGXWQ1p482N4NYw8J8VhLIFuYsw7s30b7QuM++uZzUPqzXbgsA1c6Lm MLo5FJ+mCG+VkfkVsOnSu2w6AoZZQRKPHs1/4siQUsJ/K0SnFEOi1/jutgYF9+5jFaQR f5Uw== X-Gm-Message-State: APjAAAV3hLTGvjwP9koPWf9J8Troczdi5lWAMY+K4C0tgx6Xf7lR+fAR SkhssfXFR5wP7aMeknhbMx0XQZjje0w= X-Google-Smtp-Source: APXvYqx9I3fBbaro5+xq+RonZ1vhJ1dLHttL4OwVUYA+hyInPlzvoR+znNUXmWUpQCJtY940D4R2iw== X-Received: by 2002:a6b:fd13:: with SMTP id c19mr4432960ioi.168.1566657865140; Sat, 24 Aug 2019 07:44:25 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c19sm5614385ioi.22.2019.08.24.07.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Aug 2019 07:44:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 24 Aug 2019 08:44:12 -0600 Message-Id: <20190824144422.235024-1-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 00/10] x86: Prepare for adding FSP2 code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" At present the x86 FSP (Firmware Support Package) code assumes that FSP version 1 is used. Since this code was added to U-Boot a new version (FSP2) has been produced by Intel. In preparation for adding support for FSP2, move the existing code into a directory that indicates it is used for FSP1. Changes in v2: - Correct Intel FSP web link - Rewrite to make azalia a common file for FSP1 and FSP2 Simon Glass (10): x86: Rename existing FSP code to fsp1 x86: Move fsp_azalia.h to the generic fsp directory x86: Create a new fsp_arch.h header x86: Move fsp_api.h inclusion out of fsp_support.h x86: Move fsp_types.h to the generic fsp directory x86: Move fsp_fv.h to the generic fsp directory x86: Move fsp_hob.h to the generic fsp directory x86: Move fsp_infoheader.h to the generic fsp directory x86: Move fsp_bootmode.h to the generic fsp directory x86: Move fsp_ffs.h include to fsp_arch.h arch/x86/Kconfig | 25 ++++++++++++++++++- arch/x86/cpu/baytrail/acpi.c | 2 +- arch/x86/cpu/baytrail/fsp_configs.c | 2 +- arch/x86/cpu/braswell/fsp_configs.c | 2 +- arch/x86/cpu/ivybridge/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/tnc.c | 2 +- arch/x86/include/asm/{fsp => fsp1}/fsp_api.h | 0 arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h | 0 .../include/asm/{fsp => fsp1}/fsp_support.h | 19 +++++++------- arch/x86/include/asm/fsp_arch.h | 22 ++++++++++++++++ arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/lib/Makefile | 3 ++- arch/x86/lib/{fsp => fsp1}/Makefile | 0 arch/x86/lib/{fsp => fsp1}/fsp_car.S | 0 arch/x86/lib/{fsp => fsp1}/fsp_common.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_dram.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_graphics.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_support.c | 2 +- .../som-db5800-som-6867/som-db5800-som-6867.c | 2 +- board/intel/cherryhill/cherryhill.c | 2 +- cmd/x86/fsp.c | 2 +- drivers/pci/pci-uclass.c | 2 +- 23 files changed, 73 insertions(+), 26 deletions(-) rename arch/x86/include/asm/{fsp => fsp1}/fsp_api.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_support.h (94%) create mode 100644 arch/x86/include/asm/fsp_arch.h rename arch/x86/lib/{fsp => fsp1}/Makefile (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_car.S (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_common.c (99%) rename arch/x86/lib/{fsp => fsp1}/fsp_dram.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_graphics.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_support.c (99%)