PPC32: Update config.in and Makefile in arch/ppc

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 39cce5a12ebceffd60d089057d6fee9008e65cc6..faa5cb0a6b47fab3c5c1ba8e1aacf23de17e80a5 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -22,9 +22,8 @@ endif
 LDFLAGS_vmlinux        = -Ttext $(KERNELLOAD) -Bstatic
 CPPFLAGS       := $(CPPFLAGS) -I$(TOPDIR)/arch/$(ARCH)
 AFLAGS         := $(AFLAGS) -I$(TOPDIR)/arch/$(ARCH)
-CFLAGS         := $(CFLAGS) -I$(TOPDIR)/arch/$(ARCH) -fsigned-char \
-               -msoft-float -pipe -ffixed-r2 -Wno-uninitialized \
-               -mmultiple -mstring
+CFLAGS         := $(CFLAGS) -I$(TOPDIR)/arch/$(ARCH) -msoft-float -pipe \
+               -ffixed-r2 -Wno-uninitialized -mmultiple -mstring
 CPP            = $(CC) -E $(CFLAGS)
 
 ifdef CONFIG_4xx
@@ -98,6 +97,8 @@ endif
 
 BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd pImage vmlinux.sm
 
+AFLAGS_vmlinux.lds.o   := -Upowerpc
+
 # All the instructions talk about "make bzImage".
 bzImage: zImage
 

diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 9a6c30eac5dbe0b5a9e37679850801f8aa97f4ba..254ba7a1ee4e5dc3c0e0d55b7b6be38551539184 100644 (file)
--- a/arch/ppc/config.in
+++ b/arch/ppc/config.in
@@ -5,7 +5,6 @@ define_bool CONFIG_UID16 n
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK n
 define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y
 define_bool CONFIG_HAVE_DEC_LOCK y
-define_bool CONFIG_GENERIC_ISA_DMA y
 
 mainmenu_name "Linux/PowerPC Kernel Configuration"
 
@@ -28,9 +27,13 @@ fi
 
 if [ "$CONFIG_6xx" = "y" ]; then
    bool 'MPC8260 CPM Support' CONFIG_8260
+   if [ "$CONFIG_8260" = "n" ]; then
+      define_bool CONFIG_GENERIC_ISA_DMA y
+   fi
 fi
 
 if [ "$CONFIG_POWER3" = "y" ]; then
+   define_bool CONFIG_GENERIC_ISA_DMA y
    define_bool CONFIG_PPC64BRIDGE y
    define_bool CONFIG_ALL_PPC y
 fi
@@ -262,38 +265,6 @@ mainmenu_option next_comment
 comment 'General setup'
 
 bool 'High memory support' CONFIG_HIGHMEM
-bool 'Prompt for advanced kernel configuration options' CONFIG_ADVANCED_OPTIONS
-if [ "$CONFIG_ADVANCED_OPTIONS" = "y" ]; then
-   if [ "$CONFIG_HIGHMEM" = "y" ]; then
-      bool "  Set high memory pool address" CONFIG_HIGHMEM_START_BOOL
-      if [ "$CONFIG_HIGHMEM_START_BOOL" = "y" ]; then
-         hex "    Virtual start address of high memory pool" CONFIG_HIGHMEM_START 0xfe000000
-      fi
-      bool "  Set maximum low memory" CONFIG_LOWMEM_SIZE_BOOL
-      if [ "$CONFIG_LOWMEM_SIZE_BOOL" = "y" ]; then
-         hex "    Maximum low memory size (in bytes)" CONFIG_LOWMEM_SIZE 0x20000000
-      fi
-   fi
-
-   bool "Set custom kernel base address" CONFIG_KERNEL_START_BOOL
-   if [ "$CONFIG_KERNEL_START_BOOL" = "y" ]; then
-      hex "  Virtual address of kernel base" CONFIG_KERNEL_START 0xc0000000
-   fi
-   bool "Set custom user task size" CONFIG_TASK_SIZE_BOOL
-   if [ "$CONFIG_TASK_SIZE_BOOL" = "y" ]; then
-      hex "  Size of user task space" CONFIG_TASK_SIZE 0x80000000
-   fi
-   if [ "$CONFIG_8xx" = "y" ]; then
-      bool "Pinned Kernel TLBs (860 ONLY)" CONFIG_PIN_TLB
-   fi
-   if [ "$CONFIG_ALL_PPC" != "y" ]; then
-      bool "Set the boot link/load address" CONFIG_BOOT_LOAD_BOOL
-      if [ "$CONFIG_BOOT_LOAD_BOOL" = "y" ]; then
-         hex "  Link/load address for booting" CONFIG_BOOT_LOAD 0x00400000
-      fi
-   fi
-fi
-
 if [ "$CONFIG_ALL_PPC" = "y" ]; then
    bool 'Support for ISA-bus hardware' CONFIG_ISA
 else
