]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
xtensa: Remove duplicate newlines
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Sat, 13 Jul 2024 13:19:36 +0000 (15:19 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 15 Jul 2024 18:12:19 +0000 (12:12 -0600)
Drop all duplicate newlines. No functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
12 files changed:
arch/xtensa/include/asm/arch-dc232b/core.h
arch/xtensa/include/asm/arch-dc232b/tie-asm.h
arch/xtensa/include/asm/arch-dc233c/core.h
arch/xtensa/include/asm/arch-dc233c/tie-asm.h
arch/xtensa/include/asm/arch-de212/core.h
arch/xtensa/include/asm/arch-de212/tie-asm.h
arch/xtensa/include/asm/asmmacro.h
arch/xtensa/include/asm/cacheasm.h
arch/xtensa/include/asm/io.h
arch/xtensa/include/asm/processor.h
arch/xtensa/include/asm/types.h
arch/xtensa/lib/time.c

index c1453f719e44e6db35817687cc927248aa93e207..9ab7f464236fea8500e76c0d158e8eca511fb5be 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef _XTENSA_CORE_CONFIGURATION_H
 #define _XTENSA_CORE_CONFIGURATION_H
 
-
 /****************************************************************************
            Parameters Useful for Any Code, USER or PRIVILEGED
  ****************************************************************************/
@@ -19,7 +18,6 @@
  *  configured, and a value of 0 otherwise.  These macros are always defined.
  */
 
-
 /*----------------------------------------------------------------------
                                ISA
   ----------------------------------------------------------------------*/
@@ -69,7 +67,6 @@
 #define XCHAL_HAVE_VECTRALX            0       /* Vectra LX pkg */
 #define XCHAL_HAVE_HIFI2               0       /* HiFi2 Audio Engine pkg */
 
-
 /*----------------------------------------------------------------------
                                MISC
   ----------------------------------------------------------------------*/
 #define XCHAL_HW_MAX_VERSION_MINOR     1       /* minor v of latest tgt hw */
 #define XCHAL_HW_MAX_VERSION           221001  /* latest targeted hw */
 
-
 /*----------------------------------------------------------------------
                                CACHE
   ----------------------------------------------------------------------*/
 
 #define XCHAL_DCACHE_IS_WRITEBACK      1       /* writeback feature */
 
-
 /****************************************************************************
     Parameters Useful for PRIVILEGED (Supervisory or Non-Virtualized) Code
  ****************************************************************************/
 
-
 #ifndef XTENSA_HAL_NON_PRIVILEGED_ONLY
 
 /*----------------------------------------------------------------------
 /*  Number of encoded cache attr bits (see <xtensa/hal.h> for decoded bits):  */
 #define XCHAL_CA_BITS                  4
 
-
 /*----------------------------------------------------------------------
                        INTERNAL I/D RAM/ROMs and XLMI
   ----------------------------------------------------------------------*/
 #define XCHAL_NUM_URAM                 0       /* number of core unified RAMs*/
 #define XCHAL_NUM_XLMI                 0       /* number of core XLMI ports */
 
-
 /*----------------------------------------------------------------------
                        INTERRUPTS and TIMERS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_NUM            14
 /*  (There are many interrupts each at level(s) 1, 3.)  */
 
-
 /*
  *  External interrupt vectors/levels.
  *  These macros describe how Xtensa processor interrupt numbers
 #define XCHAL_EXTINT15_NUM             20      /* (intlevel 1) */
 #define XCHAL_EXTINT16_NUM             21      /* (intlevel 3) */
 
-
 /*----------------------------------------------------------------------
                        EXCEPTIONS and VECTORS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_VECTOR_VADDR   XCHAL_NMI_VECTOR_VADDR
 #define XCHAL_INTLEVEL7_VECTOR_PADDR   XCHAL_NMI_VECTOR_PADDR
 
-
 /*----------------------------------------------------------------------
                                DEBUG
   ----------------------------------------------------------------------*/
 #define XCHAL_NUM_DBREAK               2       /* number of DBREAKn regs */
 #define XCHAL_HAVE_OCD_DIR_ARRAY       1       /* faster OCD option */
 
-
 /*----------------------------------------------------------------------
                                MMU
   ----------------------------------------------------------------------*/
 
 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
 
-
 #endif /* _XTENSA_CORE_CONFIGURATION_H */
index 35a26dca7cc39316fe4f78ef496ec8d25aaaef55..9c6b1eeacd00e02beea366fbcaebc1a4ccf7d145 100644 (file)
@@ -25,7 +25,6 @@
 /*  Misc  */
 #define XTHAL_SAS_ALL  0xFFFF  /* include all default NCP contents */
 
-
 /* Macro to save all non-coprocessor (extra) custom TIE and optional state
  * (not including zero-overhead loop registers).
  * Save area ptr (clobbered):  ptr  (1 byte aligned)
index cd3c8c115f5083522c1fc6aad293434b7a327e64..3cd11981d012c9d0dc7016e21f3d1aa05060f334 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef _XTENSA_CORE_CONFIGURATION_H
 #define _XTENSA_CORE_CONFIGURATION_H
 
-
 /****************************************************************************
            Parameters Useful for Any Code, USER or PRIVILEGED
  ****************************************************************************/
@@ -19,7 +18,6 @@
  *  configured, and a value of 0 otherwise.  These macros are always defined.
  */
 
-
 /*----------------------------------------------------------------------
                                ISA
   ----------------------------------------------------------------------*/
@@ -86,7 +84,6 @@
 #define XCHAL_HAVE_TURBO16             0       /* ConnX Turbo16 pkg */
 #define XCHAL_HAVE_BBP16               0       /* ConnX BBP16 pkg */
 
-
 /*----------------------------------------------------------------------
                                MISC
   ----------------------------------------------------------------------*/
 #define XCHAL_HW_MAX_VERSION_MINOR     1       /* minor v of latest tgt hw */
 #define XCHAL_HW_MAX_VERSION           240001  /* latest targeted hw */
 
-
 /*----------------------------------------------------------------------
                                CACHE
   ----------------------------------------------------------------------*/
 
 #define XCHAL_HAVE_PREFETCH            0       /* PREFCTL register */
 
-
 /****************************************************************************
     Parameters Useful for PRIVILEGED (Supervisory or Non-Virtualized) Code
  ****************************************************************************/
 /*  Number of encoded cache attr bits (see <xtensa/hal.h> for decoded bits):  */
 #define XCHAL_CA_BITS                  4
 
-
 /*----------------------------------------------------------------------
                        INTERNAL I/D RAM/ROMs and XLMI
   ----------------------------------------------------------------------*/
 
 #define XCHAL_HAVE_IMEM_LOADSTORE      1       /* can load/store to IROM/IRAM*/
 
-
 /*----------------------------------------------------------------------
                        INTERRUPTS and TIMERS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_NUM            14
 /*  (There are many interrupts each at level(s) 1, 3.)  */
 
-
 /*
  *  External interrupt vectors/levels.
  *  These macros describe how Xtensa processor interrupt numbers
 #define XCHAL_EXTINT15_NUM             20      /* (intlevel 1) */
 #define XCHAL_EXTINT16_NUM             21      /* (intlevel 3) */
 
-
 /*----------------------------------------------------------------------
                        EXCEPTIONS and VECTORS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_VECTOR_VADDR   XCHAL_NMI_VECTOR_VADDR
 #define XCHAL_INTLEVEL7_VECTOR_PADDR   XCHAL_NMI_VECTOR_PADDR
 
-
 /*----------------------------------------------------------------------
                                DEBUG
   ----------------------------------------------------------------------*/
 #define XCHAL_NUM_DBREAK               2       /* number of DBREAKn regs */
 #define XCHAL_HAVE_OCD_DIR_ARRAY       1       /* faster OCD option */
 
-
 /*----------------------------------------------------------------------
                                MMU
   ----------------------------------------------------------------------*/
 
 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
 
-
 #endif /* _XTENSA_CORE_CONFIGURATION_H */
index 7b3d1f3c57251a12846ebafe9c20f81aab10b738..ee1b1986415aa7279f96aa42becbea0bf24db4f1 100644 (file)
        .endif
     .endm      // xchal_ncp_load
 
-
 #define XCHAL_NCP_NUM_ATMPS    1
 
 #define XCHAL_SA_NUM_ATMPS     1
index 60c6efba7d23c5dda1c75dd3574454fff3d9e454..c2609f46a02a5fd6132afd9efbc914fc265fe2d3 100644 (file)
@@ -9,7 +9,6 @@
 #ifndef _XTENSA_CORE_CONFIGURATION_H
 #define _XTENSA_CORE_CONFIGURATION_H
 
-
 /****************************************************************************
            Parameters Useful for Any Code, USER or PRIVILEGED
  ****************************************************************************/
@@ -19,7 +18,6 @@
  *  configured, and a value of 0 otherwise.  These macros are always defined.
  */
 
-
 /*----------------------------------------------------------------------
                                ISA
   ----------------------------------------------------------------------*/
@@ -91,7 +89,6 @@
 #define XCHAL_HAVE_HIFI2EP             0       /* HiFi2EP */
 #define XCHAL_HAVE_HIFI_MINI           0
 
-
 #define XCHAL_HAVE_VECTORFPU2005       0       /* vector or user floating-point pkg */
 #define XCHAL_HAVE_USER_DPFPU         0       /* user DP floating-point pkg */
 #define XCHAL_HAVE_USER_SPFPU         0       /* user DP floating-point pkg */
 #define XCHAL_HAVE_GRIVPEP              0      /*  GRIVPEP is General Release of IVPEP */
 #define XCHAL_HAVE_GRIVPEP_HISTOGRAM    0      /* Histogram option on GRIVPEP */
 
-
 /*----------------------------------------------------------------------
                                MISC
   ----------------------------------------------------------------------*/
 #define XCHAL_HW_MAX_VERSION_MINOR     2       /* minor v of latest tgt hw */
 #define XCHAL_HW_MAX_VERSION           260002  /* latest targeted hw */
 
-
 /*----------------------------------------------------------------------
                                CACHE
   ----------------------------------------------------------------------*/
 #define XCHAL_HAVE_ICACHE_DYN_WAYS     0       /* Icache dynamic way support */
 #define XCHAL_HAVE_DCACHE_DYN_WAYS     0       /* Dcache dynamic way support */
 
-
 /****************************************************************************
     Parameters Useful for PRIVILEGED (Supervisory or Non-Virtualized) Code
  ****************************************************************************/
                                           XCHAL_HAVE_DCACHE_DYN_WAYS)  &&      \
                                           (XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RE_2012_0))
 
