From 167ada823b716f046069030f2b71cee7b4b8a9de Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 24 Apr 2008 09:03:22 +0000 Subject: fbset: use .patch.$ARCH naming convention --- package/fbset/fbset-2.1-avr32.patch | 108 ---------------------------- package/fbset/fbset-2.1-support.patch.avr32 | 108 ++++++++++++++++++++++++++++ package/fbset/fbset.mk | 4 +- 3 files changed, 111 insertions(+), 109 deletions(-) delete mode 100644 package/fbset/fbset-2.1-avr32.patch create mode 100644 package/fbset/fbset-2.1-support.patch.avr32 (limited to 'package/fbset') diff --git a/package/fbset/fbset-2.1-avr32.patch b/package/fbset/fbset-2.1-avr32.patch deleted file mode 100644 index 359513901..000000000 --- a/package/fbset/fbset-2.1-avr32.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -ru fbset-2.1/fb.h fbset-2.1-avr32/fb.h ---- fbset-2.1/fb.h 1999-06-23 16:09:48.000000000 +0200 -+++ fbset-2.1-avr32/fb.h 2005-12-09 16:00:07.000000000 +0100 -@@ -131,6 +131,7 @@ - /* vtotal = 144d/288n/576i => PAL */ - /* vtotal = 121d/242n/484i => NTSC */ - #define FB_SYNC_ON_GREEN 32 /* sync on green */ -+#define FB_SYNC_PCLK_RISING 64 /* pixel data sampled on rising pclk */ - - #define FB_VMODE_NONINTERLACED 0 /* non interlaced */ - #define FB_VMODE_INTERLACED 1 /* interlaced */ -diff -ru fbset-2.1/fbset.c fbset-2.1-avr32/fbset.c ---- fbset-2.1/fbset.c 1999-06-23 16:11:46.000000000 +0200 -+++ fbset-2.1-avr32/fbset.c 2005-12-09 16:04:53.000000000 +0100 -@@ -85,6 +85,7 @@ - static const char *Opt_vsync = NULL; - static const char *Opt_csync = NULL; - static const char *Opt_gsync = NULL; -+static const char *Opt_pclk = NULL; - static const char *Opt_extsync = NULL; - static const char *Opt_bcast = NULL; - static const char *Opt_laced = NULL; -@@ -122,6 +123,7 @@ - { "-vsync", &Opt_vsync, 1 }, - { "-csync", &Opt_csync, 1 }, - { "-gsync", &Opt_gsync, 1 }, -+ { "-pclk", &Opt_pclk, 1 }, - { "-extsync", &Opt_extsync, 1 }, - { "-bcast", &Opt_bcast, 1 }, - { "-laced", &Opt_laced, 1 }, -@@ -344,6 +346,8 @@ - var->sync |= FB_SYNC_COMP_HIGH_ACT; - if (vmode->gsync == HIGH) - var->sync |= FB_SYNC_ON_GREEN; -+ if (vmode->pclk == RISING) -+ var->sync |= FB_SYNC_PCLK_RISING; - if (vmode->extsync == TRUE) - var->sync |= FB_SYNC_EXT; - if (vmode->bcast == TRUE) -@@ -389,6 +393,7 @@ - vmode->vsync = var->sync & FB_SYNC_VERT_HIGH_ACT ? HIGH : LOW; - vmode->csync = var->sync & FB_SYNC_COMP_HIGH_ACT ? HIGH : LOW; - vmode->gsync = var->sync & FB_SYNC_ON_GREEN ? TRUE : FALSE; -+ vmode->pclk = var->sync & FB_SYNC_PCLK_RISING ? RISING : FALLING; - vmode->extsync = var->sync & FB_SYNC_EXT ? TRUE : FALSE; - vmode->bcast = var->sync & FB_SYNC_BROADCAST ? TRUE : FALSE; - vmode->grayscale = var->grayscale; -@@ -420,11 +425,11 @@ - - if (!strcasecmp(var, "false") || !strcasecmp(var, "low") || - !strcasecmp(var, "no") || !strcasecmp(var, "off") || -- !strcmp(var, "0")) -+ !strcmp(var, "0") || !strcasecmp(var, "falling")) - value = 0; - else if (!strcasecmp(var, "true") || !strcasecmp(var, "high") || - !strcasecmp(var, "yes") || !strcasecmp(var, "on") || -- !strcmp(var, "1")) -+ !strcmp(var, "1") || !strcasecmp(var, "rising")) - value = 1; - else - Die("Invalid value `%s'\n", var); -@@ -559,6 +564,8 @@ - vmode->csync = atoboolean(Opt_csync); - if (Opt_gsync) - vmode->gsync = atoboolean(Opt_gsync); -+ if (Opt_pclk) -+ vmode->pclk = atoboolean(Opt_pclk); - if (Opt_extsync) - vmode->extsync = atoboolean(Opt_extsync); - if (Opt_bcast) -@@ -635,6 +642,8 @@ - puts(" csync high"); - if (vmode->gsync) - puts(" gsync true"); -+ if (vmode->pclk) -+ puts(" pclk rising"); - if (vmode->extsync) - puts(" extsync true"); - if (vmode->bcast) -@@ -875,6 +884,7 @@ - " -vsync : vertical sync polarity (low or high)\n" - " -csync : composite sync polarity (low or high)\n" - " -gsync : synch on green (false or true)\n" -+ " -pclk : pclk edge on which pixeldata is valid (rising or falling)\n" - " -extsync : external sync enable (false or true)\n" - " -bcast : broadcast enable (false or true)\n" - " -laced : interlace enable (false or true)\n" -diff -ru fbset-2.1/fbset.h fbset-2.1-avr32/fbset.h ---- fbset-2.1/fbset.h 1999-06-23 16:12:28.000000000 +0200 -+++ fbset-2.1-avr32/fbset.h 2005-12-09 16:05:25.000000000 +0100 -@@ -26,6 +26,9 @@ - #define LOW (0) - #define HIGH (1) - -+#define FALLING (0) -+#define RISING (1) -+ - #define FALSE (0) - #define TRUE (1) - -@@ -59,6 +62,7 @@ - unsigned vsync : 1; - unsigned csync : 1; - unsigned gsync : 1; -+ unsigned pclk : 1; - unsigned extsync : 1; - unsigned bcast : 1; - unsigned laced : 1; diff --git a/package/fbset/fbset-2.1-support.patch.avr32 b/package/fbset/fbset-2.1-support.patch.avr32 new file mode 100644 index 000000000..359513901 --- /dev/null +++ b/package/fbset/fbset-2.1-support.patch.avr32 @@ -0,0 +1,108 @@ +diff -ru fbset-2.1/fb.h fbset-2.1-avr32/fb.h +--- fbset-2.1/fb.h 1999-06-23 16:09:48.000000000 +0200 ++++ fbset-2.1-avr32/fb.h 2005-12-09 16:00:07.000000000 +0100 +@@ -131,6 +131,7 @@ + /* vtotal = 144d/288n/576i => PAL */ + /* vtotal = 121d/242n/484i => NTSC */ + #define FB_SYNC_ON_GREEN 32 /* sync on green */ ++#define FB_SYNC_PCLK_RISING 64 /* pixel data sampled on rising pclk */ + + #define FB_VMODE_NONINTERLACED 0 /* non interlaced */ + #define FB_VMODE_INTERLACED 1 /* interlaced */ +diff -ru fbset-2.1/fbset.c fbset-2.1-avr32/fbset.c +--- fbset-2.1/fbset.c 1999-06-23 16:11:46.000000000 +0200 ++++ fbset-2.1-avr32/fbset.c 2005-12-09 16:04:53.000000000 +0100 +@@ -85,6 +85,7 @@ + static const char *Opt_vsync = NULL; + static const char *Opt_csync = NULL; + static const char *Opt_gsync = NULL; ++static const char *Opt_pclk = NULL; + static const char *Opt_extsync = NULL; + static const char *Opt_bcast = NULL; + static const char *Opt_laced = NULL; +@@ -122,6 +123,7 @@ + { "-vsync", &Opt_vsync, 1 }, + { "-csync", &Opt_csync, 1 }, + { "-gsync", &Opt_gsync, 1 }, ++ { "-pclk", &Opt_pclk, 1 }, + { "-extsync", &Opt_extsync, 1 }, + { "-bcast", &Opt_bcast, 1 }, + { "-laced", &Opt_laced, 1 }, +@@ -344,6 +346,8 @@ + var->sync |= FB_SYNC_COMP_HIGH_ACT; + if (vmode->gsync == HIGH) + var->sync |= FB_SYNC_ON_GREEN; ++ if (vmode->pclk == RISING) ++ var->sync |= FB_SYNC_PCLK_RISING; + if (vmode->extsync == TRUE) + var->sync |= FB_SYNC_EXT; + if (vmode->bcast == TRUE) +@@ -389,6 +393,7 @@ + vmode->vsync = var->sync & FB_SYNC_VERT_HIGH_ACT ? HIGH : LOW; + vmode->csync = var->sync & FB_SYNC_COMP_HIGH_ACT ? HIGH : LOW; + vmode->gsync = var->sync & FB_SYNC_ON_GREEN ? TRUE : FALSE; ++ vmode->pclk = var->sync & FB_SYNC_PCLK_RISING ? RISING : FALLING; + vmode->extsync = var->sync & FB_SYNC_EXT ? TRUE : FALSE; + vmode->bcast = var->sync & FB_SYNC_BROADCAST ? TRUE : FALSE; + vmode->grayscale = var->grayscale; +@@ -420,11 +425,11 @@ + + if (!strcasecmp(var, "false") || !strcasecmp(var, "low") || + !strcasecmp(var, "no") || !strcasecmp(var, "off") || +- !strcmp(var, "0")) ++ !strcmp(var, "0") || !strcasecmp(var, "falling")) + value = 0; + else if (!strcasecmp(var, "true") || !strcasecmp(var, "high") || + !strcasecmp(var, "yes") || !strcasecmp(var, "on") || +- !strcmp(var, "1")) ++ !strcmp(var, "1") || !strcasecmp(var, "rising")) + value = 1; + else + Die("Invalid value `%s'\n", var); +@@ -559,6 +564,8 @@ + vmode->csync = atoboolean(Opt_csync); + if (Opt_gsync) + vmode->gsync = atoboolean(Opt_gsync); ++ if (Opt_pclk) ++ vmode->pclk = atoboolean(Opt_pclk); + if (Opt_extsync) + vmode->extsync = atoboolean(Opt_extsync); + if (Opt_bcast) +@@ -635,6 +642,8 @@ + puts(" csync high"); + if (vmode->gsync) + puts(" gsync true"); ++ if (vmode->pclk) ++ puts(" pclk rising"); + if (vmode->extsync) + puts(" extsync true"); + if (vmode->bcast) +@@ -875,6 +884,7 @@ + " -vsync : vertical sync polarity (low or high)\n" + " -csync : composite sync polarity (low or high)\n" + " -gsync : synch on green (false or true)\n" ++ " -pclk : pclk edge on which pixeldata is valid (rising or falling)\n" + " -extsync : external sync enable (false or true)\n" + " -bcast : broadcast enable (false or true)\n" + " -laced : interlace enable (false or true)\n" +diff -ru fbset-2.1/fbset.h fbset-2.1-avr32/fbset.h +--- fbset-2.1/fbset.h 1999-06-23 16:12:28.000000000 +0200 ++++ fbset-2.1-avr32/fbset.h 2005-12-09 16:05:25.000000000 +0100 +@@ -26,6 +26,9 @@ + #define LOW (0) + #define HIGH (1) + ++#define FALLING (0) ++#define RISING (1) ++ + #define FALSE (0) + #define TRUE (1) + +@@ -59,6 +62,7 @@ + unsigned vsync : 1; + unsigned csync : 1; + unsigned gsync : 1; ++ unsigned pclk : 1; + unsigned extsync : 1; + unsigned bcast : 1; + unsigned laced : 1; diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 5e681c98e..48eadf9d0 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -16,7 +16,9 @@ $(DL_DIR)/$(FBSET_SOURCE): $(FBSET_DIR)/.unpacked: $(DL_DIR)/$(FBSET_SOURCE) $(FBSET_CAT) $(DL_DIR)/$(FBSET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(FBSET_DIR) package/fbset/ fbset-$(FBSET_VERSION)\*.patch\* + toolchain/patch-kernel.sh $(FBSET_DIR) package/fbset/ \ + fbset-$(FBSET_VERSION)\*.patch \ + fbset-$(FBSET_VERSION)\*.patch.$(ARCH) touch $@ $(FBSET_DIR)/$(FBSET_BINARY): $(FBSET_DIR)/.unpacked -- cgit v1.2.3