diff --git a/lib/uart/ghdl/tb_uart.gtkw b/lib/uart/ghdl/tb_uart.gtkw
new file mode 100644
index 0000000..e69de29
diff --git a/lib/uart/ghdl/tb_uart_rx.make b/lib/uart/ghdl/tb_uart_rx.make
new file mode 100644
index 0000000..01cb229
--- /dev/null
+++ b/lib/uart/ghdl/tb_uart_rx.make
@@ -0,0 +1,20 @@
+# -----------------------------------------------------------
+include $(VHDL_HOME)/make/defs.mk
+# -----------------------------------------------------------
+include $(VHDL_HOME)/lib/uart/ghdl/uart_generic.inc
+
+# -----------------------------------------------------------
+MOD_PATH := $(LIB_PATH)/uart/src
+
+SRCS := $(UART_GENERIC_SRCS)
+SRCS += $(MOD_PATH)/tb_uart.vhd
+
+# -----------------------------------------------------------
+# Compile
+TARGET := tb_uart
+ENTITY := tb_uart
+RUN_TIME := 880us
+
+include $(VHDL_HOME)/make/ghdl.mk
+# -----------------------------------------------------------
+
diff --git a/lib/uart/ghdl/uart_generic.inc b/lib/uart/ghdl/uart_generic.inc
new file mode 100644
index 0000000..3ba3bc1
--- /dev/null
+++ b/lib/uart/ghdl/uart_generic.inc
@@ -0,0 +1,18 @@
+# -----------------------------------------------------------
+include $(VHDL_HOME)/make/defs.mk
+# -----------------------------------------------------------
+PKG_NAME := UART_GENERIC
+
+# -----------------------------------------------------------
+MOD_PATH := $(LIB_PATH)/uart/src
+
+$(PKG_NAME)_SRCS += $(LIB_PATH)/misc/bbfifo/src/bbfifo.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/uart_types.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/juart/juart_tx.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/juart/juart_rx.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart_tx.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart_rx.vhd
+$(PKG_NAME)_SRCS += $(MOD_PATH)/generic/uart.vhd
+
+# -----------------------------------------------------------
+