[Glibc-bsd-commits] r5422 - in trunk/kfreebsd-11/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Feb 8 15:37:11 UTC 2014
Author: rmh
Date: 2014-02-08 15:37:11 +0000 (Sat, 08 Feb 2014)
New Revision: 5422
Removed:
trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff
trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff
Modified:
trunk/kfreebsd-11/debian/changelog
trunk/kfreebsd-11/debian/patches/001_misc.diff
trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff
trunk/kfreebsd-11/debian/patches/series
trunk/kfreebsd-11/debian/patches/userland.diff
Log:
* New upstream snapshot.
- xboxfb_ftbfs.diff: Remove (merged).
- radeonkms_abort_nofw.diff: Remove (merged).
Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/changelog 2014-02-08 15:37:11 UTC (rev 5422)
@@ -1,12 +1,16 @@
-kfreebsd-11 (11.0~svn260666-2) UNRELEASED; urgency=low
+kfreebsd-11 (11.0~svn261628-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+ - xboxfb_ftbfs.diff: Remove (merged).
+ - radeonkms_abort_nofw.diff: Remove (merged).
+
* B-D on libdwarf-freebsd-3 >= 10.0-2 (older versions break ctfconvert
on i386-linux-gnu).
* radeonkms: Disable R600+ drivers when no firmware blob is available.
(Closes: #732692)
* Require freebsd-net-tools with new SIOCAIFADDR ABI. (Closes: #732693)
- -- Robert Millan <rmh at debian.org> Sun, 26 Jan 2014 17:46:34 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 08 Feb 2014 15:17:30 +0100
kfreebsd-11 (11.0~svn260666-1) experimental; urgency=low
Modified: trunk/kfreebsd-11/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/001_misc.diff 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/001_misc.diff 2014-02-08 15:37:11 UTC (rev 5422)
@@ -3,8 +3,9 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -1,5 +1,15 @@
- # $FreeBSD$
+@@ -3,6 +3,16 @@
+ # Compat
+ MK_FORMAT_EXTENSIONS?=no
+FREEBSD_CC!= ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
+
@@ -19,7 +20,7 @@
#
# Warning flags for compiling the kernel and components of the kernel:
#
-@@ -61,7 +71,7 @@
+@@ -64,7 +74,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
.if ${COMPILER_TYPE} != "clang"
Modified: trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2014-02-08 15:37:11 UTC (rev 5422)
@@ -1,6 +1,6 @@
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -397,7 +397,7 @@
+@@ -393,7 +393,7 @@
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,7 +9,7 @@
VNET_DEFINE(int, ip6_no_radr) = 0;
VNET_DEFINE(int, ip6_norbit_raif) = 0;
VNET_DEFINE(int, ip6_rfc6204w3) = 0;
-@@ -413,7 +413,7 @@
+@@ -409,7 +409,7 @@
VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
* walk list every 5 sec. */
VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
Deleted: trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/radeonkms_abort_nofw.diff 2014-02-08 15:37:11 UTC (rev 5422)
@@ -1,35 +0,0 @@
-
-This is an attempt at an equivalent, portable version of:
-
-http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/debian/patches/bugfix/all/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch?revision=20909&view=co
-
---- a/sys/dev/drm2/radeon/r600.c
-+++ b/sys/dev/drm2/radeon/r600.c
-@@ -3012,6 +3012,12 @@
- rdev->accel_working = false;
- }
-
-+ /* Don't start up if the ucode is missing. */
-+ if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
-+ DRM_ERROR("radeon: ucode required for R600+.\n");
-+ return -EINVAL;
-+ }
-+
- return 0;
- }
-
---- a/sys/dev/drm2/radeon/rv770.c
-+++ b/sys/dev/drm2/radeon/rv770.c
-@@ -1186,6 +1186,12 @@
- rdev->accel_working = false;
- }
-
-+ /* Don't start up if the ucode is missing. */
-+ if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
-+ DRM_ERROR("radeon: ucode required for R600+.\n");
-+ return -EINVAL;
-+ }
-+
- return 0;
- }
-
Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/series 2014-02-08 15:37:11 UTC (rev 5422)
@@ -1,8 +1,6 @@
# Patches from (or merged in) upstream
-xboxfb_ftbfs.diff
# Patches that are in good shape for merging upstream
-radeonkms_abort_nofw.diff
mount_remount.diff
ldscript_output_format.diff
unescaped_kern_ident.diff
Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/userland.diff 2014-02-08 15:37:11 UTC (rev 5422)
@@ -959,7 +959,7 @@
/*
* Definitions related to sockets: types, address families, options.
*/
-@@ -360,6 +362,10 @@
+@@ -370,6 +372,10 @@
#define PF_MAX AF_MAX
@@ -970,7 +970,7 @@
/*
* Definitions for network related sysctl, CTL_NET.
*
-@@ -388,6 +394,8 @@
+@@ -398,6 +404,8 @@
#endif /* __BSD_VISIBLE */
@@ -979,7 +979,7 @@
/*
* Maximum queue length specifiable by listen.
*/
-@@ -661,5 +669,6 @@
+@@ -687,5 +695,6 @@
#endif
Deleted: trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff 2014-02-08 15:10:29 UTC (rev 5421)
+++ trunk/kfreebsd-11/debian/patches/xboxfb_ftbfs.diff 2014-02-08 15:37:11 UTC (rev 5422)
@@ -1,250 +0,0 @@
-
-Patch from Aleksandr Rybalko
-
---- a/sys/dev/vt/hw/xboxfb/xboxfb.c
-+++ b/sys/dev/vt/hw/xboxfb/xboxfb.c
-@@ -1,12 +1,9 @@
- /*-
-- * Copyright (c) 2005 Rink Springer
-+ * Copyright (c) 2013 The FreeBSD Foundation
- * All rights reserved.
- *
-- * Copyright (c) 2009 The FreeBSD Foundation
-- * All rights reserved.
-- *
-- * Portions of this software were developed by Ed Schouten
-- * under sponsorship from the FreeBSD Foundation.
-+ * This software was developed by Aleksandr Rybalko under sponsorship from the
-+ * FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
-@@ -28,16 +25,23 @@
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-+ *
-+ * $FreeBSD$
- */
-
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
-
- #include <sys/param.h>
--#include <sys/kernel.h>
- #include <sys/systm.h>
-+#include <sys/kernel.h>
-+#include <sys/fbio.h>
-+
-+#include "opt_platform.h"
-
- #include <dev/vt/vt.h>
-+#include <dev/vt/hw/fb/vt_fb.h>
-+#include <dev/vt/colors/vt_termcolors.h>
-
- #include <vm/vm.h>
- #include <vm/pmap.h>
-@@ -47,110 +51,32 @@
- #include <machine/vmparam.h>
- #include <machine/xbox.h>
-
--struct xbox_softc {
-- bus_space_tag_t xbox_fb_tag;
-- bus_space_handle_t xbox_fb_handle;
--};
--
--/* Convenience macros. */
--#define MEM_WRITE4(sc, ofs, val) \
-- bus_space_write_4(sc->xbox_fb_tag, sc->xbox_fb_handle, ofs, val)
--
- #define VT_XBOX_WIDTH 640
- #define VT_XBOX_HEIGHT 480
-
--static vd_init_t xbox_init;
--static vd_blank_t xbox_blank;
--static vd_bitbltchr_t xbox_bitbltchr;
--
--static const struct vt_driver vt_xbox_driver = {
-- .vd_init = xbox_init,
-- .vd_blank = xbox_blank,
-- .vd_bitbltchr = xbox_bitbltchr,
-- .vd_priority = VD_PRIORITY_GENERIC+1,
--};
-+static vd_init_t xboxfb_init;
-
--static struct xbox_softc xbox_conssoftc;
--VT_CONSDEV_DECLARE(vt_xbox_driver, PIXEL_WIDTH(VT_XBOX_WIDTH),
-- PIXEL_HEIGHT(VT_XBOX_HEIGHT), &xbox_conssoftc);
--
--static const uint32_t colormap[] = {
-- 0x00000000, /* Black */
-- 0x00ff0000, /* Red */
-- 0x0000ff00, /* Green */
-- 0x00c0c000, /* Brown */
-- 0x000000ff, /* Blue */
-- 0x00c000c0, /* Magenta */
-- 0x0000c0c0, /* Cyan */
-- 0x00c0c0c0, /* Light grey */
-- 0x00808080, /* Dark grey */
-- 0x00ff8080, /* Light red */
-- 0x0080ff80, /* Light green */
-- 0x00ffff80, /* Yellow */
-- 0x008080ff, /* Light blue */
-- 0x00ff80ff, /* Light magenta */
-- 0x0080ffff, /* Light cyan */
-- 0x00ffffff, /* White */
-+static struct vt_driver xboxfb_driver = {
-+ .vd_init = xboxfb_init,
-+ .vd_blank = vt_fb_blank,
-+ .vd_bitbltchr = vt_fb_bitbltchr,
-+ .vd_priority = VD_PRIORITY_GENERIC,
- };
-
--static void
--xbox_blank(struct vt_device *vd, term_color_t color)
--{
-- struct xbox_softc *sc = vd->vd_softc;
-- u_int ofs;
-- uint32_t c;
--
-- c = colormap[color];
-- for (ofs = 0; ofs < (VT_XBOX_WIDTH * VT_XBOX_HEIGHT) * 4; ofs += 4)
-- MEM_WRITE4(sc, ofs, c);
--}
--
--static void
--xbox_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
-- int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
-- unsigned int height, term_color_t fg, term_color_t bg)
--{
-- struct xbox_softc *sc = vd->vd_softc;
-- u_long line;
-- uint32_t fgc, bgc;
-- int c;
-- uint8_t b, m;
--
-- fgc = colormap[fg];
-- bgc = colormap[bg];
--
-- /* Don't try to put off screen pixels */
-- if (((left + width) > info->fb_width) || ((top + height) >
-- info->fb_height))
-- return;
--
-- line = (VT_XBOX_WIDTH * top + left) * 4;
-- for (; height > 0; height--) {
-- for (c = 0; c < width; c++) {
-- if (c % 8 == 0)
-- b = *src++;
-- else
-- b <<= 1;
-- if (mask != NULL) {
-- if (c % 8 == 0)
-- m = *mask++;
-- else
-- m <<= 1;
-- /* Skip pixel write, if mask has no bit set. */
-- if ((m & 0x80) == 0)
-- continue;
-- }
-- MEM_WRITE4(sc, line + c * 4, b & 0x80 ? fgc : bgc);
-- }
-- line += VT_XBOX_WIDTH * 4;
-- }
--}
-+static struct fb_info xboxfb_info;
-+VT_CONSDEV_DECLARE(xboxfb_driver, PIXEL_WIDTH(VT_XBOX_WIDTH),
-+ PIXEL_HEIGHT(VT_XBOX_HEIGHT), &xboxfb_info);
-
--static void
--xbox_initialize(struct vt_device *vd)
-+static int
-+xboxfb_init(struct vt_device *vd)
- {
-+ struct fb_info *info;
- int i;
-
-+ if (!arch_i386_is_xbox)
-+ return (CN_DEAD);
-+
-+ info = &xboxfb_info;
- /*
- * We must make a mapping from video framebuffer memory
- * to real. This is very crude: we map the entire
-@@ -175,25 +101,27 @@
- *(uint32_t *)((i + 1) * PAGE_SIZE + XBOX_FB_START_PTR % PAGE_SIZE) =
- XBOX_FB_START;
-
-- /* Clear the screen. */
-- xbox_blank(vd, TC_BLACK);
--}
--
--static int
--xbox_init(struct vt_device *vd)
--{
-- struct xbox_softc *sc = vd->vd_softc;
--
-- if (!arch_i386_is_xbox)
-- return (CN_DEAD);
-+ /* Initialize fb_info. */
-+ info = vd->vd_softc;
-
-- sc->xbox_fb_tag = X86_BUS_SPACE_MEM;
-- sc->xbox_fb_handle = PAGE_SIZE;
-+ info->fb_width = VT_XBOX_WIDTH;
-+ info->fb_height = VT_XBOX_HEIGHT;
-
-- vd->vd_width = VT_XBOX_WIDTH;
-- vd->vd_height = VT_XBOX_HEIGHT;
-+ info->fb_size = XBOX_FB_SIZE;
-+ info->fb_stride = VT_XBOX_WIDTH * 4; /* 32bits per pixel. */
-
-- xbox_initialize(vd);
-+ info->fb_vbase = PAGE_SIZE;
-+ info->fb_pbase = XBOX_FB_START_PTR;
-+
-+ /* Get pixel storage size. */
-+ info->fb_bpp = 32;
-+ /* Get color depth. */
-+ info->fb_depth = 24;
-+
-+ vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB, 255, 0, 255,
-+ 8, 255, 16);
-+ fb_probe(info);
-+ vt_fb_init(vd);
-
- return (CN_INTERNAL);
- }
-@@ -201,12 +129,13 @@
- static void
- xbox_remap(void *unused)
- {
-+ struct fb_info *info;
-
- if (!arch_i386_is_xbox)
- return;
-
-- xbox_conssoftc.xbox_fb_handle =
-- (bus_space_handle_t)pmap_mapdev(XBOX_FB_START, XBOX_FB_SIZE);
-+ info = &xboxfb_info;
-+ info->fb_vbase = (intptr_t)pmap_mapdev(info->fb_pbase, info->fb_size);
- }
-
- SYSINIT(xboxfb, SI_SUB_DRIVERS, SI_ORDER_ANY, xbox_remap, NULL);
---- a/sys/i386/conf/XBOX
-+++ b/sys/i386/conf/XBOX
-@@ -11,9 +11,11 @@
- options DDB
-
- options XBOX # kernel is for XBOX
--device xboxfb # frame buffer support (REQUIRED!)
--device sc # syscons
--device fb
-+device vt_xboxfb # frame buffer support (REQUIRED!)
-+device vt
-+device fbd
-+#device sc # syscons
-+#device fb
-
- # no support yet for root device name fetching
- options ROOTDEVNAME=\"ufs:ada0s1a\"
More information about the Glibc-bsd-commits
mailing list