Skip to content

Commit

Permalink
ARM: sirf: drop Marco low-level debug port
Browse files Browse the repository at this point in the history
Marco will not be supported any more. it has been replaced by CSR
Atlas7.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Barry Song authored and Barry Song committed Jan 14, 2015
1 parent b7392d2 commit 07dde66
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
9 changes: 1 addition & 8 deletions arch/arm/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -920,13 +920,6 @@ choice
Say Y here if you want the debug print routines to direct
their output to the uart1 port on SiRFprimaII devices.

config DEBUG_SIRFMARCO_UART1
bool "Kernel low-level debugging messages via SiRFmarco UART1"
depends on ARCH_MARCO
help
Say Y here if you want the debug print routines to direct
their output to the uart1 port on SiRFmarco devices.

config STIH41X_DEBUG_ASC2
bool "Use StiH415/416 ASC2 UART for low-level debug"
depends on ARCH_STI
Expand Down Expand Up @@ -1195,7 +1188,7 @@ config DEBUG_LL_INCLUDE
default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
default "debug/s5pv210.S" if DEBUG_S5PV210_UART
default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1
default "debug/sti.S" if DEBUG_STI_UART
default "debug/tegra.S" if DEBUG_TEGRA_UART
default "debug/ux500.S" if DEBUG_UX500_UART
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/include/debug/sirf.S
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)
#define SIRFSOC_UART1_PA_BASE 0xb0060000
#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1)
#define SIRFSOC_UART1_PA_BASE 0xcc060000
#else
#define SIRFSOC_UART1_PA_BASE 0
#endif
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-prima2/lluart.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1)
#define SIRFSOC_UART1_PA_BASE 0xb0060000
#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1)
#define SIRFSOC_UART1_PA_BASE 0xcc060000
#else
#define SIRFSOC_UART1_PA_BASE 0
#endif
Expand Down

0 comments on commit 07dde66

Please sign in to comment.