From 5922cb6f0bfdef918cadfd8c116bb9c1b8fdf627 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 11 Dec 2013 07:16:48 +0000
Subject: [PATCH] [hppa] Update flavours and configuration, thanks to Helge
 Deller (Closes: #721191)

svn path=/dists/sid/linux/; revision=20880
---
 debian/changelog                       |  9 +++++++++
 debian/config/hppa/config              |  4 ++--
 debian/config/hppa/config.parisc64-smp | 22 ++++++++++++++++++++++
 debian/config/hppa/defines             | 21 ++++-----------------
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52c6ead42..7b90e3ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,15 @@ linux (3.12.4-1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * udeb: Add ohci-pci to usb-modules (Closes: #730789)
   * cifs: Enable CIFS_SMB2
+  * [hppa] Update flavours and configuration, thanks to Helge Deller
+    (Closes: #721191)
+    - Remove parisc-smp and parisc64 (UP) flavours
+    - Build with gcc-4.8
+    - rtc: Enable HP_SDC_RTC as module
+    - megaraid: Enable MEGARAID_NEWGEN
+    - [/parisc64-smp] Enable MLONGCALLS, DISCONTIGMEM_MANUAL
+    - [/parisc64-smp] Enable PATA_SIL680, AGP, AGP_PARISC, DRM,
+      DRM_RADEON as modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 11 Dec 2013 06:04:49 +0000
 
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index c65bc2cf9..733b78fca 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -126,7 +126,7 @@ CONFIG_KEYBOARD_HIL=m
 ##
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_UINPUT is not set
-CONFIG_HP_SDC_RTC=m
+# CONFIG_HP_SDC_RTC=m
 
 ##
 ## file: drivers/input/mouse/Kconfig
@@ -470,7 +470,7 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20
 ##
 ## file: drivers/scsi/megaraid/Kconfig.megaraid
 ##
-# CONFIG_MEGARAID_NEWGEN is not set
+CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index 143936d6c..a1a6fbc18 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -8,11 +8,33 @@ CONFIG_PA8X00=y
 CONFIG_64BIT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
+CONFIG_MLONGCALLS=y
+
+##
+## file: drivers/ata/Kconfig
+##
+CONFIG_PATA_SIL680=m
+
+##
+## file: drivers/char/agp/Kconfig
+##
+#. for ATI FireGL DRM in C8000 workstation
+CONFIG_AGP=m
+CONFIG_AGP_PARISC=m
+
+##
+## file: drivers/gpu/drm/Kconfig
+##
+#. for ATI FireGL DRM in C8000 workstation
+CONFIG_DRM=m
+CONFIG_DRM_RADEON=m
 
 ##
 ## file: mm/Kconfig
 ##
 ## choice: Memory model
 # CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
 
diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines
index cdc7818f6..1fe6be855 100644
--- a/debian/config/hppa/defines
+++ b/debian/config/hppa/defines
@@ -1,27 +1,13 @@
 [base]
-flavours:
- parisc
- parisc-smp
- parisc64
- parisc64-smp
+flavours: parisc parisc64-smp
 kernel-arch: parisc
-compiler: gcc-4.4
 
 [image]
 suggests: palo
 
 [parisc_description]
 hardware: 32-bit PA-RISC
-
-[parisc-smp_description]
-hardware: multiprocessor 32-bit PA-RISC
-
-[parisc64_base]
-cflags: -fno-cse-follow-jumps
-override-host-type: hppa64-linux-gnu
-
-[parisc64_description]
-hardware: 64-bit PA-RISC
+hardware-long: HP PA-RISC 32-bit systems with max 4 GB RAM
 
 [parisc64-smp_base]
 cflags: -fno-cse-follow-jumps
@@ -29,7 +15,8 @@ override-host-type: hppa64-linux-gnu
 
 [parisc64-smp_description]
 hardware: multiprocessor 64-bit PA-RISC
+hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM
 
 [relations]
-gcc-4.4: gcc-4.4, binutils-hppa64, gcc-4.4-hppa64
+gcc-4.8: gcc-4.8, binutils-hppa64, gcc-4.8-hppa64