[U-Boot-Users] [PATCH] drivers/serial: Move conditional compilation to Makefile for CONFIG_* macros
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- Need to build nios2
I've prefer to move conditional compilation to Makefile instead of you move an include in xuartlite. Which is not related to nios2.
I've choose to only move the CONFIG_ and merge the CFG_ in a second step during the next merge drivers/serial/Makefile | 12 ++++++------ drivers/serial/atmel_usart.c | 3 --- drivers/serial/mcfuart.c | 3 --- drivers/serial/s3c4510b_uart.c | 4 ---- drivers/serial/serial_max3100.c | 4 ---- drivers/serial/serial_xuartlite.c | 4 ---- drivers/serial/usbtty.c | 5 ----- 7 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index c9e797e..de6fbab 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,18 +25,18 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libserial.a
-COBJS-y += atmel_usart.o -COBJS-y += mcfuart.o +COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o +COBJS-$(CONFIG_MCFUART) += mcfuart.o COBJS-y += ns9750_serial.o COBJS-y += ns16550.o -COBJS-y += s3c4510b_uart.o +COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-y += serial.o -COBJS-y += serial_max3100.o +COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o COBJS-y += serial_pl010.o COBJS-y += serial_pl011.o -COBJS-y += serial_xuartlite.o +COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-y += serial_sh.o -COBJS-y += usbtty.o +COBJS-$(CONFIG_USB_TTY) += usbtty.o
COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index f35b997..f3b146c 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -17,7 +17,6 @@ */ #include <common.h>
-#ifdef CONFIG_ATMEL_USART #include <asm/io.h> #include <asm/arch/clk.h> #include <asm/arch/memory-map.h> @@ -96,5 +95,3 @@ int serial_tstc(void) { return (usart3_readl(CSR) & USART3_BIT(RXRDY)) != 0; } - -#endif /* CONFIG_ATMEL_USART */ diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index 5eb4f45..a1fcd05 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -29,8 +29,6 @@
#include <common.h>
-#ifdef CONFIG_MCFUART - #include <asm/immap.h> #include <asm/uart.h>
@@ -130,4 +128,3 @@ void serial_setbrg(void)
uart->ucr = UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED; } -#endif /* CONFIG_MCFUART */ diff --git a/drivers/serial/s3c4510b_uart.c b/drivers/serial/s3c4510b_uart.c index ddcd591..aa378e1 100644 --- a/drivers/serial/s3c4510b_uart.c +++ b/drivers/serial/s3c4510b_uart.c @@ -45,8 +45,6 @@
#include <common.h>
-#ifdef CONFIG_DRIVER_S3C4510_UART - #include <asm/hardware.h> #include "s3c4510b_uart.h"
@@ -212,5 +210,3 @@ void serial_puts (const char *s) uart->m_ctrl.bf.sendBreak = 0;
} - -#endif diff --git a/drivers/serial/serial_max3100.c b/drivers/serial/serial_max3100.c index 0611fc1..4abc271 100644 --- a/drivers/serial/serial_max3100.c +++ b/drivers/serial/serial_max3100.c @@ -26,8 +26,6 @@ #include <common.h> #include <watchdog.h>
-#ifdef CONFIG_MAX3100_SERIAL - DECLARE_GLOBAL_DATA_PTR;
/**************************************************************/ @@ -298,5 +296,3 @@ int serial_tstc(void) void serial_setbrg(void) { } - -#endif diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index 74546ce..00d0eaa 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -27,8 +27,6 @@ #include <config.h> #include <asm/io.h>
-#ifdef CONFIG_XILINX_UARTLITE - #define RX_FIFO_OFFSET 0 /* receive FIFO, read only */ #define TX_FIFO_OFFSET 4 /* transmit FIFO, write only */ #define STATUS_REG_OFFSET 8 /* status register, read only */ @@ -77,5 +75,3 @@ int serial_tstc(void) { return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); } - -#endif /* CONFIG_MICROBLZE */ diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 2bc5c3c..e738c56 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -23,8 +23,6 @@
#include <common.h>
-#ifdef CONFIG_USB_TTY - #include <circbuf.h> #include <devices.h> #include "usbtty.h" @@ -1007,6 +1005,3 @@ void usbtty_poll (void) udc_irq();
} - - -#endif
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- cpu/nios2/interrupts.c | 1 + include/asm-nios2/types.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c index aeb5b65..ec5db31 100644 --- a/cpu/nios2/interrupts.c +++ b/cpu/nios2/interrupts.c @@ -27,6 +27,7 @@
#include <nios2.h> #include <nios2-io.h> +#include <asm/types.h> #include <asm/io.h> #include <asm/ptrace.h> #include <common.h> diff --git a/include/asm-nios2/types.h b/include/asm-nios2/types.h index f13d8bd..ea859c0 100644 --- a/include/asm-nios2/types.h +++ b/include/asm-nios2/types.h @@ -52,6 +52,9 @@ typedef unsigned long long u64; /* Dma addresses are 32-bits wide. */
typedef u32 dma_addr_t; + +typedef unsigned long phys_addr_t; +typedef unsigned long phys_size_t; #endif /* __KERNEL__ */
#endif /* __ASM_NIOS2_TYPES_H */
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- cpu/nios2/sysid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c index b5a2959..697ed03 100644 --- a/cpu/nios2/sysid.c +++ b/cpu/nios2/sysid.c @@ -40,7 +40,7 @@ void display_sysid (void) stamp = readl (&sysid->timestamp); localtime_r (&stamp, &t); asctime_r (&t, asc); - printf ("SYSID : %08x, %s", readl (&sysid->id), asc); + printf ("SYSID : %08lx, %s", readl (&sysid->id), asc);
}
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- include/configs/FADS860T.h | 2 +- include/configs/MPC86xADS.h | 2 +- include/configs/MPC885ADS.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/configs/FADS860T.h b/include/configs/FADS860T.h index 18de6b0..38295c4 100644 --- a/include/configs/FADS860T.h +++ b/include/configs/FADS860T.h @@ -38,7 +38,7 @@ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ 1
-#include "fads.h" +#include "../../board/fads/fads.h"
#ifdef USE_REAL_FLASH_VALUES /* diff --git a/include/configs/MPC86xADS.h b/include/configs/MPC86xADS.h index e0e8554..233a8d1 100644 --- a/include/configs/MPC86xADS.h +++ b/include/configs/MPC86xADS.h @@ -41,7 +41,7 @@ #define CONFIG_DRAM_50MHZ 1 #define CONFIG_SDRAM_50MHZ 1
-#include "fads.h" +#include "../../board/fads/fads.h"
#define CFG_OR5_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CFG_BR5_PRELIM (CFG_PHYDEV_ADDR | BR_PS_8 | BR_V) diff --git a/include/configs/MPC885ADS.h b/include/configs/MPC885ADS.h index 1867c5b..f4d1842 100644 --- a/include/configs/MPC885ADS.h +++ b/include/configs/MPC885ADS.h @@ -27,7 +27,7 @@
#define CONFIG_SDRAM_50MHZ 1
-#include "fads.h" +#include "../../board/fads/fads.h"
#define CFG_OR5_PRELIM 0xFFFF8110 /* 64Kbyte address space */ #define CFG_BR5_PRELIM (CFG_PHYDEV_ADDR | BR_PS_8 | BR_V)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- include/configs/MVBC_P.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index 48f427e..8c8a445 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -40,7 +40,7 @@ #define CONFIG_MISC_INIT_R 1
#define CFG_CACHELINE_SIZE 32 -#if (CONFIG_CMD_KGDB) +#ifdef (CONFIG_CMD_KGDB) #define CFG_CACHELINE_SHIFT 5 #endif
@@ -268,7 +268,7 @@ #define CFG_PROMPT_HUSH_PS2 "> " #undef CFG_LONGHELP #define CFG_PROMPT "=> " -#if (CONFIG_CMD_KGDB) +#ifdef (CONFIG_CMD_KGDB) #define CFG_CBSIZE 1024 #else #define CFG_CBSIZE 256
In message 1217713714-27405-5-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
include/configs/MVBC_P.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1217713714-27405-4-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
include/configs/FADS860T.h | 2 +- include/configs/MPC86xADS.h | 2 +- include/configs/MPC885ADS.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1217713714-27405-3-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
cpu/nios2/sysid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1217713714-27405-2-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
cpu/nios2/interrupts.c | 1 + include/asm-nios2/types.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1217713714-27405-1-git-send-email-plagnioj@jcrosoft.com you wrote:
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com
Need to build nios2
I've prefer to move conditional compilation to Makefile instead of you move an include in xuartlite. Which is not related to nios2.
I've choose to only move the CONFIG_ and merge the CFG_ in a second step during the next merge
OK.
drivers/serial/Makefile | 12 ++++++------ drivers/serial/atmel_usart.c | 3 --- drivers/serial/mcfuart.c | 3 --- drivers/serial/s3c4510b_uart.c | 4 ---- drivers/serial/serial_max3100.c | 4 ---- drivers/serial/serial_xuartlite.c | 4 ---- drivers/serial/usbtty.c | 5 ----- 7 files changed, 6 insertions(+), 29 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Jean-Christophe PLAGNIOL-VILLARD -
Wolfgang Denk