2 files changed, 4 insertions, 22 deletions

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 22615dd02219..bc979f770980 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -13,8 +13,8 @@ config HEXAGON
         # select ARCH_REQUIRE_GPIOLIB
         # select HAVE_CLK
         # select IRQ_PER_CPU
-        select HAVE_IRQ_WORK
         # select GENERIC_PENDING_IRQ if SMP
+        select HAVE_IRQ_WORK
         select GENERIC_ATOMIC64
         select HAVE_PERF_EVENTS
         select HAVE_GENERIC_HARDIRQS
@@ -26,7 +26,7 @@ config HEXAGON
         select NO_IOPORT
         select GENERIC_IOMAP
         select GENERIC_SMP_IDLE_THREAD
-        # mostly generic routines, with some accelerated ones
+        select STACKTRACE_SUPPORT
         ---help---
           Qualcomm Hexagon is a processor architecture designed for high
           performance and low power across a wide variety of applications.
@@ -73,15 +73,6 @@ config GENERIC_CSUM
 config GENERIC_IRQ_PROBE
         def_bool y
 
-#config ZONE_DMA
-#       bool
-#       default y
-
-config HAS_DMA
-        bool
-        select HAVE_DMA_ATTRS
-        default y
-
 config NEED_SG_DMA_LENGTH
         def_bool y
 
@@ -114,14 +105,11 @@ config GENERIC_BUG
         def_bool y
         depends on BUG
 
-config BUG
-        def_bool y
-
 menu "Machine selection"
 
 choice
         prompt "System type"
-        default HEXAGON_ARCH_V2
+        default HEXAGON_COMET
 
 config HEXAGON_COMET
         bool "Comet Board"
@@ -194,8 +182,7 @@ source "kernel/Kconfig.hz"
 source "kernel/time/Kconfig"
 
 config GENERIC_GPIO
-        bool "Generic GPIO support"
-        default n
+        def_bool n
 
 endmenu
 
diff --git a/arch/hexagon/Makefile b/arch/hexagon/Makefile
index e27d030846ae..d00d900b2566 100644
--- a/arch/hexagon/Makefile
+++ b/arch/hexagon/Makefile
@@ -50,8 +50,3 @@ head-y := arch/hexagon/kernel/head.o
 core-y += arch/hexagon/kernel/ \
         arch/hexagon/mm/ \
         arch/hexagon/lib/
-
-#       arch/hexagon/platform/common/
-#
-#core-$(CONFIG_HEXAGON_COMET)           += arch/hexagon/platform/comet/
-#machine-$(CONFIG_HEXAGON_COMET)                := comet