@@ -347,14 +318,6 @@ fi
 
 source drivers/parport/Config.in
 
-if [ "$CONFIG_PPC_ISERIES" != "y" ]; then
-   if [ "$CONFIG_APUS" != "y" ]; then
-      tristate 'Support for /dev/rtc' CONFIG_PPC_RTC
-   else
-      bool 'Generic /dev/rtc emulation' CONFIG_GEN_RTC
-   fi
-fi
-
 if [ "$CONFIG_ALL_PPC" = "y" -a "$CONFIG_POWER3" = "n" ] ; then
    bool 'Workarounds for PPC601 bugs' CONFIG_PPC601_SYNC_FIX
 fi
@@ -379,11 +342,7 @@ if [ "$CONFIG_APUS" = "y" ]; then
    define_bool CONFIG_FB_CONSOLE y
    define_bool CONFIG_AMIGA y
    define_bool CONFIG_ZORRO y
-   define_bool CONFIG_AMIGAMOUSE y
    define_bool CONFIG_ABSTRACT_CONSOLE y
-   define_bool CONFIG_FB y
-   define_bool CONFIG_MOUSE y
-   define_bool CONFIG_BUSMOUSE y
    define_bool CONFIG_APUS_FAST_EXCEPT y
 
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -410,8 +369,43 @@ if [ "$CONFIG_APUS" = "y" ]; then
    bool '/proc/hardware support' CONFIG_PROC_HARDWARE
    source drivers/zorro/Config.in
 fi
+endmenu
 
+mainmenu_option next_comment
+comment 'Advanced setup'
+bool 'Prompt for advanced kernel configuration options' CONFIG_ADVANCED_OPTIONS
+if [ "$CONFIG_ADVANCED_OPTIONS" = "y" ]; then
+   if [ "$CONFIG_HIGHMEM" = "y" ]; then
+      bool "  Set high memory pool address" CONFIG_HIGHMEM_START_BOOL
+      if [ "$CONFIG_HIGHMEM_START_BOOL" = "y" ]; then
+         hex "    Virtual start address of high memory pool" CONFIG_HIGHMEM_START 0xfe000000
+      fi
+      bool "  Set maximum low memory" CONFIG_LOWMEM_SIZE_BOOL
+      if [ "$CONFIG_LOWMEM_SIZE_BOOL" = "y" ]; then
+         hex "    Maximum low memory size (in bytes)" CONFIG_LOWMEM_SIZE 0x20000000
+      fi
+   fi
+
+   bool "Set custom kernel base address" CONFIG_KERNEL_START_BOOL
+   if [ "$CONFIG_KERNEL_START_BOOL" = "y" ]; then
+      hex "  Virtual address of kernel base" CONFIG_KERNEL_START 0xc0000000
+   fi
+   bool "Set custom user task size" CONFIG_TASK_SIZE_BOOL
+   if [ "$CONFIG_TASK_SIZE_BOOL" = "y" ]; then
+      hex "  Size of user task space" CONFIG_TASK_SIZE 0x80000000
+   fi
+   if [ "$CONFIG_8xx" = "y" ]; then
+      bool "Pinned Kernel TLBs (860 ONLY)" CONFIG_PIN_TLB
+   fi
+   if [ "$CONFIG_ALL_PPC" != "y" ]; then
+      bool "Set the boot link/load address" CONFIG_BOOT_LOAD_BOOL
+      if [ "$CONFIG_BOOT_LOAD_BOOL" = "y" ]; then
+         hex "  Link/load address for booting" CONFIG_BOOT_LOAD 0x00400000
+      fi
+   fi
+fi
 endmenu
+
 source drivers/mtd/Config.in
 source drivers/pnp/Config.in
 source drivers/block/Config.in
@@ -464,14 +458,6 @@ source net/irda/Config.in
 
 source drivers/isdn/Config.in
 
-mainmenu_option next_comment
-comment 'Old CD-ROM drivers (not SCSI, not IDE)'
-bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
-if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
-   source drivers/cdrom/Config.in
-fi
-endmenu
-
 mainmenu_option next_comment
 comment 'Console drivers'
 if [ "$CONFIG_4xx" != "y" -a "$CONFIG_8xx" != "y" ]; then
@@ -504,6 +490,14 @@ if [ "$CONFIG_PPC_ISERIES" = "y" ]; then
       define_bool CONFIG_BLK_DEV_IDECD y
    fi
    endmenu
+else
+   mainmenu_option next_comment
+   comment 'Old CD-ROM drivers (not SCSI, not IDE)'
+   bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
+   if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
+      source drivers/cdrom/Config.in
+   fi
+   endmenu
 fi
 
 source drivers/input/Config.in