Merge branch 's3c64xx/multiplatform' into next/multiplatform

[linux-2.6-block.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index bb868887c83d770f5946999e974124ff9f43e60b..3626b8ba7c0ddac6d81a1a91b0ee8431d248265b 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -914,6 +914,7 @@ choice
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
+               select DEBUG_S3C64XX_UART if ARCH_S3C64XX
                select DEBUG_S5PV210_UART if ARCH_S5PV210
                bool "Use Samsung S3C UART 0 for low-level debug"
                help
@@ -925,6 +926,7 @@ choice
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
+               select DEBUG_S3C64XX_UART if ARCH_S3C64XX
                select DEBUG_S5PV210_UART if ARCH_S5PV210
                bool "Use Samsung S3C UART 1 for low-level debug"
                help
@@ -936,6 +938,7 @@ choice
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
+               select DEBUG_S3C64XX_UART if ARCH_S3C64XX
                select DEBUG_S5PV210_UART if ARCH_S5PV210
                bool "Use Samsung S3C UART 2 for low-level debug"
                help
@@ -946,6 +949,7 @@ choice
        config DEBUG_S3C_UART3
                depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
+               select DEBUG_S3C64XX_UART if ARCH_S3C64XX
                select DEBUG_S5PV210_UART if ARCH_S5PV210
                bool "Use Samsung S3C UART 3 for low-level debug"
                help
@@ -1320,6 +1324,9 @@ config DEBUG_S3C2410_UART
 config DEBUG_S3C24XX_UART
        bool
 
+config DEBUG_S3C64XX_UART
+       bool
+
 config DEBUG_S5PV210_UART
        bool
 
@@ -1406,7 +1413,7 @@ config DEBUG_LL_INCLUDE
        default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA0
        default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA1
        default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
-       default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
+       default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
        default "debug/s5pv210.S" if DEBUG_S5PV210_UART
        default "debug/sirf.S" if DEBUG_SIRFSOC_UART
        default "debug/sti.S" if DEBUG_STI_UART
@@ -1482,6 +1489,10 @@ config DEBUG_UART_PHYS
                                DEBUG_S3C2410_UART2)
        default 0x78000000 if DEBUG_CNS3XXX
        default 0x7c0003f8 if DEBUG_FOOTBRIDGE_COM1
+       default 0x7f005000 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART0
+       default 0x7f005400 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART1
+       default 0x7f005800 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART2
+       default 0x7f005c00 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART3
        default 0x80010000 if DEBUG_ASM9260_UART
        default 0x80070000 if DEBUG_IMX23_UART
        default 0x80074000 if DEBUG_IMX28_UART
@@ -1538,6 +1549,7 @@ config DEBUG_UART_PHYS
                DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \
                DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
                DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
+               DEBUG_S3C64XX_UART || \
                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
                DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
                DEBUG_AT91_UART
@@ -1564,8 +1576,12 @@ config DEBUG_UART_VIRT
        default 0xf4200000 if DEBUG_GEMINI
        default 0xf6200000 if DEBUG_PXA_UART1
        default 0xf7000000 if DEBUG_SUN9I_UART0
+       default 0xf7000000 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART0
        default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
                                DEBUG_S3C2410_UART0)
+       default 0xf7000400 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART1
+       default 0xf7000800 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART2
+       default 0xf7000c00 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART3
        default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
                                DEBUG_S3C2410_UART1)
        default 0xf7008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
@@ -1629,6 +1645,7 @@ config DEBUG_UART_VIRT
                DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
                DEBUG_NETX_UART || \
                DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
+               DEBUG_S3C64XX_UART || \
                DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
                DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0