50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
|
From 0509f6dcc46d10ea4bb8c70494dc7ae11bcb3f01 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Wed, 10 Dec 2014 21:14:10 +0100
|
||
|
|
Subject: [PATCH] firmware: backport NVRAM driver
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||
|
|
---
|
||
|
|
arch/arm/Kconfig | 2 ++
|
||
|
|
drivers/firmware/Kconfig | 1 +
|
||
|
|
drivers/firmware/Makefile | 1 +
|
||
|
|
drivers/net/ethernet/broadcom/b44.c | 2 +-
|
||
|
|
drivers/net/ethernet/broadcom/bgmac.c | 2 +-
|
||
|
|
drivers/ssb/driver_chipcommon_pmu.c | 2 +-
|
||
|
|
6 files changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/arm/Kconfig
|
||
|
|
+++ b/arch/arm/Kconfig
|
||
|
|
@@ -2105,6 +2105,8 @@ source "drivers/Kconfig"
|
||
|
|
|
||
|
|
source "drivers/firmware/Kconfig"
|
||
|
|
|
||
|
|
+source "drivers/firmware/Kconfig"
|
||
|
|
+
|
||
|
|
source "fs/Kconfig"
|
||
|
|
|
||
|
|
source "arch/arm/Kconfig.debug"
|
||
|
|
--- a/drivers/firmware/Kconfig
|
||
|
|
+++ b/drivers/firmware/Kconfig
|
||
|
|
@@ -136,6 +136,7 @@ config QCOM_SCM
|
||
|
|
bool
|
||
|
|
depends on ARM || ARM64
|
||
|
|
|
||
|
|
+source "drivers/firmware/broadcom/Kconfig"
|
||
|
|
source "drivers/firmware/google/Kconfig"
|
||
|
|
source "drivers/firmware/efi/Kconfig"
|
||
|
|
|
||
|
|
--- a/drivers/firmware/Makefile
|
||
|
|
+++ b/drivers/firmware/Makefile
|
||
|
|
@@ -14,6 +14,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.
|
||
|
|
obj-$(CONFIG_QCOM_SCM) += qcom_scm.o
|
||
|
|
CFLAGS_qcom_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
|
||
|
|
|
||
|
|
+obj-y += broadcom/
|
||
|
|
obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
|
||
|
|
obj-$(CONFIG_EFI) += efi/
|
||
|
|
obj-$(CONFIG_UEFI_CPER) += efi/
|