From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
David Howells <dhowells@redhat.com>
Subject: [PATCH 10/16] m68k/UAPI: Move Amiga model/chipset definitions to <asm/bootinfo-amiga.h>
Date: Wed, 16 Oct 2013 14:31:27 +0200 [thread overview]
Message-ID: <1381926693-6392-11-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1381926693-6392-1-git-send-email-geert@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
---
arch/m68k/include/asm/amigahw.h | 26 +---------------------
arch/m68k/include/uapi/asm/bootinfo-amiga.h | 32 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/arch/m68k/include/asm/amigahw.h b/arch/m68k/include/asm/amigahw.h
index 3bef0b2ad945..5ad568110f17 100644
--- a/arch/m68k/include/asm/amigahw.h
+++ b/arch/m68k/include/asm/amigahw.h
@@ -18,26 +18,7 @@
#include <linux/ioport.h>
- /*
- * Different Amiga models
- */
-
-#define AMI_UNKNOWN (0)
-#define AMI_500 (1)
-#define AMI_500PLUS (2)
-#define AMI_600 (3)
-#define AMI_1000 (4)
-#define AMI_1200 (5)
-#define AMI_2000 (6)
-#define AMI_2500 (7)
-#define AMI_3000 (8)
-#define AMI_3000T (9)
-#define AMI_3000PLUS (10)
-#define AMI_4000 (11)
-#define AMI_4000T (12)
-#define AMI_CDTV (13)
-#define AMI_CD32 (14)
-#define AMI_DRACO (15)
+#include <asm/bootinfo-amiga.h>
/*
@@ -46,11 +27,6 @@
extern unsigned long amiga_chipset;
-#define CS_STONEAGE (0)
-#define CS_OCS (1)
-#define CS_ECS (2)
-#define CS_AGA (3)
-
/*
* Miscellaneous
diff --git a/arch/m68k/include/uapi/asm/bootinfo-amiga.h b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
index 2c32d671f232..28b6da07874a 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-amiga.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
@@ -22,6 +22,38 @@
/*
+ * Amiga models (BI_AMIGA_MODEL)
+ */
+
+#define AMI_UNKNOWN 0
+#define AMI_500 1
+#define AMI_500PLUS 2
+#define AMI_600 3
+#define AMI_1000 4
+#define AMI_1200 5
+#define AMI_2000 6
+#define AMI_2500 7
+#define AMI_3000 8
+#define AMI_3000T 9
+#define AMI_3000PLUS 10
+#define AMI_4000 11
+#define AMI_4000T 12
+#define AMI_CDTV 13
+#define AMI_CD32 14
+#define AMI_DRACO 15
+
+
+ /*
+ * Amiga chipsets (BI_AMIGA_CHIPSET)
+ */
+
+#define CS_STONEAGE 0
+#define CS_OCS 1
+#define CS_ECS 2
+#define CS_AGA 3
+
+
+ /*
* Latest Amiga bootinfo version
*/
--
1.7.9.5
next prev parent reply other threads:[~2013-10-16 12:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 12:31 [PATCH 00/16] m68k bootinfo updates Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 01/16] block/z2ram: Remove duplicate external declarations Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 02/16] m68k: The bootinfo is located right after the kernel Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 03/16] m68k: head.S - Correct date and spelling Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 04/16] m68k: Drop remainings and API of BOOTINFO_COMPAT_1_0 Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 05/16] m68k/mac: Move struct mac_booter_data to <asm/macintosh.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 06/16] m68k/mac: Remove unused hardware profile tags Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 07/16] m68k/vme: Remove unused mvme_bdid_ptr Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 08/16] m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.h Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 09/16] m68k/UAPI: Move generic definitions to <asm/bootinfo.h> Geert Uytterhoeven
2013-10-16 12:31 ` Geert Uytterhoeven [this message]
2013-10-16 12:31 ` [PATCH 11/16] m68k/UAPI: Move Apollo model definitions to <asm/bootinfo-apollo.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 12/16] m68k/UAPI: Move HP300 model definitions to <asm/bootinfo-hp300.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 13/16] m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 14/16] m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 15/16] m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h> Geert Uytterhoeven
2013-10-16 12:31 ` [PATCH 16/16] m68k: Remove superfluous inclusions of <asm/bootinfo.h> Geert Uytterhoeven
[not found] ` <1381926693-6392-7-git-send-email-geert@linux-m68k.org>
2013-10-20 12:14 ` [PATCH 06/16] m68k/mac: Remove unused hardware profile tags Geert Uytterhoeven
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=1381926693-6392-11-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
/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