The nouveau firmwares have a ctxprog/ctxvals extension which is not a common extension for firmwares : > cat firmware/.gitignore *.gen.S *.fw *.bin *.csp *.dsp ihex2fw
Does anyone else think it makes sense to either switch to a common extension or to just add ctxprog/ctxvals to .gitignore ? Of course this might soon become irrelevant when we also have a generator for the whole nv50 family :)
From 9ce0b3c29a55cf6c3d71b42fbdf715d90d838eaf Mon Sep 17 00:00:00 2001 From: Xavier Chantry <[email protected]> Date: Sat, 9 Jan 2010 14:49:45 +0100 Subject: [PATCH] Add .bin extension to firmware This makes them more consistent with other firmwares, and .bin is an extension defined in .gitignore so it makes git status much cleaner. For example radeon has RV770_me.bin/RV770_pfp.bin so it looks similar to nv50_ctxprog.bin/nv50_ctxvals.bin Signed-off-by: Xavier Chantry <[email protected]> --- drivers/gpu/drm/nouveau/nv50_graph.c | 48 ++++++++++---------- firmware/Makefile | 24 +++++----- .../{nv50.ctxprog.ihex => nv50_ctxprog.bin.ihex} | 0 .../{nv50.ctxvals.ihex => nv50_ctxvals.bin.ihex} | 0 .../{nv84.ctxprog.ihex => nv84_ctxprog.bin.ihex} | 0 .../{nv84.ctxvals.ihex => nv84_ctxvals.bin.ihex} | 0 .../{nv86.ctxprog.ihex => nv86_ctxprog.bin.ihex} | 0 .../{nv86.ctxvals.ihex => nv86_ctxvals.bin.ihex} | 0 .../{nv92.ctxprog.ihex => nv92_ctxprog.bin.ihex} | 0 .../{nv92.ctxvals.ihex => nv92_ctxvals.bin.ihex} | 0 .../{nv94.ctxprog.ihex => nv94_ctxprog.bin.ihex} | 0 .../{nv94.ctxvals.ihex => nv94_ctxvals.bin.ihex} | 0 .../{nv96.ctxprog.ihex => nv96_ctxprog.bin.ihex} | 0 .../{nv96.ctxvals.ihex => nv96_ctxvals.bin.ihex} | 0 .../{nv98.ctxprog.ihex => nv98_ctxprog.bin.ihex} | 0 .../{nv98.ctxvals.ihex => nv98_ctxvals.bin.ihex} | 0 .../{nva0.ctxprog.ihex => nva0_ctxprog.bin.ihex} | 0 .../{nva0.ctxvals.ihex => nva0_ctxvals.bin.ihex} | 0 .../{nva5.ctxprog.ihex => nva5_ctxprog.bin.ihex} | 0 .../{nva5.ctxvals.ihex => nva5_ctxvals.bin.ihex} | 0 .../{nva8.ctxprog.ihex => nva8_ctxprog.bin.ihex} | 0 .../{nva8.ctxvals.ihex => nva8_ctxvals.bin.ihex} | 0 .../{nvaa.ctxprog.ihex => nvaa_ctxprog.bin.ihex} | 0 .../{nvaa.ctxvals.ihex => nvaa_ctxvals.bin.ihex} | 0 .../{nvac.ctxprog.ihex => nvac_ctxprog.bin.ihex} | 0 .../{nvac.ctxvals.ihex => nvac_ctxvals.bin.ihex} | 0 26 files changed, 36 insertions(+), 36 deletions(-) rename firmware/nouveau/{nv50.ctxprog.ihex => nv50_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv50.ctxvals.ihex => nv50_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv84.ctxprog.ihex => nv84_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv84.ctxvals.ihex => nv84_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv86.ctxprog.ihex => nv86_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv86.ctxvals.ihex => nv86_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv92.ctxprog.ihex => nv92_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv92.ctxvals.ihex => nv92_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv94.ctxprog.ihex => nv94_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv94.ctxvals.ihex => nv94_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv96.ctxprog.ihex => nv96_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv96.ctxvals.ihex => nv96_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nv98.ctxprog.ihex => nv98_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nv98.ctxvals.ihex => nv98_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nva0.ctxprog.ihex => nva0_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nva0.ctxvals.ihex => nva0_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nva5.ctxprog.ihex => nva5_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nva5.ctxvals.ihex => nva5_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nva8.ctxprog.ihex => nva8_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nva8.ctxvals.ihex => nva8_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nvaa.ctxprog.ihex => nvaa_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nvaa.ctxvals.ihex => nvaa_ctxvals.bin.ihex} (100%) rename firmware/nouveau/{nvac.ctxprog.ihex => nvac_ctxprog.bin.ihex} (100%) rename firmware/nouveau/{nvac.ctxvals.ihex => nvac_ctxvals.bin.ihex} (100%) diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index ca79f32..ce1e3c6 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -28,30 +28,30 @@ #include "drm.h" #include "nouveau_drv.h" -MODULE_FIRMWARE("nouveau/nv50.ctxprog"); -MODULE_FIRMWARE("nouveau/nv50.ctxvals"); -MODULE_FIRMWARE("nouveau/nv84.ctxprog"); -MODULE_FIRMWARE("nouveau/nv84.ctxvals"); -MODULE_FIRMWARE("nouveau/nv86.ctxprog"); -MODULE_FIRMWARE("nouveau/nv86.ctxvals"); -MODULE_FIRMWARE("nouveau/nv92.ctxprog"); -MODULE_FIRMWARE("nouveau/nv92.ctxvals"); -MODULE_FIRMWARE("nouveau/nv94.ctxprog"); -MODULE_FIRMWARE("nouveau/nv94.ctxvals"); -MODULE_FIRMWARE("nouveau/nv96.ctxprog"); -MODULE_FIRMWARE("nouveau/nv96.ctxvals"); -MODULE_FIRMWARE("nouveau/nv98.ctxprog"); -MODULE_FIRMWARE("nouveau/nv98.ctxvals"); -MODULE_FIRMWARE("nouveau/nva0.ctxprog"); -MODULE_FIRMWARE("nouveau/nva0.ctxvals"); -MODULE_FIRMWARE("nouveau/nva5.ctxprog"); -MODULE_FIRMWARE("nouveau/nva5.ctxvals"); -MODULE_FIRMWARE("nouveau/nva8.ctxprog"); -MODULE_FIRMWARE("nouveau/nva8.ctxvals"); -MODULE_FIRMWARE("nouveau/nvaa.ctxprog"); -MODULE_FIRMWARE("nouveau/nvaa.ctxvals"); -MODULE_FIRMWARE("nouveau/nvac.ctxprog"); -MODULE_FIRMWARE("nouveau/nvac.ctxvals"); +MODULE_FIRMWARE("nouveau/nv50_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv50_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv84_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv84_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv86_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv86_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv92_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv92_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv94_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv94_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv96_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv96_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nv98_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nv98_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nva0_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nva0_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nva5_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nva5_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nva8_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nva8_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nvaa_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nvaa_ctxvals.bin"); +MODULE_FIRMWARE("nouveau/nvac_ctxprog.bin"); +MODULE_FIRMWARE("nouveau/nvac_ctxvals.bin"); #define IS_G80 ((dev_priv->chipset & 0xf0) == 0x50) diff --git a/firmware/Makefile b/firmware/Makefile index 7766c96..fd0d5b0 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -62,18 +62,18 @@ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \ radeon/RV770_pfp.bin radeon/RV770_me.bin \ radeon/RV730_pfp.bin radeon/RV730_me.bin \ radeon/RV710_pfp.bin radeon/RV710_me.bin -fw-shipped-$(CONFIG_DRM_NOUVEAU) += nouveau/nv50.ctxprog nouveau/nv50.ctxvals \ - nouveau/nv84.ctxprog nouveau/nv84.ctxvals \ - nouveau/nv86.ctxprog nouveau/nv86.ctxvals \ - nouveau/nv92.ctxprog nouveau/nv92.ctxvals \ - nouveau/nv94.ctxprog nouveau/nv94.ctxvals \ - nouveau/nv96.ctxprog nouveau/nv96.ctxvals \ - nouveau/nv98.ctxprog nouveau/nv98.ctxvals \ - nouveau/nva0.ctxprog nouveau/nva0.ctxvals \ - nouveau/nva5.ctxprog nouveau/nva5.ctxvals \ - nouveau/nva8.ctxprog nouveau/nva8.ctxvals \ - nouveau/nvaa.ctxprog nouveau/nvaa.ctxvals \ - nouveau/nvac.ctxprog nouveau/nvac.ctxvals +fw-shipped-$(CONFIG_DRM_NOUVEAU) += nouveau/nv50_ctxprog.bin nouveau/nv50_ctxvals.bin \ + nouveau/nv84_ctxprog.bin nouveau/nv84_ctxvals.bin \ + nouveau/nv86_ctxprog.bin nouveau/nv86_ctxvals.bin \ + nouveau/nv92_ctxprog.bin nouveau/nv92_ctxvals.bin \ + nouveau/nv94_ctxprog.bin nouveau/nv94_ctxvals.bin \ + nouveau/nv96_ctxprog.bin nouveau/nv96_ctxvals.bin \ + nouveau/nv98_ctxprog.bin nouveau/nv98_ctxvals.bin \ + nouveau/nva0_ctxprog.bin nouveau/nva0_ctxvals.bin \ + nouveau/nva5_ctxprog.bin nouveau/nva5_ctxvals.bin \ + nouveau/nva8_ctxprog.bin nouveau/nva8_ctxvals.bin \ + nouveau/nvaa_ctxprog.bin nouveau/nvaa_ctxvals.bin \ + nouveau/nvac_ctxprog.bin nouveau/nvac_ctxvals.bin fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ diff --git a/firmware/nouveau/nv50.ctxprog.ihex b/firmware/nouveau/nv50_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv50.ctxprog.ihex rename to firmware/nouveau/nv50_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv50.ctxvals.ihex b/firmware/nouveau/nv50_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv50.ctxvals.ihex rename to firmware/nouveau/nv50_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv84.ctxprog.ihex b/firmware/nouveau/nv84_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv84.ctxprog.ihex rename to firmware/nouveau/nv84_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv84.ctxvals.ihex b/firmware/nouveau/nv84_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv84.ctxvals.ihex rename to firmware/nouveau/nv84_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv86.ctxprog.ihex b/firmware/nouveau/nv86_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv86.ctxprog.ihex rename to firmware/nouveau/nv86_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv86.ctxvals.ihex b/firmware/nouveau/nv86_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv86.ctxvals.ihex rename to firmware/nouveau/nv86_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv92.ctxprog.ihex b/firmware/nouveau/nv92_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv92.ctxprog.ihex rename to firmware/nouveau/nv92_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv92.ctxvals.ihex b/firmware/nouveau/nv92_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv92.ctxvals.ihex rename to firmware/nouveau/nv92_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv94.ctxprog.ihex b/firmware/nouveau/nv94_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv94.ctxprog.ihex rename to firmware/nouveau/nv94_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv94.ctxvals.ihex b/firmware/nouveau/nv94_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv94.ctxvals.ihex rename to firmware/nouveau/nv94_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv96.ctxprog.ihex b/firmware/nouveau/nv96_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv96.ctxprog.ihex rename to firmware/nouveau/nv96_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv96.ctxvals.ihex b/firmware/nouveau/nv96_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv96.ctxvals.ihex rename to firmware/nouveau/nv96_ctxvals.bin.ihex diff --git a/firmware/nouveau/nv98.ctxprog.ihex b/firmware/nouveau/nv98_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nv98.ctxprog.ihex rename to firmware/nouveau/nv98_ctxprog.bin.ihex diff --git a/firmware/nouveau/nv98.ctxvals.ihex b/firmware/nouveau/nv98_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nv98.ctxvals.ihex rename to firmware/nouveau/nv98_ctxvals.bin.ihex diff --git a/firmware/nouveau/nva0.ctxprog.ihex b/firmware/nouveau/nva0_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nva0.ctxprog.ihex rename to firmware/nouveau/nva0_ctxprog.bin.ihex diff --git a/firmware/nouveau/nva0.ctxvals.ihex b/firmware/nouveau/nva0_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nva0.ctxvals.ihex rename to firmware/nouveau/nva0_ctxvals.bin.ihex diff --git a/firmware/nouveau/nva5.ctxprog.ihex b/firmware/nouveau/nva5_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nva5.ctxprog.ihex rename to firmware/nouveau/nva5_ctxprog.bin.ihex diff --git a/firmware/nouveau/nva5.ctxvals.ihex b/firmware/nouveau/nva5_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nva5.ctxvals.ihex rename to firmware/nouveau/nva5_ctxvals.bin.ihex diff --git a/firmware/nouveau/nva8.ctxprog.ihex b/firmware/nouveau/nva8_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nva8.ctxprog.ihex rename to firmware/nouveau/nva8_ctxprog.bin.ihex diff --git a/firmware/nouveau/nva8.ctxvals.ihex b/firmware/nouveau/nva8_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nva8.ctxvals.ihex rename to firmware/nouveau/nva8_ctxvals.bin.ihex diff --git a/firmware/nouveau/nvaa.ctxprog.ihex b/firmware/nouveau/nvaa_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nvaa.ctxprog.ihex rename to firmware/nouveau/nvaa_ctxprog.bin.ihex diff --git a/firmware/nouveau/nvaa.ctxvals.ihex b/firmware/nouveau/nvaa_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nvaa.ctxvals.ihex rename to firmware/nouveau/nvaa_ctxvals.bin.ihex diff --git a/firmware/nouveau/nvac.ctxprog.ihex b/firmware/nouveau/nvac_ctxprog.bin.ihex similarity index 100% rename from firmware/nouveau/nvac.ctxprog.ihex rename to firmware/nouveau/nvac_ctxprog.bin.ihex diff --git a/firmware/nouveau/nvac.ctxvals.ihex b/firmware/nouveau/nvac_ctxvals.bin.ihex similarity index 100% rename from firmware/nouveau/nvac.ctxvals.ihex rename to firmware/nouveau/nvac_ctxvals.bin.ihex -- 1.6.6
From f6bb2602952e4cf6db2a223c5cb4bdad28374f43 Mon Sep 17 00:00:00 2001 From: Xavier Chantry <[email protected]> Date: Sat, 9 Jan 2010 17:57:15 +0100 Subject: [PATCH] Add ctxprog and ctxvals extensions to .gitignore Signed-off-by: Xavier Chantry <[email protected]> --- firmware/.gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/firmware/.gitignore b/firmware/.gitignore index d9c6901..653d813 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -3,4 +3,6 @@ *.bin *.csp *.dsp +*.ctxprog +*.ctxvals ihex2fw -- 1.6.6
_______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
