From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/fbset
Date: Thu, 24 Apr 2008 02:03:23 -0700 (PDT) [thread overview]
Message-ID: <20080424090323.3A4B23C7E0@busybox.net> (raw)
Author: jacmet
Date: 2008-04-24 02:03:22 -0700 (Thu, 24 Apr 2008)
New Revision: 21823
Log:
fbset: use .patch.$ARCH naming convention
Added:
trunk/buildroot/package/fbset/fbset-2.1-support.patch.avr32
Removed:
trunk/buildroot/package/fbset/fbset-2.1-avr32.patch
Modified:
trunk/buildroot/package/fbset/fbset.mk
Changeset:
Deleted: trunk/buildroot/package/fbset/fbset-2.1-avr32.patch
===================================================================
--- trunk/buildroot/package/fbset/fbset-2.1-avr32.patch 2008-04-24 09:03:19 UTC (rev 21822)
+++ trunk/buildroot/package/fbset/fbset-2.1-avr32.patch 2008-04-24 09:03:22 UTC (rev 21823)
@@ -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 <value> : vertical sync polarity (low or high)\n"
- " -csync <value> : composite sync polarity (low or high)\n"
- " -gsync <value> : synch on green (false or true)\n"
-+ " -pclk <value> : pclk edge on which pixeldata is valid (rising or falling)\n"
- " -extsync <value> : external sync enable (false or true)\n"
- " -bcast <value> : broadcast enable (false or true)\n"
- " -laced <value> : 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;
Copied: trunk/buildroot/package/fbset/fbset-2.1-support.patch.avr32 (from rev 21822, trunk/buildroot/package/fbset/fbset-2.1-avr32.patch)
===================================================================
--- trunk/buildroot/package/fbset/fbset-2.1-support.patch.avr32 (rev 0)
+++ trunk/buildroot/package/fbset/fbset-2.1-support.patch.avr32 2008-04-24 09:03:22 UTC (rev 21823)
@@ -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 <value> : vertical sync polarity (low or high)\n"
+ " -csync <value> : composite sync polarity (low or high)\n"
+ " -gsync <value> : synch on green (false or true)\n"
++ " -pclk <value> : pclk edge on which pixeldata is valid (rising or falling)\n"
+ " -extsync <value> : external sync enable (false or true)\n"
+ " -bcast <value> : broadcast enable (false or true)\n"
+ " -laced <value> : 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;
Modified: trunk/buildroot/package/fbset/fbset.mk
===================================================================
--- trunk/buildroot/package/fbset/fbset.mk 2008-04-24 09:03:19 UTC (rev 21822)
+++ trunk/buildroot/package/fbset/fbset.mk 2008-04-24 09:03:22 UTC (rev 21823)
@@ -16,7 +16,9 @@
$(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
next reply other threads:[~2008-04-24 9:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-24 9:03 jacmet at uclibc.org [this message]
2008-04-24 10:24 ` [Buildroot] svn commit: trunk/buildroot/package/fbset Hans-Christian Egtvedt
2008-04-24 10:36 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2008-05-22 21:37 ulf at uclibc.org
2008-04-24 10:35 jacmet at uclibc.org
2008-04-24 10:36 ` Hans-Christian Egtvedt
2007-09-23 12:09 ulf at uclibc.org
2007-07-23 12:33 ulf at uclibc.org
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080424090323.3A4B23C7E0@busybox.net \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox