Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
	boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

10 files changed, 125 insertions, 0 deletions

diff --git a/board/gaisler/gr_cpci_ax2000/Kconfig b/board/gaisler/gr_cpci_ax2000/Kconfig
new file mode 100644
index 0000000..d5a2eb4
--- /dev/null
+++ b/board/gaisler/gr_cpci_ax2000/Kconfig
@@ -0,0 +1,19 @@
+if TARGET_GR_CPCI_AX2000
+
+config SYS_CPU
+	string
+	default "leon3"
+
+config SYS_BOARD
+	string
+	default "gr_cpci_ax2000"
+
+config SYS_VENDOR
+	string
+	default "gaisler"
+
+config SYS_CONFIG_NAME
+	string
+	default "gr_cpci_ax2000"
+
+endif
diff --git a/board/gaisler/gr_cpci_ax2000/MAINTAINERS b/board/gaisler/gr_cpci_ax2000/MAINTAINERS
new file mode 100644
index 0000000..493c31e
--- /dev/null
+++ b/board/gaisler/gr_cpci_ax2000/MAINTAINERS
@@ -0,0 +1,6 @@
+GR_CPCI_AX2000 BOARD
+M:	-
+S:	Maintained
+F:	board/gaisler/gr_cpci_ax2000/
+F:	include/configs/gr_cpci_ax2000.h
+F:	configs/gr_cpci_ax2000_defconfig
diff --git a/board/gaisler/gr_ep2s60/Kconfig b/board/gaisler/gr_ep2s60/Kconfig
new file mode 100644
index 0000000..e742ea8
--- /dev/null
+++ b/board/gaisler/gr_ep2s60/Kconfig
@@ -0,0 +1,19 @@
+if TARGET_GR_EP2S60
+
+config SYS_CPU
+	string
+	default "leon3"
+
+config SYS_BOARD
+	string
+	default "gr_ep2s60"
+
+config SYS_VENDOR
+	string
+	default "gaisler"
+
+config SYS_CONFIG_NAME
+	string
+	default "gr_ep2s60"
+
+endif
diff --git a/board/gaisler/gr_ep2s60/MAINTAINERS b/board/gaisler/gr_ep2s60/MAINTAINERS
new file mode 100644
index 0000000..151bef1
--- /dev/null
+++ b/board/gaisler/gr_ep2s60/MAINTAINERS
@@ -0,0 +1,6 @@
+GR_EP2S60 BOARD
+M:	-
+S:	Maintained
+F:	board/gaisler/gr_ep2s60/
+F:	include/configs/gr_ep2s60.h
+F:	configs/gr_ep2s60_defconfig
diff --git a/board/gaisler/gr_xc3s_1500/Kconfig b/board/gaisler/gr_xc3s_1500/Kconfig
new file mode 100644
index 0000000..6d9f107
--- /dev/null
+++ b/board/gaisler/gr_xc3s_1500/Kconfig
@@ -0,0 +1,19 @@
+if TARGET_GR_XC3S_1500
+
+config SYS_CPU
+	string
+	default "leon3"
+
+config SYS_BOARD
+	string
+	default "gr_xc3s_1500"
+
+config SYS_VENDOR
+	string
+	default "gaisler"
+
+config SYS_CONFIG_NAME
+	string
+	default "gr_xc3s_1500"
+
+endif
diff --git a/board/gaisler/gr_xc3s_1500/MAINTAINERS b/board/gaisler/gr_xc3s_1500/MAINTAINERS
new file mode 100644
index 0000000..187f323
--- /dev/null
+++ b/board/gaisler/gr_xc3s_1500/MAINTAINERS
@@ -0,0 +1,6 @@
+GR_XC3S_1500 BOARD
+M:	-
+S:	Maintained
+F:	board/gaisler/gr_xc3s_1500/
+F:	include/configs/gr_xc3s_1500.h
+F:	configs/gr_xc3s_1500_defconfig
diff --git a/board/gaisler/grsim/Kconfig b/board/gaisler/grsim/Kconfig
new file mode 100644
index 0000000..10f51e1
--- /dev/null
+++ b/board/gaisler/grsim/Kconfig
@@ -0,0 +1,19 @@
+if TARGET_GRSIM
+
+config SYS_CPU
+	string
+	default "leon3"
+
+config SYS_BOARD
+	string
+	default "grsim"
+
+config SYS_VENDOR
+	string
+	default "gaisler"
+
+config SYS_CONFIG_NAME
+	string
+	default "grsim"
+
+endif
diff --git a/board/gaisler/grsim/MAINTAINERS b/board/gaisler/grsim/MAINTAINERS
new file mode 100644
index 0000000..acb863c
--- /dev/null
+++ b/board/gaisler/grsim/MAINTAINERS
@@ -0,0 +1,6 @@
+GRSIM BOARD
+M:	-
+S:	Maintained
+F:	board/gaisler/grsim/
+F:	include/configs/grsim.h
+F:	configs/grsim_defconfig
diff --git a/board/gaisler/grsim_leon2/Kconfig b/board/gaisler/grsim_leon2/Kconfig
new file mode 100644
index 0000000..8dd2d27
--- /dev/null
+++ b/board/gaisler/grsim_leon2/Kconfig
@@ -0,0 +1,19 @@
+if TARGET_GRSIM_LEON2
+
+config SYS_CPU
+	string
+	default "leon2"
+
+config SYS_BOARD
+	string
+	default "grsim_leon2"
+
+config SYS_VENDOR
+	string
+	default "gaisler"
+
+config SYS_CONFIG_NAME
+	string
+	default "grsim_leon2"
+
+endif
diff --git a/board/gaisler/grsim_leon2/MAINTAINERS b/board/gaisler/grsim_leon2/MAINTAINERS
new file mode 100644
index 0000000..6da9b78
--- /dev/null
+++ b/board/gaisler/grsim_leon2/MAINTAINERS
@@ -0,0 +1,6 @@
+GRSIM_LEON2 BOARD
+M:	-
+S:	Maintained
+F:	board/gaisler/grsim_leon2/
+F:	include/configs/grsim_leon2.h
+F:	configs/grsim_leon2_defconfig