diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2014-02-28 16:38:09 +0900 |
|---|---|---|
| committer | Violeta Menendez Gonzalez <violeta.menendez@codethink.co.uk> | 2014-09-29 13:54:31 +0000 |
| commit | 5b1bd3b73d4ece52abce8c652ffc90f7be25cd5a (patch) | |
| tree | 095c7c61d9cee7a007001cb8483197459a5c2211 | |
| parent | cfb0ae67faf0630806e9b3775448521b9b25b66d (diff) | |
| download | linux-5b1bd3b73d4ece52abce8c652ffc90f7be25cd5a.tar.gz | |
Embed NVEA firmware into the kernel
Conflicts:
arch/arm/configs/tegra_defconfig
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 8 | ||||
| -rw-r--r-- | firmware/nouveau/nvea_fuc409c | bin | 0 -> 15255 bytes | |||
| -rw-r--r-- | firmware/nouveau/nvea_fuc409d | bin | 0 -> 1916 bytes | |||
| -rw-r--r-- | firmware/nouveau/nvea_fuc41ac | bin | 0 -> 8058 bytes | |||
| -rw-r--r-- | firmware/nouveau/nvea_fuc41ad | bin | 0 -> 1796 bytes |
5 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 77d6e9437947..014011194ec4 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -297,3 +297,11 @@ CONFIG_EARLY_PRINTK=y CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRC_CCITT=y +CONFIG_DRM_NOUVEAU=y +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="nouveau/nvea_fuc409c nouveau/nvea_fuc409d nouveau/nvea_fuc41ac nouveau/nvea_fuc41ad" +CONFIG_EXTRA_FIRMWARE_DIR="firmware" +CONFIG_FW_LOADER_USER_HELPER=y diff --git a/firmware/nouveau/nvea_fuc409c b/firmware/nouveau/nvea_fuc409c Binary files differnew file mode 100644 index 000000000000..176bcc184e26 --- /dev/null +++ b/firmware/nouveau/nvea_fuc409c diff --git a/firmware/nouveau/nvea_fuc409d b/firmware/nouveau/nvea_fuc409d Binary files differnew file mode 100644 index 000000000000..e6997c0252cb --- /dev/null +++ b/firmware/nouveau/nvea_fuc409d diff --git a/firmware/nouveau/nvea_fuc41ac b/firmware/nouveau/nvea_fuc41ac Binary files differnew file mode 100644 index 000000000000..143a923b953e --- /dev/null +++ b/firmware/nouveau/nvea_fuc41ac diff --git a/firmware/nouveau/nvea_fuc41ad b/firmware/nouveau/nvea_fuc41ad Binary files differnew file mode 100644 index 000000000000..b14ead08bdfa --- /dev/null +++ b/firmware/nouveau/nvea_fuc41ad |