diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-10 17:41:46 -0700 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2019-04-24 09:49:46 +0530 |
| commit | fbf986ac2a0b926ae97e6796b87e366610d7589e (patch) | |
| tree | 1d65814b7832b1173c4094e4f91c7da9f491e87a /platform | |
| parent | 97fb8c0e3bcd4d7915ea35020e4d95999d389cd3 (diff) | |
all: Annotate some tables to have clang-format leave them alone
One of the shortcomings of clang-format is that it doesn't allow
for aligned define tables, which is used for a number of constants.
Add annotation to disable the automatic formatting where needed.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/common/serial/sifive-uart.c | 4 | ||||
| -rw-r--r-- | platform/common/serial/uart8250.c | 4 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.h | 5 | ||||
| -rw-r--r-- | platform/kendryte/k210/uarths.h | 4 | ||||
| -rw-r--r-- | platform/qemu/sifive_u/platform.c | 4 | ||||
| -rw-r--r-- | platform/qemu/virt/platform.c | 4 | ||||
| -rw-r--r-- | platform/sifive/fu540/platform.c | 4 |
7 files changed, 28 insertions, 1 deletions
diff --git a/platform/common/serial/sifive-uart.c b/platform/common/serial/sifive-uart.c index 08cc485..9d9490c 100644 --- a/platform/common/serial/sifive-uart.c +++ b/platform/common/serial/sifive-uart.c @@ -11,6 +11,8 @@ #include <sbi/sbi_console.h> #include <plat/serial/sifive-uart.h> +/* clang-format off */ + #define UART_REG_TXFIFO 0 #define UART_REG_RXFIFO 1 #define UART_REG_TXCTRL 2 @@ -25,6 +27,8 @@ #define UART_TXCTRL_TXEN 0x1 #define UART_RXCTRL_RXEN 0x1 +/* clang-format on */ + static volatile void *uart_base; static u32 uart_in_freq; static u32 uart_baudrate; diff --git a/platform/common/serial/uart8250.c b/platform/common/serial/uart8250.c index ce0f4ca..ba67c73 100644 --- a/platform/common/serial/uart8250.c +++ b/platform/common/serial/uart8250.c @@ -10,6 +10,8 @@ #include <sbi/riscv_io.h> #include <plat/serial/uart8250.h> +/* clang-format off */ + #define UART_RBR_OFFSET 0 /* In: Recieve Buffer Register */ #define UART_THR_OFFSET 0 /* Out: Transmitter Holding Register */ #define UART_DLL_OFFSET 0 /* Out: Divisor Latch Low */ @@ -34,6 +36,8 @@ #define UART_LSR_DR 0x01 /* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E /* BI, FE, PE, OE bits */ +/* clang-format on */ + static volatile void *uart8250_base; static u32 uart8250_in_freq; static u32 uart8250_baudrate; diff --git a/platform/kendryte/k210/platform.h b/platform/kendryte/k210/platform.h index 982d942..8694ea8 100644 --- a/platform/kendryte/k210/platform.h +++ b/platform/kendryte/k210/platform.h @@ -22,6 +22,8 @@ #include <sbi/riscv_asm.h> +/* clang-format off */ + #define K210_HART_COUNT 2 #define K210_HART_STACK_SIZE 4096 @@ -171,5 +173,6 @@ enum plic_irq { #define PLIC_NUM_SOURCES (IRQN_MAX - 1) #define PLIC_NUM_PRIORITIES (7) -#endif /* _PLATFORM_H_ */ +/* clang-format on */ +#endif /* _PLATFORM_H_ */ diff --git a/platform/kendryte/k210/uarths.h b/platform/kendryte/k210/uarths.h index ad3308c..3bfb8d5 100644 --- a/platform/kendryte/k210/uarths.h +++ b/platform/kendryte/k210/uarths.h @@ -50,6 +50,8 @@ #include <sbi/sbi_types.h> +/* clang-format off */ + /* Base register address */ #define UARTHS_BASE_ADDR (0x38000000U) @@ -74,6 +76,8 @@ #define UARTHS_IP_TXWM 0x01 #define UARTHS_IP_RXWM 0x02 +/* clang-format on */ + struct uarths_txdata { /* Bits [7:0] is data */ u32 data : 8; diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c index cc8993d..9ea090a 100644 --- a/platform/qemu/sifive_u/platform.c +++ b/platform/qemu/sifive_u/platform.c @@ -15,6 +15,8 @@ #include <plat/serial/sifive-uart.h> #include <plat/sys/clint.h> +/* clang-format off */ + #define SIFIVE_U_HART_COUNT 1 #define SIFIVE_U_HART_STACK_SIZE 8192 @@ -30,6 +32,8 @@ #define SIFIVE_U_UART0_ADDR 0x10013000 #define SIFIVE_U_UART1_ADDR 0x10023000 +/* clang-format on */ + static int sifive_u_final_init(bool cold_boot) { void *fdt; diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c index fd4d829..df62991 100644 --- a/platform/qemu/virt/platform.c +++ b/platform/qemu/virt/platform.c @@ -17,6 +17,8 @@ #include <plat/serial/uart8250.h> #include <plat/sys/clint.h> +/* clang-format off */ + #define VIRT_HART_COUNT 8 #define VIRT_HART_STACK_SIZE 8192 @@ -34,6 +36,8 @@ #define VIRT_UART_BAUDRATE 115200 #define VIRT_UART_SHIFTREG_ADDR 1843200 +/* clang-format on */ + static int virt_final_init(bool cold_boot) { void *fdt; diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c index 325beba..9042d60 100644 --- a/platform/sifive/fu540/platform.c +++ b/platform/sifive/fu540/platform.c @@ -19,6 +19,8 @@ #include <plat/serial/sifive-uart.h> #include <plat/sys/clint.h> +/* clang-format off */ + #define FU540_HART_COUNT 5 #define FU540_HART_STACK_SIZE 8192 @@ -50,6 +52,8 @@ #define FU540_PRCI_CLKMUXSTATUSREG 0x002C #define FU540_PRCI_CLKMUX_STATUS_TLCLKSEL (0x1 << 1) +/* clang-format on */ + static void fu540_modify_dt(void *fdt) { u32 i, size; |