tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: sirf: drop Marco low-level debug port

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>

Barry Song 07dde66c b7392d22

+1 -12
+1 -8
arch/arm/Kconfig.debug
··· 920 920 Say Y here if you want the debug print routines to direct 921 921 their output to the uart1 port on SiRFprimaII devices. 922 922 923 - config DEBUG_SIRFMARCO_UART1 924 - bool "Kernel low-level debugging messages via SiRFmarco UART1" 925 - depends on ARCH_MARCO 926 - help 927 - Say Y here if you want the debug print routines to direct 928 - their output to the uart1 port on SiRFmarco devices. 929 - 930 923 config STIH41X_DEBUG_ASC2 931 924 bool "Use StiH415/416 ASC2 UART for low-level debug" 932 925 depends on ARCH_STI ··· 1188 1195 default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4 1189 1196 default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART 1190 1197 default "debug/s5pv210.S" if DEBUG_S5PV210_UART 1191 - default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 1198 + default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 1192 1199 default "debug/sti.S" if DEBUG_STI_UART 1193 1200 default "debug/tegra.S" if DEBUG_TEGRA_UART 1194 1201 default "debug/ux500.S" if DEBUG_UX500_UART
-2
arch/arm/include/debug/sirf.S
··· 8 8 9 9 #if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1) 10 10 #define SIRFSOC_UART1_PA_BASE 0xb0060000 11 - #elif defined(CONFIG_DEBUG_SIRFMARCO_UART1) 12 - #define SIRFSOC_UART1_PA_BASE 0xcc060000 13 11 #else 14 12 #define SIRFSOC_UART1_PA_BASE 0 15 13 #endif
-2
arch/arm/mach-prima2/lluart.c
··· 13 13 14 14 #if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1) 15 15 #define SIRFSOC_UART1_PA_BASE 0xb0060000 16 - #elif defined(CONFIG_DEBUG_SIRFMARCO_UART1) 17 - #define SIRFSOC_UART1_PA_BASE 0xcc060000 18 16 #else 19 17 #define SIRFSOC_UART1_PA_BASE 0 20 18 #endif