-
 /*----------------------------------------------------------------------
                        INTERNAL I/D RAM/ROMs and XLMI
   ----------------------------------------------------------------------*/
 
 #define XCHAL_HAVE_IMEM_LOADSTORE      1       /* can load/store to IROM/IRAM*/
 
-
 /*----------------------------------------------------------------------
                        INTERRUPTS and TIMERS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_NUM            14
 /*  (There are many interrupts each at level(s) 1, 3.)  */
 
-
 /*
  *  External interrupt mapping.
  *  These macros describe how Xtensa processor interrupt numbers
 #define XCHAL_INT20_EXTNUM             15      /* (intlevel 1) */
 #define XCHAL_INT21_EXTNUM             16      /* (intlevel 3) */
 
-
 /*----------------------------------------------------------------------
                        EXCEPTIONS and VECTORS
   ----------------------------------------------------------------------*/
 #define XCHAL_INTLEVEL7_VECTOR_VADDR   XCHAL_NMI_VECTOR_VADDR
 #define XCHAL_INTLEVEL7_VECTOR_PADDR   XCHAL_NMI_VECTOR_PADDR
 
-
 /*----------------------------------------------------------------------
                                DEBUG MODULE
   ----------------------------------------------------------------------*/
 /*  Perf counters  */
 #define XCHAL_NUM_PERF_COUNTERS                0       /* performance counters */
 
-
 /*----------------------------------------------------------------------
                                MMU
   ----------------------------------------------------------------------*/
 
 #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
 
-
 #endif /* _XTENSA_CORE_CONFIGURATION_H */
index 3192ac82ad2064c07f59c4b410c03a3e0f6ea715..5156aae71e3834862aa216bcebaeebd4b8695cdb 100644 (file)
@@ -31,7 +31,6 @@
                                        | ((ccuse) & XTHAL_SAS_ANYCC)  \
                                        | ((abi)   & XTHAL_SAS_ANYABI) )
 
-
     /*
       *  Macro to store all non-coprocessor (extra) custom TIE and optional state
       *  (not including zero-overhead loop registers).
        .endif
     .endm      // xchal_ncp_load
 
-
 #define XCHAL_NCP_NUM_ATMPS    1
 
 #define XCHAL_SA_NUM_ATMPS     1
index 78613fc5797bb44359ad6c6c97bf1b7e2d798ad2..8267f05f52a33d248f8725b5dc43d3b7189b5748 100644 (file)
@@ -59,7 +59,6 @@
        loop    \at, 99f
 .endm
 
-
 .macro __loops ar, as, at, incr_log2, mask_log2, cond, ncond
        .ifgt \incr_log2 - 1
                addi    \at, \as, (1 << \incr_log2) - 1
@@ -72,7 +71,6 @@
        loop\cond       \at, 99f
 .endm
 
-
 .macro __loopt ar, as, at, incr_log2
        sub     \at, \as, \ar
        .ifgt   \incr_log2 - 1
        loop    \at, 99f
 .endm
 
-
 .macro __loop  as
        loop    \as, 99f
 .endm
 
-
 .macro __endl  ar, as
 99:
 .endm
 
-
 #else
 
 .macro __loopi ar, at, size, incr
 98:
 .endm
 
-
 .macro __loops ar, as, at, incr_log2, mask_log2, cond, ncond
        .ifnc \mask_log2,
                extui   \at, \as, \incr_log2, \mask_log2
 98:
 .endm
 
-
 .macro __loop  as
 98:
 .endm
 
-
 .macro __endl  ar, as
        bltu    \ar, \as, 98b
 99:
 .endm
 
-
 #endif
 
-
 .macro __endla ar, as, incr
        addi    \ar, \ar, \incr
        __endl  \ar \as
 .endm
 
-
 #endif /* _XTENSA_ASMMACRO_H */
index 69448cfff783210c2d929147ce2ad394d62969fa..c53e653dfda71d7d0adad9acb2b1fb2c3e0b2516 100644 (file)
@@ -51,7 +51,6 @@
 
        .endm
 
-
        .macro  __loop_cache_range ar as at insn line_width
 
        extui   \at, \ar, 0, \line_width
@@ -63,7 +62,6 @@
 
        .endm
 
-
        .macro  __loop_cache_page ar at insn line_width
 
        __loopi \ar, \at, PAGE_SIZE, 4 << (\line_width)
@@ -77,7 +75,6 @@
 
        .endm
 
-
        .macro  ___unlock_dcache_all ar at
 
 #if XCHAL_DCACHE_LINE_LOCKABLE && XCHAL_DCACHE_SIZE
@@ -86,7 +83,6 @@
 
        .endm
 
-
        .macro  ___unlock_icache_all ar at
 
 #if XCHAL_ICACHE_LINE_LOCKABLE && XCHAL_ICACHE_SIZE
@@ -95,7 +91,6 @@
 
        .endm
 
-
        .macro  ___flush_invalidate_dcache_all ar at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___flush_dcache_all ar at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_dcache_all ar at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_icache_all ar at
 
 #if XCHAL_ICACHE_SIZE
 
        .endm
 
-
        .macro  ___flush_invalidate_dcache_range ar as at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___flush_dcache_range ar as at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_dcache_range ar as at
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_icache_range ar as at
 
 #if XCHAL_ICACHE_SIZE
 
        .endm
 
-
        .macro  ___flush_invalidate_dcache_page ar as
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro ___flush_dcache_page ar as
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_dcache_page ar as
 
 #if XCHAL_DCACHE_SIZE
 
        .endm
 
-
        .macro  ___invalidate_icache_page ar as
 
 #if XCHAL_ICACHE_SIZE
index ab2438b829acc12878f700a7f94249b2ce05233c..6ca1dea68f7b51c159cd1589977049b3928b175e 100644 (file)
@@ -111,7 +111,6 @@ void outsl(unsigned long port, const void *src, unsigned long count);
 # error processor byte order undefined!
 #endif
 
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem access
  */
index 22203c96497513c00d010fd55acf8f9024d98c81..066188fbde5b48ed4e942f862ff18b3379412a71 100644 (file)
@@ -6,5 +6,4 @@
 #ifndef _XTENSA_PROCESSOR_H
 #define _XTENSA_PROCESSOR_H
 
-
 #endif /* _XTENSA_PROCESSOR_H */
index 2c5b5433cc4ca1fd2b0b767c9bc070a588349602..56594912229e3c5cfc33d7a75b5b0f1477a66182 100644 (file)
@@ -24,7 +24,6 @@ typedef u32 dma_addr_t;
 typedef unsigned long phys_addr_t;
 typedef unsigned long phys_size_t;
 
-
 #endif /* __KERNEL__ */
 
 #endif /* _XTENSA_TYPES_H */
index c6739584bbf2b67967afd19e931f075d88633813..319635c6b0936515f2cd219f122bc62858817830 100644 (file)
@@ -62,7 +62,6 @@ void __udelay(unsigned long usec)
        delay_cycles(mhz * lo);
 }
 
-
 /*
  * Return the elapsed time (ticks) since 'base'.
  */
@@ -89,7 +88,6 @@ ulong get_timer(ulong base)
 #endif
 }
 
-
 /*
  * This function is derived from ARM/PowerPC code (read timebase as long long).
  * On Xtensa it just returns the timer value.