aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-04-04 14:48:10 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-04-04 14:48:10 -0700
commit390a4bf409a4574fe3272adf9f873ef78b78c167 (patch)
treec02cd9e41b83e301d4abc02093cb159ede3b8ae5 /memdisk
parent74ccc02fadda3d31b6ecc2a6ff68df037f9a62cb (diff)
downloadsyslinux.git-390a4bf409a4574fe3272adf9f873ef78b78c167.tar.gz
syslinux.git-390a4bf409a4574fe3272adf9f873ef78b78c167.tar.xz
syslinux.git-390a4bf409a4574fe3272adf9f873ef78b78c167.zip
Update copyright notices; add Intel notices where appropriate
Update copyright notices. Per agreement with my new employer, Intel Corporation, add Intel copyright notices where appropriate. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile3
-rw-r--r--memdisk/memdisk.inc1
-rw-r--r--memdisk/memdisk.ld12
-rw-r--r--memdisk/setup.c1
-rw-r--r--memdisk/start32.S21
5 files changed, 33 insertions, 5 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index d9c16206..7b557e11 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -1,6 +1,7 @@
## -----------------------------------------------------------------------
##
-## Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
+## Copyright 2001-2009 H. Peter Anvin - All Rights Reserved
+## Copyright 2009 Intel Corporation; author: H. Peter Anvin
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
diff --git a/memdisk/memdisk.inc b/memdisk/memdisk.inc
index d53b7781..27e9fdb1 100644
--- a/memdisk/memdisk.inc
+++ b/memdisk/memdisk.inc
@@ -7,6 +7,7 @@
; memory.
;
; Copyright 2001-2009 H. Peter Anvin - All Rights Reserved
+; Copyright 2009 Intel Corporation; author: H. Peter Anvin
;
; This program is free software; you can redistribute it and/or modify
; it under the terms of the GNU General Public License as published by
diff --git a/memdisk/memdisk.ld b/memdisk/memdisk.ld
index 5b833c2a..747270fb 100644
--- a/memdisk/memdisk.ld
+++ b/memdisk/memdisk.ld
@@ -1,3 +1,15 @@
+## -----------------------------------------------------------------------
+##
+## Copyright 2009 Intel Corporation; author: H. Peter Anvin
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+## Boston MA 02110-1301, USA; either version 2 of the License, or
+## (at your option) any later version; incorporated herein by reference.
+##
+## -----------------------------------------------------------------------
+
/*
* Linker script for MEMDISK
*/
diff --git a/memdisk/setup.c b/memdisk/setup.c
index 8765fd71..0fee9820 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -1,6 +1,7 @@
/* ----------------------------------------------------------------------- *
*
* Copyright 2001-2009 H. Peter Anvin - All Rights Reserved
+ * Copyright 2009 Intel Corporation; author: H. Peter Anvin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/memdisk/start32.S b/memdisk/start32.S
index 073d049c..6c88d462 100644
--- a/memdisk/start32.S
+++ b/memdisk/start32.S
@@ -1,7 +1,20 @@
-#
-# Simple stub to get us to the right point in the 32-bit code;
-# this module must be linked first
-#
+/* -----------------------------------------------------------------------
+ *
+ * Copyright 2003-2009 H. Peter Anvin - All Rights Reserved
+ * Copyright 2009 Intel Corporation; author: H. Peter Anvin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston MA 02110-1301, USA; either version 2 of the License, or
+ * (at your option) any later version; incorporated herein by reference.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * Simple stub to get us to the right point in the 32-bit code;
+ * this module must be linked first
+ */
.section ".init", "ax"
.globl _start
_start: